Merge branch 'bug/JAL-2576' into develop