This is a fixup of 9a886c4b
@tomo this commit was only in 1.0 branch, I suppose this was a mistake and cherry picked in in master branch as 749d7f42
Yes, indeed. Thank you !