I'm not sure this should be part of this pull request. What do think @fqueze and @dmose ?