disabling rotation for now
Merge branch 'master' into develop