Merge branch 'bug/JAL-2750' into develop