Merge branch 'hotfix/paymenttext'
update
Merge branch 'hotfix/payfaqupdate' into develop