Merge pull request #14308 from eileenmcnaughton/uffield