Thank you @mietekn and @daniel for your work!
Seems like this is already in the latest snapshots, which are based on the committ after this with hash eb1b022043.
Edit: although attendedsysupgrade offered me a version based on 4f87a4d just prior to the patch until I added one package and forced a new build.