Merge branch 'partial-upgrade' into 'master'

Fix partial upgrade in the guest

Closes #136

See merge request !164
6 jobs for master in 31 minutes and 20 seconds (queued for 3 seconds)