Draft: Dependency rework

Dependency rework

Merge request reports

Loading