Merge pull request #11628 from ctzsnooze/During-switch-failsafe,-aux-channel-hold...