Merge branch 'JAL-2571' into develop