Merge branch 'bug/JAL-2727closeAllFreeMemory' into develop