Synchronize boostrap/failsafe.cf with core for PR#140