Merge aicom-network-branch (without NDIS changes for now)