Merge "Refactor 1D transforms" into nextgenv2