- Merge some small changes from aicom-network-branch to fix potential memory corrupt...