Merge commit 'v3.5-rc2' into next