diff --git a/interface/web/dashboard/lib/lang/ar_dashlet_limits.lng b/interface/web/dashboard/lib/lang/ar_dashlet_limits.lng
index adc5ac184d25a95ce4d199bc86e7ee4542d48c69..e6617be59bdf4b684aa56b07ab0183fddc013fda 100644
--- a/interface/web/dashboard/lib/lang/ar_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/ar_dashlet_limits.lng
@@ -5,7 +5,7 @@ $wb['unlimited_txt'] = 'Unlimited';
 $wb['limit_maildomain_txt'] = 'Number of email domains';
 $wb['limit_mailbox_txt'] = 'Number of mailboxes';
 $wb['limit_mailalias_txt'] = 'Number of email aliases';
-$wb['limit_mailaliasdomain_txt'] = 'Number of domain aliases';
+$wb['limit_mailaliasdomain_txt'] = 'Number of email domain aliases';
 $wb['limit_mailforward_txt'] = 'Number of email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Number of email routes';
diff --git a/interface/web/dashboard/lib/lang/de_dashlet_limits.lng b/interface/web/dashboard/lib/lang/de_dashlet_limits.lng
index fe1d57327fad1f8409c11ab8b20bfb68b6f26440..c0455939cc20e62598c2e442befdd5026ede5e3d 100644
--- a/interface/web/dashboard/lib/lang/de_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/de_dashlet_limits.lng
@@ -5,7 +5,7 @@ $wb['unlimited_txt'] = 'unlimitiert';
 $wb['limit_maildomain_txt'] = 'Anzahl der E-Mail Domains';
 $wb['limit_mailbox_txt'] = 'Anzahl der E-Mail Konten';
 $wb['limit_mailalias_txt'] = 'Anzahl der E-Mail Aliase';
-$wb['limit_mailaliasdomain_txt'] = 'Anzahl der Domain Aliase';
+$wb['limit_mailaliasdomain_txt'] = 'Anzahl der E-Mail Domain Aliase';
 $wb['limit_mailforward_txt'] = 'Anzahl der E-Mail Weiterleitungen';
 $wb['limit_mailcatchall_txt'] = 'Anzahl der E-Mail Catchall Konten';
 $wb['limit_mailrouting_txt'] = 'Anzahl der E-Mail Routen';
diff --git a/interface/web/dashboard/lib/lang/en_dashlet_limits.lng b/interface/web/dashboard/lib/lang/en_dashlet_limits.lng
index f6d8ed88406fa8fe73ab572c639c77b865774778..ac1bfc64b770f141daf8ce921ae370e2c29c4f6b 100644
--- a/interface/web/dashboard/lib/lang/en_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/en_dashlet_limits.lng
@@ -6,7 +6,7 @@ $wb['limit_maildomain_txt'] = "Number of email domains";
 $wb['limit_mailmailinglist_txt'] = "Number of mailing lists";
 $wb['limit_mailbox_txt'] = "Number of mailboxes";
 $wb["limit_mailalias_txt"] = 'Number of email aliases';
-$wb["limit_mailaliasdomain_txt"] = 'Number of domain aliases';
+$wb["limit_mailaliasdomain_txt"] = 'Number of email domain aliases';
 $wb["limit_mailforward_txt"] = 'Number of email forwarders';
 $wb["limit_mailcatchall_txt"] = 'Number of email catchall accounts';
 $wb["limit_mailrouting_txt"] = 'Number of email routes';
diff --git a/interface/web/dashboard/lib/lang/fi_dashlet_limits.lng b/interface/web/dashboard/lib/lang/fi_dashlet_limits.lng
index adc5ac184d25a95ce4d199bc86e7ee4542d48c69..e6617be59bdf4b684aa56b07ab0183fddc013fda 100644
--- a/interface/web/dashboard/lib/lang/fi_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/fi_dashlet_limits.lng
@@ -5,7 +5,7 @@ $wb['unlimited_txt'] = 'Unlimited';
 $wb['limit_maildomain_txt'] = 'Number of email domains';
 $wb['limit_mailbox_txt'] = 'Number of mailboxes';
 $wb['limit_mailalias_txt'] = 'Number of email aliases';
