Take into account first review by @cjolif, @seb-pereira and @wkeese.