fix findProduct
Merge origin/sprint1.5 into sprint1.5
fix findProduct
Merge origin/sprint1.5 into sprint1.5
fix findProduct