Merge "Adding core_plugin, type_drivers and service_plugins parameters"