Merge commit 'v3.5-rc5' into next