Merge branch 'bug/JAL-2536' into develop