@javierbertoli @DavidS  if you have nothing against this, I'm going to merge this PR... few hours to reply :-)