Merge branch 'wip' of https://gitlab.fi.muni.cz/fja/eval into wip