Requested by Sebastian Herrlinger (@kommander). Rebased onto current v2 with conflicts resolved and all required checks passing.
Co-authored-by: Simon Klee <hello@simonklee.dk>