Merge "Fixing rotation issues." into oc-dev