merge in oc-release history after reset to 55ae6576ae115efd1546e2bb494d7c3fc52f7f77