Feature/custom discovery tool

Merged Ivan Vanát requested to merge feature/custom-discovery-tool into master

Merge request reports