Back port Journey routes

WIP