correct FBTest for issue 6291
Merge remote-tracking branch 'origin/master'