Merge "sync: assign manifest_name earlier"