Merge pull request #16799 from pradpnayak/priceSetSchema