Merge tag 'v3.4-rc5' into for-3.5/core