Merge branch 'optimisation/JAL-2001' into develop