sync with upstream, new build