Merge "Update object info when writing a file." into nyc-dev