Merge branch 'memory-leaks'