Merge pull request #3079 from jkczyz/2024-05-expects-quantity