Update for latest changes in Nightly