Merge branch 'bug/JAL-2491' into develop