Merge pull request #18290 from eileenmcnaughton/tax