merged some changes from master regarding multiclient run