Merge "Fix default optics" into oc-dev