Merge pull request #13638 from eileenmcnaughton/squash_products