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