Merge pull request #22031 from eileenmcnaughton/image