merge in oc-release history after reset to 1442855f6a77f4a79dbc58cdcdd17f749f02b0c2