Merge pull request #20508 from seamuslee001/product_oddness