Merge "rename FeatureBase to Feature"