WIP: Add annotation support and fix some bugs

Merge request reports

Loading