Is this going to be merged upstream?