Merge "Update traversal to use schema ingest changes"