merge in oc-release history after reset to 3393bfbabe936232e94c419a34f3470de1a29191