Merge branch 'bug/JAL-2849' into develop