Merge branch 'patch/JAL-1286_JAL-1265' into Release_2_8_2_Branch