Merge "Always disconnect agents immediately."