Merge branch 'patch/JAL-848' into Release_2_8_2_Branch