Merge "Update optics" into oc-dev