[openFATE 309702] Make NetworkManager better