Merge pull request #1989 from jkczyz/2023-01-stateless-offers