fixed code duplication
Merge remote-tracking branch 'origin/payment' into payment