@ProPheT777 said he wants to create the patch. I let him do it. Then I will backport his patch on this PR.