Merge commit 'v3.2-rc3' into next