Merge branch 'bug/JAL-2632' into develop