merge in oc-release history after reset to d23328969df798204e6f4ad30453b1fbde3fb10c