Add router support.

Fixes bug: CSCuj08956