Merge "Make BackupTransport more resilient" into tm-dev