Merge branch 'JAL-1347' into develop