Merge branch 'bug/JAL-2586' into develop