New Routing API, query params support, refactoring
Tests update for the new Routing API
Merge branch 'routing' into dev