Merge pull request #15212 from mmyriam/mmyriam-case-tag-search-patch-1