Resolve #3563968 "Convert to attributes"

Stephen Mustgraverequested to merge
issue/security_review-3563968:3563968-convert-to-attributes into 3.1.x

Closes #3563968

Merge request reports