DE542:Fixed defects for Payment change
Merge remote-tracking branch 'origin/integration' into integration