Merge tag 'v2.10.0-rc4'