Merge branch 'feature/custom-discovery-tool' of https://gitlab.fi.muni.cz/lexa/nested into feature/custom-discovery-tool