Merge branch 'bug/JAL-2551' into bug/JAL-2034contextchange