merge changes in client/ #579