various changes

Merged Tomáš Pecka requested to merge dev-tp2 into master

Merge request reports