Merge fixes into current dev branch

merge fixes which were accidentally overwritten

Merge request reports

Loading