Merge pull request #9741 from lucize/bfdd