Merge branch 'payment' into dev
removed unused variable
Merge branch 'payment' into dev
Merge branch 'dev'