Merge pull request #2567 from G8XSU/payment-id