Make Router use a config variable if available. Allows derived router
Merge branch 'master' into RouterFixup