Backport Journey routes

WIP