Refs #18557 - Fix missing key deleted on dict.pop
Merge branch 'master' of https://github.com/collective/eea.annotator