Merge pull request #3028 from jkczyz/2024-04-offer-id-followups