THis is just a preliminary patch for the future shortening route work

DO NOT USE MASTER NOW!

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>