Merge pull request #12024 from yashodha/price_custom_search