Merge pull request #5477 from dibdot/travelmate-17.01