merge in oc-release history after reset to 91e928a309446d357c6ca767d6c72563ee7479b9