Merge "Fix for the "without any protocolPluginType provided" error"