Merge branch 'v4-0-test' into v4-0-gmake3