merge upstream/nightly