Merge commit 'v3.4-rc4' into next