Make annotation support optional

Closes #3563702

Merge request reports

Loading