First set of cherry-picks post 6/28

Merges up to the first conflict on June 30th. I'll try to take a stab at merging the conflicting change. I haven't built this branch yet...