Merge change 5662 into donut

* changes:
  toolbox: Revise route utility.