merge in oc-release history after reset to 1fe32642e692a7d552b1fde5a687250ab4437c71