merge in oc-dr1-release history after reset to 24e776d0841323a870b027d9958880802726ead1