Merge jt

Jan Trávníčekrequested to merge
merge-jt into master

Use std variant instead of one made by us, somewhere replaced with simpler class.

Merge request reports