Merge branch 'bug/JAL-1775' into develop