Merge pull request #2468 from jkczyz/2023-08-offer-payment-id