Merge branch 'bug/JAL-2621' into develop