Merge "Fix racy clone" into oc-dev