Merge branch 'rotation-4-5' into rotation