Merge pull request #2970 from jkczyz/2024-03-offer-id