Merge pull request #9276 from neheb/fbz