Fix payment total calculation
Merge branch 'hotfix/1.1.2'