Merge branch 'bug/JAL-2590' into develop