Merge pull request #21529 from eileenmcnaughton/view