merge in oc-release history after reset to 8181c6222a23766a546e4cf19bd317c9e654bebb