Merge branch 'rot-invariant'