fix: Use annotations

Closes #3585128

Merge request reports

Loading