added parameter for client id
Merge remote-tracking branch 'origin/last_performance_tests'