Merge branch 'JAL-1286' into develop