merge in oc-dr1-release history after reset to 1c3b1350bba5f9531e68995c0004cfde803640bd