Merge branch 'JAL-1340_redundancy' into Release_2_8_1_Branch