Add support for external annotations

Merged Amir MOHAMMADI requested to merge annot into master

Merge request reports