Merge pull request #9940 from neheb/tr2