Merge "Multi-user optimizations." into tm-dev