Merge branch '4-0-local' into v4-0-stable