use unique keys to allow generating server numbers in parallel
Merge remote-tracking branch 'origin/master'