Payment transaction key fix 2
Merge branch 'dev'