Payment callback key algorithm fix
Merge branch 'dev'