Merge pull request #19634 from rohitwaghchaure/cherry-pick_of_item_query_issue

Cherry pick of item query issue