Merge tag 'v3.0.0-rc4'