Merge pull request #8489 from neheb/tl