Payment key building algorithm fix.
Merge branch 'dev'