Merge pull request #2039 from jkczyz/2023-02-offer-flow