[bug#50213] Updated patch set

[jgart]

Hi Efraim,

I updated the patchset and squashed some of the commits that can be logically 
grouped together as a single commit.

I removed python-pytest-6 from the patch set since Maxim updated it since then 
in 66071cd85ea323292eb60258d3cef9ffaf8306d4.

I tested this new patch set and everything builds fine for me. Let me know if 
builds are still failing for you.

all best,

jgart