Merge "Fix restore-agent timeouts"