Merge "TIF: getClientUserId API" into main