Bring up to date with service.py changes in master branch
Bring up to date with client from master branch