Resolve #3473815 "Replace annotations 3.x"

Closes #3473815

Merge request reports

Loading