- Merge r45531 and r45545 from aicom-network-branch