merge in oc-release history after reset to 7c6dc833efd603238a7ffe15f467994c7517292c