Merge branch 'JAL-1340_redundancy' into develop