Merge pull request #2371 from jkczyz/2023-06-offer-message-handling