Fix various issues with dependency cycles

Merge request reports

Loading