Merge branch 'bug/JAL-2034_fix' into develop