Merge pull request #22421 from eileenmcnaughton/tax