Merge "TableFeatures deserialization fix"