Merge branch 'bug/JAL-2597' into develop