-$wb['limit_mailaliasdomain_txt'] = 'Number of domain aliases';
+$wb['limit_mailaliasdomain_txt'] = 'Number of email domain aliases';
 $wb['limit_mailforward_txt'] = 'Number of email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Number of email routes';
diff --git a/interface/web/dashboard/lib/lang/ja_dashlet_limits.lng b/interface/web/dashboard/lib/lang/ja_dashlet_limits.lng
index adc5ac184d25a95ce4d199bc86e7ee4542d48c69..e6617be59bdf4b684aa56b07ab0183fddc013fda 100644
--- a/interface/web/dashboard/lib/lang/ja_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/ja_dashlet_limits.lng
@@ -5,7 +5,7 @@ $wb['unlimited_txt'] = 'Unlimited';
 $wb['limit_maildomain_txt'] = 'Number of email domains';
 $wb['limit_mailbox_txt'] = 'Number of mailboxes';
 $wb['limit_mailalias_txt'] = 'Number of email aliases';
-$wb['limit_mailaliasdomain_txt'] = 'Number of domain aliases';
+$wb['limit_mailaliasdomain_txt'] = 'Number of email domain aliases';
 $wb['limit_mailforward_txt'] = 'Number of email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Number of email routes';
diff --git a/interface/web/dashboard/lib/lang/pt_dashlet_limits.lng b/interface/web/dashboard/lib/lang/pt_dashlet_limits.lng
index adc5ac184d25a95ce4d199bc86e7ee4542d48c69..e6617be59bdf4b684aa56b07ab0183fddc013fda 100644
--- a/interface/web/dashboard/lib/lang/pt_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/pt_dashlet_limits.lng
@@ -5,7 +5,7 @@ $wb['unlimited_txt'] = 'Unlimited';
 $wb['limit_maildomain_txt'] = 'Number of email domains';
 $wb['limit_mailbox_txt'] = 'Number of mailboxes';
 $wb['limit_mailalias_txt'] = 'Number of email aliases';
-$wb['limit_mailaliasdomain_txt'] = 'Number of domain aliases';
+$wb['limit_mailaliasdomain_txt'] = 'Number of email domain aliases';
 $wb['limit_mailforward_txt'] = 'Number of email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Number of email routes';
diff --git a/interface/web/dashboard/lib/lang/ro_dashlet_limits.lng b/interface/web/dashboard/lib/lang/ro_dashlet_limits.lng
index adc5ac184d25a95ce4d199bc86e7ee4542d48c69..e6617be59bdf4b684aa56b07ab0183fddc013fda 100644
--- a/interface/web/dashboard/lib/lang/ro_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/ro_dashlet_limits.lng
@@ -5,7 +5,7 @@ $wb['unlimited_txt'] = 'Unlimited';
 $wb['limit_maildomain_txt'] = 'Number of email domains';
 $wb['limit_mailbox_txt'] = 'Number of mailboxes';
 $wb['limit_mailalias_txt'] = 'Number of email aliases';
-$wb['limit_mailaliasdomain_txt'] = 'Number of domain aliases';
+$wb['limit_mailaliasdomain_txt'] = 'Number of email domain aliases';
 $wb['limit_mailforward_txt'] = 'Number of email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Number of email routes';
diff --git a/interface/web/dashboard/lib/lang/se_dashlet_limits.lng b/interface/web/dashboard/lib/lang/se_dashlet_limits.lng
index adc5ac184d25a95ce4d199bc86e7ee4542d48c69..e6617be59bdf4b684aa56b07ab0183fddc013fda 100644
--- a/interface/web/dashboard/lib/lang/se_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/se_dashlet_limits.lng
@@ -5,7 +5,7 @@ $wb['unlimited_txt'] = 'Unlimited';
 $wb['limit_maildomain_txt'] = 'Number of email domains';
 $wb['limit_mailbox_txt'] = 'Number of mailboxes';
 $wb['limit_mailalias_txt'] = 'Number of email aliases';
-$wb['limit_mailaliasdomain_txt'] = 'Number of domain aliases';
+$wb['limit_mailaliasdomain_txt'] = 'Number of email domain aliases';
 $wb['limit_mailforward_txt'] = 'Number of email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Number of email routes';
