Sync with upstream

Don't merge yet, testing.