Merge pull request #23279 from ffontaine/fix-tiff-license