Merge pull request #2576 from Spamcat/BEF-staging

Fixity-fix
Spiderbot quickfix.