Revert "Revert "Merge branch '12.0-wip-split-adjustment-ts' into '12.0-stage'""

Merged Gastón Bertolani requested to merge revert-b75f4521 into 12.0-ts-adj-split

This reverts commit b75f4521

Merge request reports