merge in oc-release history after reset to 8bd1e095a1a5ebc5b45d3d3b77b64853e3d311a3