Merge branch 'bug/JAL-2865removeGC' into develop