Merge fixes

Ing. Jan Trávníček requested to merge merge-fixes into master

Merge request reports