Merge branch 'JAL-1602_282_release' into Release_2_8_2_Branch