Use attributes

(cherry picked from commit 83ee1fec)

Closes #3607710

Merge request reports

Loading