Merge tag 'v3.11-rc5' into for-3.12 branch