Merge "Reduce lock contention"