#3574058: Avoid circular references

Related to #3574058

Merge request reports

Loading