Add a new protocol and some fixes

Merged Amir MOHAMMADI requested to merge annot into master

Merge request reports