Merge branch 'PropagationGetTravelCost'