Merge remote-tracking branch 'origin/testing' into test/11452-I2P-displays-a-notice-when-bootstrapping-fails-is-fragile