Merge branch 'bug/JAL-2837' into develop