oops, duplicate with #568 ?

Is there something still pending there btw? 
that is an open PR for a little while, the comments have been addressed, AFAIK.