7.x

Looks like these other commits should go in too?