Merge commit 'v3.2' into test-branch