Add annotation support

Closes #3397426

Merge request reports

Loading