Merge tag 'v5.0-rc1' into next-general