Merge "get rid of LinearTransform"