Draft: Initial attempt to avoid circular references.

Closes #3573982

Merge request reports

Loading