merge in oc-dr1-release history after reset to 5b803e0bce2efc7f3343fbcfe9a6945ce254e3da