[flow: rebase of paul's initial submission which required adjustments] Co-authored-by: Florian Schmaus <flo@geekplace.eu>