Revert "Revert "NewFeatureComp""

This reverts commit 9f49b98ae6f02886865accaa2006f917893d9eb9.