Merged in upstream