merge in oc-release history after reset to 3ee5748e37fbedd727649505437cb0103fb08875