* commit 'fa331b1dfbf3e071e2ff48dbe21727452bfb8042': Harden against transiently unavailable backup transports