merge in oc-release history after reset to a523b4ac387adbb4ffc7c86699461fbdea4c17f8