Merge commit 'release-4-0-0alpha15' into master4-tmp