merge in oc-release history after reset to 391cbde92683a965a64ae78912cb98b2ce61b90f