Clean the garbage collector
Merge branch 'hotfix'