hotfix
Merge branch 'hotfix/rotator_changes!!'