Merge "Reduce lock contention." into tm-dev