Merge tag 'v2.4.0-rc1'