Merge pull request #8912 from neheb/faad