Removed circular dependencies

Closes #3313400

Merge request reports

Loading