Merge pull request #5670 from micmac1/tiff-up