Merge tag 'v5.2' into next