Merge in changes from release-2.0 that missed the nightly branch