Merge all commits from master to devel

Merged Philip Müller requested to merge master into devel

Created by: Kirek

Merge all commits from master to devel

Merge request reports