Enhancements to perfromance test client
Merge remote-tracking branch 'origin/master'