Merge commit 'v3.1-rc2' into HEAD