merge in oc-dr1-release history after reset to 39f4bc648664a70563c04659a41a5aa9c5268040