Merge branch 'v3-2-test-merge' into v3-2-stable