Merge "Follow framework refactoring." into nyc-dev