Merge branch 'next' into v3.1-rc4