[[ Bug 13465 ]] Fix more memory leaks due to containers not being deleted
Merge pull request #1187 from runrevali/bugfix-13465

[[ Bug 13465 ]] Fix more memory leaks due to containers not being delete...