Merge commit 'origin/v4-0-test' into 4-0-local