Merge branch 'bug/JAL-3330' into develop