Merge "Coordinate rotation for concurrent mode"