Merge pull request #11475 from neheb/hfewfh