Merge commit 'release-4-0-0alpha5' into v4-0-stable