Merge pull request #2086 from rmehta/route-redesign

Route redesign