Merge "PluginLib: Don't use foreach"