Add DualRouter
Merge branch 'dev'