merge in oc-release history after reset to 77966f8f394a6b3a7442401ac5e034355b261169