Merge tag 'v3.19-rc2' into for-3.20/core