Merge branch 'hotfix/concierge'
Merge branch 'release/v1.22'
payment faq
[ci skip]:
Merge branch 'hotfix/paymenttext' into develop