merge in oc-release history after reset to a4ab044e18a7fc3e27ca87e4f90d66a5b0c02722