Add the ability to refresh the current trip plan inline.
Merge and fixes