merge in oc-release history after reset to 5523b2ddf8551ebfa882add3fb6de3f89a0f29a8