Merge branch 'feature/JAL-1379' into Release_2_8_2_Branch