Merge tag 'v5.2-rc2' into patchwork