Merge pull request #8168 from neheb/tas