Merge branch 'bugs/JAL-1151' into Release_2_8_2_Branch