Fix issues in payment integration and decide final payment gateway configuration in the next release.