Merge branch 'hotfix/v0.6_Jed_fixes_1' into develop
Improved the deallocation of objects in every part of the application.
Merge branch 'release/v0.61'