Updates from nightly-3