Merge "Use inode numbers for CE storage, fix sizes." into nyc-dev