Merge branch 'hotfix/0.1.6'
Update payment controller
Merge branch 'hotfix/0.1.7' into develop