Merge pull request #9843 from annando/no-filetag