Added memory tracking
Merge branch 'dev' into dev_LA