merge in oc-release history after reset to f52d1400d6b473cb6716b94705f416fbfbdcccae