Merge branch 'bug/JAL-2821' into develop