Merge branch 'JAL-1445' into develop