Including July 2nd upstream changes