Include new features in 3.0 #8225

Include the following in the stable 3.0 release:

• Pablo's PRs
• Bedrock PRs (from master, once they're available)

This issue is mostly there so that we don't release prematurely, without first syncing with master and getting the PRs in.