Index: strings.txt
===================================================================
--- strings.txt	(revision 20453)
+++ strings.txt	(working copy)
@@ -13723,6 +13723,15 @@
 	NL	Verzamelalbums bij individuele artiesten weergeven
 	ZH_CN	把合辑发表在个别艺人中
 
+SETUP_AUTODETECTVARIOUSARTISTSALBUMS_DESC
+	EN	You can choose to have compilation albums detected automatically based on the number of artists on the albums. If automatic detection is enabled, albums with more than one artist will be considered a compilation album.
+
+SETUP_AUTODETECTVARIOUSARTISTSALBUMS_1
+	EN	Detect compilation albums automatically based on number of artists
+
+SETUP_AUTODETECTVARIOUSARTISTSALBUMS_0
+	EN	Only detect compilation albums based on tags
+
 SETUP_VARIOUSARTISTSSTRING_DESC
 	DA	Når komplationsalbums er grupperet sammen, vises de under "Diverse Kunstnere" som standard. Du kan ændre dette navn nedenunder.
 	DE	Gruppierte Kompilationen werden standardmäßig unter 'Diverse Interpreten' angezeigt. Sie können diesen Namen unten ändern.
Index: HTML/EN/settings/server/behavior.html
===================================================================
--- HTML/EN/settings/server/behavior.html	(revision 20453)
+++ HTML/EN/settings/server/behavior.html	(working copy)
@@ -23,6 +23,11 @@
 			<input type="radio" name="variousArtistAutoIdentification" value="1" [% IF prefs.variousArtistAutoIdentification %]checked[% END %]>[% 'SETUP_VARIOUSARTISTAUTOIDENTIFICATION_1' | getstring %]
 		[% END %]
 
+		[% WRAPPER settingGroup title="" desc="SETUP_AUTODETECTVARIOUSARTISTSALBUMS_DESC"%]
+			<input type="radio" name="autoDetectVariousArtistsAlbums" value="0" [% IF NOT prefs.autoDetectVariousArtistsAlbums %]checked[% END %]>[% 'SETUP_AUTODETECTVARIOUSARTISTSALBUMS_0' | getstring %]</input><br/>
+			<input type="radio" name="autoDetectVariousArtistsAlbums" value="1" [% IF prefs.autoDetectVariousArtistsAlbums %]checked[% END %]>[% 'SETUP_AUTODETECTVARIOUSARTISTSALBUMS_1' | getstring %]
+		[% END %]
+
 		[% WRAPPER settingGroup title="" desc="SETUP_USEBANDASALBUMARTIST_DESC"%]
 			<input type="radio" name="useBandAsAlbumArtist" value="0" [% IF NOT prefs.useBandAsAlbumArtist %]checked[% END %]>[% 'SETUP_USEBANDASALBUMARTIST_0' | getstring %]<br/>
 			<input type="radio" name="useBandAsAlbumArtist" value="1" [% IF prefs.useBandAsAlbumArtist %]checked[% END %]>[% 'SETUP_USEBANDASALBUMARTIST_1' | getstring %]<br/>
Index: Slim/Web/Settings/Server/Behavior.pm
===================================================================
--- Slim/Web/Settings/Server/Behavior.pm	(revision 20453)
+++ Slim/Web/Settings/Server/Behavior.pm	(working copy)
@@ -24,7 +24,7 @@
 	return (preferences('server'),
 			qw(displaytexttimeout noGenreFilter searchSubString ignoredarticles splitList
 			   browseagelimit groupdiscs persistPlaylists reshuffleOnRepeat saveShuffled composerInArtists conductorInArtists
-			   bandInArtists variousArtistAutoIdentification useBandAsAlbumArtist variousArtistsString)
+			   bandInArtists variousArtistAutoIdentification useBandAsAlbumArtist variousArtistsString autoDetectVariousArtistsAlbums)
 		   );
 }
 
Index: Slim/Utils/Prefs.pm
===================================================================
--- Slim/Utils/Prefs.pm	(revision 20453)
+++ Slim/Utils/Prefs.pm	(working copy)
@@ -188,6 +188,7 @@
 		'variousArtistAutoIdentification' => 0,
 		'useBandAsAlbumArtist'  => 0,
 		'variousArtistsString'  => undef,
+		'autoDetectVariousArtistsAlbums' => 1,
 		# Server Settings - FileTypes
 		'disabledextensionsaudio'    => '',
 		'disabledextensionsplaylist' => '',
@@ -404,7 +405,7 @@
 	$prefs->setChange( sub { Slim::Utils::Strings::setLanguage($_[1]) },               'language'    );
 	$prefs->setChange( \&main::checkVersion,                                           'checkVersion');
 
-	$prefs->setChange( sub { Slim::Control::Request::executeRequest(undef, ['wipecache']) }, qw(splitList groupdiscs) );
+	$prefs->setChange( sub { Slim::Control::Request::executeRequest(undef, ['wipecache']) }, qw(splitList groupdiscs autoDetectVariousArtistsAlbums) );
 
 	$prefs->setChange( sub { Slim::Utils::Misc::setPriority($_[1]) }, 'serverPriority');
 
Index: Slim/Music/Import.pm
===================================================================
--- Slim/Music/Import.pm	(revision 20453)
+++ Slim/Music/Import.pm	(working copy)
@@ -346,13 +346,15 @@
 sub runScanPostProcessing {
 	my $class  = shift;
 
-	# Auto-identify VA/Compilation albums
-	$log->info("Starting mergeVariousArtistsAlbums().");
+	if($prefs->get('autoDetectVariousArtistsAlbums')) {
+		# Auto-identify VA/Compilation albums
+		$log->info("Starting mergeVariousArtistsAlbums().");
+	
+		$importsRunning{'mergeVariousAlbums'} = Time::HiRes::time();
+	
+		Slim::Schema->mergeVariousArtistsAlbums;
+	}
 
-	$importsRunning{'mergeVariousAlbums'} = Time::HiRes::time();
-
-	Slim::Schema->mergeVariousArtistsAlbums;
-
 	# Post-process artwork, so we can use title formats, and use a generic
 	# image to speed up artwork loading.
 	$log->info("Starting findArtwork().");