Merge changes to krpc.py from feature/basic-services