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