Merge branch 'bug/JAL-2577' into develop