Merge "Use new plugin locations"