Merge branch 'bug/JAL-2842' into develop