Merge v0-hotfixes into v0.10.9

Merged Markus Scheidgen requested to merge v0-hotfixes into v0.10.9

Merge request reports