Subject: [bug#73971] Rebase

From: Andreas Enge <[email-masked]>
Date: Fri, 22 Nov 2024 14:36:07 +0100

While looking at the branch, I have rebased it on master, so that we would
be ready to add additional patches :)

Andreas