merge in oc-release history after reset to bde09b5ae1bd923f0ec578b61b9c55014e9be248