Merge "[Nsd] Fix feature name"