Add client ID constant
Merge remote-tracking branch 'remotes/chatwing/master' into HEAD