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