Merge branch 'bug/JAL-2831' into develop