Pulled in upstream changes