Merge pull request #40521 from barredterra/rfq-supplier-count