#9491: [Travel] Broken page after payment
Merge remote-tracking branch 'origin/version-4.6' into payment-page-broken_version-4.6_t9491