Merge "Multi-user aware TSMS"