Update to master
Fix router service id