Copy of !2338

Cristian Lerequested to merge
fix/find_dependency into main

Again buildbot does not work with forks :/

Merge request reports