Merge branch 'bug/JAL-2740' into develop