v3.0.x: minor refactor
v3.0.x: handle 'router sent' behaviour