Removed memory leaks (!frozen)
Merge branch 'dev_LA' into dev