Avoid displaying new clients
master, agent: merge with virtual-nets branch