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