Merge branch 'Release_2_8_2_Branch' into features/JAL-1333