Merge "Remove everything from under the lock." into sc-dev