Merge in v4.7.0 and v4.8.0

@jimmcgowan CCing you here to let you know what we're ready to go to staging with this upgrade as soon as the current staging is passed.

And this way we'll be completely up to date with versions! Woo!