Hi Sébastien,

can you test this patch against maint for a while and
report problems?

Thanks!