diff --git a/interface/web/dashboard/lib/lang/sk_dashlet_limits.lng b/interface/web/dashboard/lib/lang/sk_dashlet_limits.lng
index adc5ac184d25a95ce4d199bc86e7ee4542d48c69..e6617be59bdf4b684aa56b07ab0183fddc013fda 100644
--- a/interface/web/dashboard/lib/lang/sk_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/sk_dashlet_limits.lng
@@ -5,7 +5,7 @@ $wb['unlimited_txt'] = 'Unlimited';
 $wb['limit_maildomain_txt'] = 'Number of email domains';
 $wb['limit_mailbox_txt'] = 'Number of mailboxes';
 $wb['limit_mailalias_txt'] = 'Number of email aliases';
-$wb['limit_mailaliasdomain_txt'] = 'Number of domain aliases';
+$wb['limit_mailaliasdomain_txt'] = 'Number of email domain aliases';
 $wb['limit_mailforward_txt'] = 'Number of email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Number of email routes';
diff --git a/interface/web/dashboard/lib/lang/tr_dashlet_limits.lng b/interface/web/dashboard/lib/lang/tr_dashlet_limits.lng
index adc5ac184d25a95ce4d199bc86e7ee4542d48c69..e6617be59bdf4b684aa56b07ab0183fddc013fda 100644
--- a/interface/web/dashboard/lib/lang/tr_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/tr_dashlet_limits.lng
@@ -5,7 +5,7 @@ $wb['unlimited_txt'] = 'Unlimited';
 $wb['limit_maildomain_txt'] = 'Number of email domains';
 $wb['limit_mailbox_txt'] = 'Number of mailboxes';
 $wb['limit_mailalias_txt'] = 'Number of email aliases';
-$wb['limit_mailaliasdomain_txt'] = 'Number of domain aliases';
+$wb['limit_mailaliasdomain_txt'] = 'Number of email domain aliases';
 $wb['limit_mailforward_txt'] = 'Number of email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Number of email routes';
diff --git a/interface/web/dns/templates/dns_wizard.htm b/interface/web/dns/templates/dns_wizard.htm
index 1e480dce48af5c6714187b0bf6aa0629b58a2d1d..c6cddb02d142a57f20bfe301ac0e36293147ca40 100644
--- a/interface/web/dns/templates/dns_wizard.htm
+++ b/interface/web/dns/templates/dns_wizard.htm
@@ -115,3 +115,18 @@
         resultBoxPosition: 'e'
     });	
 </script>
+<script language="JavaScript" type="text/javascript">
+    jQuery('#ipv6').ispconfigSearch({
+        dataSrc: '/dns/ajax_get_json.php?type=get_ipv6',
+        resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
+        ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
+        noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
+        noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+        minChars: 0,
+        cssPrefix: 'df-',
+        fillSearchField: true,
+        fillSearchFieldWith: 'fill_text',
+        searchFieldWatermark: '',
+        resultBoxPosition: 'e'
+    });
+</script>
diff --git a/server/lib/classes/cron.d/150-awstats.inc.php b/server/lib/classes/cron.d/150-awstats.inc.php
index 7c59b57b90c592ea08a5399e7c6c61bda3b2b9e2..5b54a181cf3e5b4842c990c39655052e6e81f4d0 100644
--- a/server/lib/classes/cron.d/150-awstats.inc.php
+++ b/server/lib/classes/cron.d/150-awstats.inc.php
@@ -100,11 +100,20 @@ class cronjob_awstats extends cronjob {
 			}
 
 			if(!is_file($awstats_website_conf_file)) {
-				$awstats_conf_file_content = 'Include "'.$awstats_conf_dir.'/awstats.conf"
+				if (is_file($awstats_conf_dir."/awstats.conf")) {
+                                	$include_file = $awstats_conf_dir."/awstats.conf";
+				} elseif (is_file($awstats_conf_dir."/awstats.model.conf")) {
+					$include_file = $awstats_conf_dir."/awstats.model.conf";
+				}
+				$awstats_conf_file_content = 'Include "'.$include_file.'"
         LogFile="/var/log/ispconfig/httpd/'.$domain.'/yesterday-access.log"
         SiteDomain="'.$domain.'"
         HostAliases="www.'.$domain.' localhost 127.0.0.1'.$aliasdomain.'"';
-				file_put_contents($awstats_website_conf_file, $awstats_conf_file_content);
+				if (isset($include_file)) {
+					file_put_contents($awstats_website_conf_file, $awstats_conf_file_content);
+				} else {
+					$app->log("No awstats base config found. Either awstats.conf or awstats.model.conf must exist in ".$awstats_conf_dir.".", LOGLEVEL_WARN);
+				}
 			}
 
 			if(!@is_dir($statsdir)) mkdir($statsdir);
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 526365a5de3879ca0aaee8a46f41db08db6549f8..de71874f1f9f482d89c279857c5d4105ffbc5b66 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -2626,13 +2626,22 @@ class apache2_plugin {
 			}
 
 			$content = '';
