Merge branch 'cleanup/minorChanges' into 'next'

Merged Timo Koch requested to merge cherry-pick-50b9a631 into next

Cleanup/minor changes

See merge request !286 (merged)

Merge request reports