Merge "Fix backup-agent timeouts"