Merge "Follow-up for I8cbf1bfbebc917b03f528f040bb019d193228bbb" into oc-dev