Merge pull request #22768 from Forceu/travelmate-hrewards