Resolve #3545923 "Replace annotations with attributes 2.x"

Niels Sluijsrequested to merge
issue/table_header_scope_attribute-3545923:3545923-replace-annotations-with-attributes-2.x into 2.x

Closes #3545923

Merge request reports