Merge "Add missing information from table features"