Patch merged upstream