Michel and Christian,

can we have this patch in 17.1 (final)?
I have to apply it by hand on every build.

Any further logs/debug needed?