2360707 replace DefaultSinglePluginBag with DefaultSingleLazyPluginCollection