Merge branch 'v0-hotfixes' into 'v0.10.9'

Merge v0-hotfixes into v0.10.9

See merge request !449
13 jobs for v0.10.9 in 26 minutes and 59 seconds (queued for 4 seconds)