Merge branch 'JAL-1397' into develop