Merge pull request #38725 from barredterra/preview-rfq