Merge "Fix locking issues." into sc-dev