@willdurand is this a wanted change ?