Define clientId on Settings.hs
Merge remote-tracking branch 'origin/i0086'