Merge branch 'imp/JAL-2774' into bug/JAL-2831