merge with master
fix table_features stats