Merge commit 'v3.1-rc6' into core/locking