Refs #17702 EEA; Restrict eea.annotator to view view and edit view
Merge branch 'master' into sync