- Merge aicom-network-fixes up to r36740