-			$content .= "Include \"".$awstats_conf_dir."/awstats.conf\"\n";
+			if (is_file($awstats_conf_dir."/awstats.conf")) {
+				$include_file = $awstats_conf_dir."/awstats.conf";
+			} elseif (is_file($awstats_conf_dir."/awstats.model.conf")) {
+				$include_file = $awstats_conf_dir."/awstats.model.conf";
+			}
+			$content .= "Include \"".$include_file."\"\n";
 			$content .= "LogFile=\"/var/log/ispconfig/httpd/".$data['new']['domain']."/access.log\"\n";
 			$content .= "SiteDomain=\"".$data['new']['domain']."\"\n";
 			$content .= "HostAliases=\"www.".$data['new']['domain']."  localhost 127.0.0.1\"\n";
 
-			$app->system->file_put_contents($awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf', $content);
-			$app->log('Created AWStats config file: '.$awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf', LOGLEVEL_DEBUG);
+			if (isset($include_file)) {
+				$app->system->file_put_contents($awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf', $content);
+				$app->log('Created AWStats config file: '.$awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf', LOGLEVEL_DEBUG);
+			} else {
+				$app->log("No awstats base config found. Either awstats.conf or awstats.model.conf must exist in ".$awstats_conf_dir.".", LOGLEVEL_WARN);
+			}
 		}
 
 		if(is_file($data['new']['document_root']."/" . $web_folder . "/stats/index.html")) $app->system->unlink($data['new']['document_root']."/" . $web_folder . "/stats/index.html");
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index b49f2d2468d6cbf5d50d29278a4a78fcd85077a8..1a6e57ba0f601480e41340775f5d699729e448b4 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -2236,13 +2236,22 @@ class nginx_plugin {
 			}
 
 			$content = '';
-			$content .= "Include \"".$awstats_conf_dir."/awstats.conf\"\n";
+			if (is_file($awstats_conf_dir."/awstats.conf")) {
+				$include_file = $awstats_conf_dir."/awstats.conf";
+			} elseif (is_file($awstats_conf_dir."/awstats.model.conf")) {
+				$include_file = $awstats_conf_dir."/awstats.model.conf";
+			}
+			$content .= "Include \"".$include_file."\"\n";
 			$content .= "LogFile=\"/var/log/ispconfig/httpd/".$data['new']['domain']."/access.log\"\n";
 			$content .= "SiteDomain=\"".$data['new']['domain']."\"\n";
 			$content .= "HostAliases=\"www.".$data['new']['domain']."  localhost 127.0.0.1\"\n";
 
-			$app->system->file_put_contents($awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf', $content);
-			$app->log('Created AWStats config file: '.$awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf', LOGLEVEL_DEBUG);
+			if (isset($include_file)) {
+				$app->system->file_put_contents($awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf', $content);
+				$app->log('Created AWStats config file: '.$awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf', LOGLEVEL_DEBUG);
+			} else {
+				$app->log("No awstats base config found. Either awstats.conf or awstats.model.conf must exist in ".$awstats_conf_dir.".", LOGLEVEL_WARN);
+			}
 		}
 
 		if(is_file($data['new']['document_root']."/" . $web_folder . "/stats/index.html")) $app->system->unlink($data['new']['document_root']."/" . $web_folder . "/stats/index.html");