Merge "Lock all the things" into oc-dev