Merge "Add missing lock" into sc-dev