Update payment controller
Merge branch 'hotfix/0.1.7'