merge in oc-release history after reset to 6ed60c8af22fc52bd09685350cca308c51f7a2ec