Better IDs for configured client
Merge remote-tracking branch 'upstream/master'