Merge "Add missing synchronization"