merge in oc-release history after reset to 05179b6749b6f6f6c864d387ea25f46e2a582b3d