Merge "Re-Introduce synchronization locking" into tm-dev