merge in oc-release history after reset to 73b7f7abf06b61b4d0ed1b59d273cf45cabd04b2