Merge "Revert "Support multi users scenarios in Tapl"" into tm-qpr-dev