Merge pull request #3364 from anandpdoshi/anand-may-27

[fix] Product Search