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