merge in oc-mr1-release history after reset to master