Merge tag 'v5.2-rc4' into mauro