@kevinfunk: I was not able to apply the patch. Have created the new one with ...