Merge branch 'JAL-1322' into develop