Merge branch 'rotation'