Merge commit 'release-4-0-0alpha1' into v4-0-test