Merge branch 'bug/JAL-2784' into develop