Merged in NetworkManager