Resolve "Fix implementation of AnnotationAPI"

Merged Michelle Weidling requested to merge 262-fix-implementation-of-annotationapi into develop

Closes #262 (closed)

Merge request reports