[Fixes#79977658] Unable to plan a trip when assisting.
Merge conflicts