Merge branch 'bug/JAL-2739' into develop