Merge pull request #4596 from mikma/routes-proto