Merge pull request #9257 from neheb/bn