Update for feature-freeze