Merge "Revert "Update if condition for product generation""