Merge pull request #28533 from GangaManoj/product-bundle-fixes

fix: misc minor Product Bundle fixes