Hi Guillaume, I've not been able to contribute with this one. It's been a busy month for me. Sorry.
I can check this out next week after retaking HHH-13088 Open this week, would be good enough for you?

PS: I'm still not able to mention users