Merge "[DO NOT MERGE] Make TCMS multi-user-aware" into pi-dev