Merge tag 'v3.19-rc4' into next