Merge tag 'v2.9.0-rc5'