Bugfix/#389 annotations loading

Merged dindigala requested to merge bugfix/#389-annotations-loading into develop

Merge request reports