Merge branch 'feature/JAL-1330' into Release_2_8_Branch