Merge upstream changes

Merged Philip Müller requested to merge calamares:2.4.x-stable into 2.4.x-stable

Created by: philmmanjaro

Merge request reports