Merge pull request #9606 from neheb/tasn