Merge "rename feature_base to feature"