Update client
Merge branch 'routingFixes'