Merge pull request #22617 from eileenmcnaughton/view