merged changes from master regarding multiple clients