Merge "Revert "Batch calls to the Metadata Syncer"" into main