Router updates
Merge remote-tracking branch 'origin/Router-Phase-II'