1.deal with the variance in payment process.
Merge remote-tracking branch 'origin/master'