Merge pull request #1719 from jkczyz/2022-09-offer-encoding