Merge commit 'origin/v3-2-stable' into v3-2-test