Merge "Auto-dim refinements" into oc-mr1-dev