Merge pull request #12747 from neheb/tess