Fixed memory issue
Merge branch 'feature/fix-no-internet-memoryissue' into develop