Merge pull request #23213 from krant/tiff