Add Router/Dealer support plus unit test
Fix blocking unit test
Merge branch 'router-dealer'