Hello Ludo,

This is the updated patch. I have tested it as suggested and it works.

It applies on core-updates-next.

Thank you,
Manolis