- Merge aicom-network-branch (still without the NDIS stuff)