Merge branch 'bug/JAL-2321' into bug/JAL-2321_merged