Florent Bertrand

Hi guys just a last call if it's possible to merge this PR, we invested time here to bring last changes to the PR and I think this will help...