Merge "[Multi-user] Transport changes"