Merge branch 'handle_client_routing_errors' into all_the_fixes