Merge "Rotation support"