sync with newclient

@lennartcl