bugfix
payment data
Merge branch 'master' into brumdebug