Merge branch 'bug/JAL-3477_memory_max_allocation' into develop