merge in oc-release history after reset to 3fcd527795b979bb8c8bfa9470f88b98963518a2