Merge branch 'JAL-1517_release282' into Release_2_8_2_Branch