Memory Leak
Merge branch 'feature/network' into develop

* feature/network:
  Memory Leak