Merge pull request #22708 from braders/feature/priceset-notice-fix