Merged in upstream updates