Merge commit 'v3.1-rc4' into out-of-tree