Merge commit 'v3.1'