Merge "Fix interaction of magnification and Final-crop." into oc-dev