[TSAM-11694] Merge client list into main view