Merge pull request #21520 from eileenmcnaughton/badger