Add feature toggle support for PNF PnP