Merged in upstream changes