Merge branch 'JAL-1360_Branch' into Release_2_8_2_Branch