Merge "Fix excessive locking synchronization leading to deadlocks."