Just for the records: There's now a fix for this at: https://github.com/systemd/systemd/pull/30074 (which I confirmed working)
>From my side it's not super important to have that cherry picked. I'd hope it might still make it into 255, so for that I can easily wait and it saves you guys some work! Thanks, Chris.