Trip planner up to date with production

Manually merged changes from production trip planner