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