Fixing router CLI
Merge remote-tracking branch 'refs/remotes/upstream/1.1.0' into 1.1.0