refactor annotations

1 job for !7 with fix/annotations in 14 seconds (queued for 1 second)
merge request