Merge pull request #11509 from ctzsnooze/failsafe-rc5-dev