Wait that I merged #672 before rebasing this one ;-)
Rebase done :)
And local tests show it works perfectly as well :)
Thanks!
No problem :)