(GEP-182) Move product plug-in to product feature