Merge tag 'v3.19-rc5' into devel