Merge branch 'hotfix/0.1.8'
Rename payment gateway events
Merge branch 'hotfix/0.1.9' into develop