Merge "Add IN_DEFAULT_DIRECTORY to views and projections"