Convert to attributes and handle origin deprecation

Closes #3560193

Merge request reports

Loading