merge in oc-r6-release history after reset to oc-release