Merge tag 'v2.11.0-rc1'