I have submited a new pull request about ISPN-3165.

WDYT ?

Cheers,

Guillaume