Memory leak plugs.
Merge branch 'dev'