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