Merge "Fix lock contention between DMS and ATMS" into tm-dev