[openFATE 306324] Improvements to Failsafe mode