Merge pull request #7555 from micmac1/tiff-4010-17.01