Merge "Add new feature to cneFeatureConfig"