Merge tag 'v6.0.0-rc4'