[Sync] Another chunk of code sync