Merge PR #1658
Merge branch 'laurentg-encapsulate-routers'