Various fixes jt+mp

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

Merge request reports