Fixed memory leak by injecting new instances of common collections
Merge branch 'fix_leak'