fixed #148
Merge branch 'hotfix/paymentupdate2' into develop