Merge pull request #22457 from eileenmcnaughton/label