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