Merge "Add rotation to configuration." into oc-dr1-dev