Merge branch 'bug/JAL-2846' into develop