Add admin config variable
catch errors in fire()
Merge remote-tracking branch 'origin/bleeding' into bleeding