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