Merge branch 'master' into 'MasterBugFixing'
BS-6598, change client maximum thread to 20
BS-6598, change max pool size to 50
Merge branch 'MasterBugFixing' into 'master'