Merge pull request #18201 from grokability/#18185-added-tag-color-to-…

Merge pull request #18201 from grokability/#18185-added-tag-color-to-… #2574