Merge pull request #4337 from nabinhait/payment_tool_fix

[fix] Mapping from Payment Tool