merge in oc-release history after reset to 718318bbb8d60abaf755eede9215e8fa95da3235