Plugin locations cleanup after merge from stable