HF improve payment message validation
Merge branch 'staging'