Merge branch 'bug/JAL-2742' into develop