Merge branch 'bug/JAL-2634' into develop