Merge pull request #11504 from limonspb/failsafe_delay_fix