Merge pull request #21528 from Mangesh-Khairnar/marketplace-fixes

fix: pre-process both the existing and new products