Merge "Properly check for orientation mismatch" into oc-dev