[MERGE] Sync some more files