Merge branch 'JAL-1447' into develop