Merge "Fix stale transformations" into nyc-dev