merged bugfix when removing render clients to branch