Merge "Avoid locking mChanges when not necessary" into sc-dev