Find existing products

Merging changes from the upstream version.