Merge branch 'bug/JAL-2253' into develop