Merge branch 'bug/JAL-1230' into Release_2_8_Branch