Re: Support client_id variable expansion