merge in oc-release history after reset to 441975b6b8b40fefa14b26a753e18d27cb14d897