diff --git a/modules/apps/asset/asset-list-service/src/main/java/com/liferay/asset/list/internal/asset/entry/provider/AssetListAssetEntryProviderImpl.java b/modules/apps/asset/asset-list-service/src/main/java/com/liferay/asset/list/internal/asset/entry/provider/AssetListAssetEntryProviderImpl.java
index c368b12d100093..616979eb5aa1e4 100644
--- a/modules/apps/asset/asset-list-service/src/main/java/com/liferay/asset/list/internal/asset/entry/provider/AssetListAssetEntryProviderImpl.java
+++ b/modules/apps/asset/asset-list-service/src/main/java/com/liferay/asset/list/internal/asset/entry/provider/AssetListAssetEntryProviderImpl.java
@@ -205,9 +205,10 @@ protected AssetEntryQuery getAssetEntryQuery(
 
 		properties.fastLoad(assetListEntry.getTypeSettings(segmentsEntryId));
 
-		_setCategoriesAndTags(
+		_setCategoriesAndKeywordsAndTags(
 			assetListEntry, assetEntryQuery, properties,
-			_getAssetCategoryIds(properties), _getAssetTagNames(properties));
+			_getAssetCategoryIds(properties), _getKeywords(properties),
+			_getAssetTagNames(properties));
 
 		long[] groupIds = GetterUtil.getLongValues(
 			StringUtil.split(
@@ -369,6 +370,35 @@ private static String[] _getAssetTagNames(UnicodeProperties properties) {
 		return allAssetTagNames;
 	}
 
+	private static String[] _getKeywords(UnicodeProperties properties) {
+		String[] allKeywords = new String[0];
+
+		for (int i = 0; true; i++) {
+			String[] queryValues = StringUtil.split(
+				properties.getProperty("queryValues" + i, null));
+
+			if (ArrayUtil.isEmpty(queryValues)) {
+				break;
+			}
+
+			boolean queryContains = GetterUtil.getBoolean(
+				properties.getProperty("queryContains" + i, StringPool.BLANK));
+			boolean queryAndOperator = GetterUtil.getBoolean(
+				properties.getProperty(
+					"queryAndOperator" + i, StringPool.BLANK));
+			String queryName = properties.getProperty(
+				"queryName" + i, StringPool.BLANK);
+
+			if (!Objects.equals(queryName, "keywords") && queryContains &&
+				(queryAndOperator || (queryValues.length == 1))) {
+
+				allKeywords = queryValues;
+			}
+		}
+
+		return allKeywords;
+	}
+
 	private long[] _filterAssetCategoryIds(long[] assetCategoryIds) {
 		List<Long> assetCategoryIdsList = new ArrayList<>();
 
@@ -593,16 +623,21 @@ private List<AssetEntry> _search(
 		return Collections.emptyList();
 	}
 
-	private void _setCategoriesAndTags(
+	private void _setCategoriesAndKeywordsAndTags(
 		AssetListEntry assetListEntry, AssetEntryQuery assetEntryQuery,
 		UnicodeProperties properties, long[] overrideAllAssetCategoryIds,
-		String[] overrideAllAssetTagNames) {
+		String[] overrideAllKeywords, String[] overrideAllAssetTagNames) {
 
 		long[] allAssetCategoryIds = new long[0];
 		long[] anyAssetCategoryIds = new long[0];
 		long[] notAllAssetCategoryIds = new long[0];
 		long[] notAnyAssetCategoryIds = new long[0];
 
+		String[] allKeywords = new String[0];
+		String[] anyKeywords = new String[0];
+		String[] notAllKeywords = new String[0];
+		String[] notAnyKeywords = new String[0];
+
 		String[] allAssetTagNames = new String[0];
 		String[] anyAssetTagNames = new String[0];
 		String[] notAllAssetTagNames = new String[0];
@@ -640,6 +675,20 @@ else if (!queryContains && queryAndOperator) {
 					notAnyAssetCategoryIds = assetCategoryIds;
 				}
 			}
+			else if (Objects.equals(queryName, "keywords")) {
+				if (queryContains && queryAndOperator) {
+					allKeywords = queryValues;
+				}
+				else if (queryContains && !queryAndOperator) {
+					anyKeywords = queryValues;
+				}
+				else if (!queryContains && queryAndOperator) {
+					notAllKeywords = queryValues;
+				}
+				else {
+					notAnyKeywords = queryValues;
+				}
+			}
 			else {
 				if (queryContains && queryAndOperator) {
 					allAssetTagNames = queryValues;
@@ -664,6 +713,12 @@ else if (!queryContains && queryAndOperator) {
 
 		assetEntryQuery.setAllCategoryIds(allAssetCategoryIds);
 
+		if (overrideAllKeywords != null) {
+			allKeywords = overrideAllKeywords;
+		}
+
+		assetEntryQuery.setAllKeywords(allKeywords);
+
 		if (overrideAllAssetTagNames != null) {
 			allAssetTagNames = overrideAllAssetTagNames;
 		}
@@ -679,6 +734,8 @@ else if (!queryContains && queryAndOperator) {
 
 		assetEntryQuery.setAnyCategoryIds(anyAssetCategoryIds);
 
+		assetEntryQuery.setAnyKeywords(anyKeywords);
+
 		long[] anyAssetTagIds = _assetTagLocalService.getTagIds(
 			siteGroupId, anyAssetTagNames);
 
@@ -686,6 +743,8 @@ else if (!queryContains && queryAndOperator) {
 
 		assetEntryQuery.setNotAllCategoryIds(notAllAssetCategoryIds);
 
+		assetEntryQuery.setNotAllKeywords(notAllKeywords);
+
 		for (String assetTagName : notAllAssetTagNames) {
 			long[] notAllAssetTagIds = _assetTagLocalService.getTagIds(
 				new long[] {siteGroupId}, assetTagName);
@@ -695,6 +754,8 @@ else if (!queryContains && queryAndOperator) {
 
 		assetEntryQuery.setNotAnyCategoryIds(notAnyAssetCategoryIds);
 
+		assetEntryQuery.setNotAnyKeywords(notAnyKeywords);
+
 		long[] notAnyAssetTagIds = _assetTagLocalService.getTagIds(
 			siteGroupId, notAnyAssetTagNames);
 
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/EditAssetListDisplayContext.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/EditAssetListDisplayContext.java
index 9e40f461ec9061..c5c8421fd8453a 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/EditAssetListDisplayContext.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/EditAssetListDisplayContext.java
@@ -276,6 +276,30 @@ public JSONArray getAutoFieldRulesJSONArray() {
 
 				ruleJSONObject.put("selectedItems", selectedItems);
 			}
+			else if (Objects.equals(queryName, "keywords")) {
+				queryValues = ParamUtil.getString(
+					_httpServletRequest, "keywords" + queryLogicIndex,
+					queryValues);
+
+				String[] keywords = StringUtil.split(queryValues, " ");
+
+				if (ArrayUtil.isEmpty(keywords)) {
+					continue;
+				}
+
+				List<HashMap<String, String>> selectedItems = new ArrayList<>();
+
+				for (String keyword : keywords) {
+					HashMap<String, String> selectedCategory = new HashMap<>();
+
+					selectedCategory.put("label", keyword);
+					selectedCategory.put("value", keyword);
+
+					selectedItems.add(selectedCategory);
+				}
+
+				ruleJSONObject.put("selectedItems", selectedItems);
+			}
 			else {
 				queryValues = ParamUtil.getString(
 					_httpServletRequest, "queryCategoryIds" + queryLogicIndex,
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/UpdateAssetListEntryDynamicMVCActionCommand.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/UpdateAssetListEntryDynamicMVCActionCommand.java
index 44bbb65fd5e1d0..1dbc274ae89515 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/UpdateAssetListEntryDynamicMVCActionCommand.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/UpdateAssetListEntryDynamicMVCActionCommand.java
@@ -116,6 +116,10 @@ protected AssetQueryRule getQueryRule(
 			values = ParamUtil.getStringValues(
 				actionRequest, "queryTagNames" + index);
 		}
+		else if (name.equals("keywords")) {
+			values = ParamUtil.getStringValues(
+				actionRequest, "keywords" + index);
+		}
 		else {
 			values = ParamUtil.getStringValues(
 				actionRequest, "queryCategoryIds" + index);
diff --git a/modules/apps/asset/asset-list-web/src/main/resources/META-INF/resources/js/AutoField.soy b/modules/apps/asset/asset-list-web/src/main/resources/META-INF/resources/js/AutoField.soy
index 14f8f0fb7c3273..a9293ecbfb2bb9 100644
--- a/modules/apps/asset/asset-list-web/src/main/resources/META-INF/resources/js/AutoField.soy
+++ b/modules/apps/asset/asset-list-web/src/main/resources/META-INF/resources/js/AutoField.soy
@@ -137,6 +137,7 @@
 					>
 						<option class="" {if $rule.type == 'assetCategories'}selected="selected"{/if} value="assetCategories">{msg desc=""}categories{/msg}</option>
 						<option class="" {if $rule.type == 'assetTags'}selected="selected"{/if} value="assetTags">{msg desc=""}tags{/msg}</option>
+						<option class="" {if $rule.type == 'keywords'}selected="selected"{/if} value="keywords">{msg desc=""}keywords{/msg}</option>
 					</select>
 				</div>
 
@@ -152,6 +153,19 @@
 						{param selectedItems: $rule.selectedItems ?: [] /}
 						{param vocabularyIds: $vocabularyIds /}
 					{/call}
+				{elseif $rule.type == 'keywords'}
+					<div class="form-group">
+						<label for="{$namespace + 'keywords' + $index}">{msg desc=""}keywords{/msg}</label>
+
+						<input
+							type="text"
+							class="form-control asset-query-keywords"
+							data-item-index="{$index}"
+							id="{$namespace + 'keywords' + $index}"
+							name="{$namespace + 'keywords' + $index}"
+							value="{$rule.queryValues ?: ''}"
+						/>
+					</div>
 				{else}
 					{call com.liferay.asset.taglib.AssetTagsSelector.render}
 						{param eventName: $namespace + 'selectTag' /}
diff --git a/modules/apps/asset/asset-publisher-api/src/main/java/com/liferay/asset/publisher/util/AssetPublisherHelper.java b/modules/apps/asset/asset-publisher-api/src/main/java/com/liferay/asset/publisher/util/AssetPublisherHelper.java
index 7b9854e656dda1..86018a2f1fe081 100644
--- a/modules/apps/asset/asset-publisher-api/src/main/java/com/liferay/asset/publisher/util/AssetPublisherHelper.java
+++ b/modules/apps/asset/asset-publisher-api/src/main/java/com/liferay/asset/publisher/util/AssetPublisherHelper.java
@@ -98,6 +98,12 @@ public AssetEntryQuery getAssetEntryQuery(
 			String[] overrideAllAssetTagNames)
 		throws PortalException;
 
+	public AssetEntryQuery getAssetEntryQuery(
+			PortletPreferences portletPreferences, long groupId, Layout layout,
+			long[] overrideAllAssetCategoryIds, String[] overrideAllKeywords,
+			String[] overrideAllAssetTagNames)
+		throws PortalException;
+
 	public List<AssetEntryResult> getAssetEntryResults(
 			SearchContainer searchContainer, AssetEntryQuery assetEntryQuery,
 			Layout layout, PortletPreferences portletPreferences,
@@ -134,6 +140,8 @@ public long[] getGroupIds(
 		PortletPreferences portletPreferences, long scopeGroupId,
 		Layout layout);
 
+	public String[] getKeywords(PortletPreferences portletPreferences);
+
 	public String getScopeId(Group group, long scopeGroupId);
 
 }
\ No newline at end of file
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/AssetPublisherDisplayContext.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/AssetPublisherDisplayContext.java
index 386ea4424d1de9..439c30e8ca1e3b 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/AssetPublisherDisplayContext.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/AssetPublisherDisplayContext.java
@@ -246,6 +246,33 @@ public String[] getAllAssetTagNames() {
 		return _allAssetTagNames;
 	}
 
+	public String[] getAllKeywords() {
+		if (_allKeywords != null) {
+			return _allKeywords;
+		}
+
+		_allKeywords = new String[0];
+
+		String keyword = ParamUtil.getString(_httpServletRequest, "keyword");
+
+		String selectionStyle = getSelectionStyle();
+
+		if (selectionStyle.equals("dynamic")) {
+			_allKeywords = _assetPublisherHelper.getKeywords(
+				_portletPreferences);
+		}
+
+		if (Validator.isNotNull(keyword) &&
+			!ArrayUtil.contains(_allKeywords, keyword)) {
+
+			_allKeywords = ArrayUtil.append(_allKeywords, keyword);
+		}
+
+		_allKeywords = ArrayUtil.distinct(_allKeywords, new StringComparator());
+
+		return _allKeywords;
+	}
+
 	public long getAssetCategoryId() {
 		if (_assetCategoryId != null) {
 			return _assetCategoryId;
@@ -335,7 +362,7 @@ assetListEntry, _getSegmentsEntryIds(),
 			_assetEntryQuery = _assetPublisherHelper.getAssetEntryQuery(
 				_portletPreferences, _themeDisplay.getScopeGroupId(),
 				_themeDisplay.getLayout(), getAllAssetCategoryIds(),
-				getAllAssetTagNames());
+				getAllKeywords(), getAllAssetTagNames());
 		}
 
 		_assetEntryQuery.setEnablePermissions(isEnablePermissions());
@@ -547,6 +574,30 @@ public JSONArray getAutoFieldRulesJSONArray() {
 
 				ruleJSONObject.put("selectedItems", selectedItems);
 			}
+			else if (Objects.equals(queryName, "keywords")) {
+				queryValues = ParamUtil.getString(
+					_httpServletRequest, "keywords" + queryLogicIndex,
+					queryValues);
+
+				String[] keywords = StringUtil.split(queryValues, " ");
+
+				if (ArrayUtil.isEmpty(keywords)) {
+					continue;
+				}
+
+				List<HashMap<String, String>> selectedItems = new ArrayList<>();
+
+				for (String keyword : keywords) {
+					HashMap<String, String> selectedCategory = new HashMap<>();
+
+					selectedCategory.put("label", keyword);
+					selectedCategory.put("value", keyword);
+
+					selectedItems.add(selectedCategory);
+				}
+
+				ruleJSONObject.put("selectedItems", selectedItems);
+			}
 			else {
 				queryValues = ParamUtil.getString(
 					_httpServletRequest, "queryCategoryIds" + queryLogicIndex,
@@ -1891,6 +1942,7 @@ private long[] _getSegmentsEntryIds() {
 	private Integer _abstractLength;
 	private long[] _allAssetCategoryIds;
 	private String[] _allAssetTagNames;
+	private String[] _allKeywords;
 	private Boolean _anyAssetType;
 	private Long _assetCategoryId;
 	private final AssetEntryActionRegistry _assetEntryActionRegistry;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/AssetPublisherConfigurationAction.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/AssetPublisherConfigurationAction.java
index b134c19d462031..ce18c2ddb90bc9 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/AssetPublisherConfigurationAction.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/AssetPublisherConfigurationAction.java
@@ -463,6 +463,10 @@ protected AssetQueryRule getQueryRule(
 			values = ParamUtil.getStringValues(
 				actionRequest, "queryTagNames" + index);
 		}
+		else if (name.equals("keywords")) {
+			values = ParamUtil.getStringValues(
+				actionRequest, "keywords" + index);
+		}
 		else {
 			values = ParamUtil.getStringValues(
 				actionRequest, "queryCategoryIds" + index);
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/AssetPublisherHelperImpl.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/AssetPublisherHelperImpl.java
index c0954a2a6d6c2e..a90dbc277eb178 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/AssetPublisherHelperImpl.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/AssetPublisherHelperImpl.java
@@ -366,13 +366,26 @@ public AssetEntryQuery getAssetEntryQuery(
 			String[] overrideAllAssetTagNames)
 		throws PortalException {
 
+		return getAssetEntryQuery(
+			portletPreferences, groupId, layout, overrideAllAssetCategoryIds,
+			null, overrideAllAssetTagNames);
+	}
+
+	@Override
+	public AssetEntryQuery getAssetEntryQuery(
+			PortletPreferences portletPreferences, long groupId, Layout layout,
+			long[] overrideAllAssetCategoryIds, String[] overrideAllKeywords,
+			String[] overrideAllAssetTagNames)
+		throws PortalException {
+
 		long[] groupIds = getGroupIds(portletPreferences, groupId, layout);
 
 		AssetEntryQuery assetEntryQuery = new AssetEntryQuery();
 
-		_setCategoriesAndTags(
+		_setCategoriesAndKeywordsAndTags(
 			assetEntryQuery, portletPreferences, groupIds,
-			overrideAllAssetCategoryIds, overrideAllAssetTagNames);
+			overrideAllAssetCategoryIds, overrideAllKeywords,
+			overrideAllAssetTagNames);
 
 		assetEntryQuery.setGroupIds(groupIds);
 
@@ -491,8 +504,7 @@ public String[] getAssetTagNames(PortletPreferences portletPreferences) {
 			String queryName = portletPreferences.getValue(
 				"queryName" + i, StringPool.BLANK);
 
-			if (!Objects.equals(queryName, "assetCategories") &&
-				queryContains &&
+			if (Objects.equals(queryName, "assetTags") && queryContains &&
 				(queryAndOperator || (queryValues.length == 1))) {
 
 				allAssetTagNames = queryValues;
@@ -731,6 +743,37 @@ public long[] getGroupIds(
 		return ArrayUtil.toLongArray(groupIds);
 	}
 
+	@Override
+	public String[] getKeywords(PortletPreferences portletPreferences) {
+		String[] allKeywords = new String[0];
+
+		for (int i = 0; true; i++) {
+			String[] queryValues = portletPreferences.getValues(
+				"queryValues" + i, null);
+
+			if (ArrayUtil.isEmpty(queryValues)) {
+				break;
+			}
+
+			boolean queryContains = GetterUtil.getBoolean(
+				portletPreferences.getValue(
+					"queryContains" + i, StringPool.BLANK));
+			boolean queryAndOperator = GetterUtil.getBoolean(
+				portletPreferences.getValue(
+					"queryAndOperator" + i, StringPool.BLANK));
+			String queryName = portletPreferences.getValue(
+				"queryName" + i, StringPool.BLANK);
+
+			if (Objects.equals(queryName, "keywords") && queryContains &&
+				(queryAndOperator || (queryValues.length == 1))) {
+
+				allKeywords = queryValues;
+			}
+		}
+
+		return allKeywords;
+	}
+
 	@Override
 	public String getScopeId(Group group, long scopeGroupId) {
 		String key = null;
@@ -1092,16 +1135,21 @@ private void _removeAndStoreSelection(
 		portletPreferences.store();
 	}
 
-	private void _setCategoriesAndTags(
+	private void _setCategoriesAndKeywordsAndTags(
 		AssetEntryQuery assetEntryQuery, PortletPreferences portletPreferences,
 		long[] scopeGroupIds, long[] overrideAllAssetCategoryIds,
-		String[] overrideAllAssetTagNames) {
+		String[] overrideAllKeywords, String[] overrideAllAssetTagNames) {
 
 		long[] allAssetCategoryIds = new long[0];
 		long[] anyAssetCategoryIds = new long[0];
 		long[] notAllAssetCategoryIds = new long[0];
 		long[] notAnyAssetCategoryIds = new long[0];
 
+		String[] allKeywords = new String[0];
+		String[] anyKeywords = new String[0];
+		String[] notAllKeywords = new String[0];
+		String[] notAnyKeywords = new String[0];
+
 		String[] allAssetTagNames = new String[0];
 		String[] anyAssetTagNames = new String[0];
 		String[] notAllAssetTagNames = new String[0];
@@ -1140,6 +1188,20 @@ else if (!queryContains && queryAndOperator) {
 					notAnyAssetCategoryIds = assetCategoryIds;
 				}
 			}
+			else if (Objects.equals(queryName, "keywords")) {
+				if (queryContains && queryAndOperator) {
+					allKeywords = queryValues;
+				}
+				else if (queryContains && !queryAndOperator) {
+					anyKeywords = queryValues;
+				}
+				else if (!queryContains && queryAndOperator) {
+					notAllKeywords = queryValues;
+				}
+				else {
+					notAnyKeywords = queryValues;
+				}
+			}
 			else {
 				if (queryContains && queryAndOperator) {
 					allAssetTagNames = queryValues;
@@ -1164,6 +1226,12 @@ else if (!queryContains && queryAndOperator) {
 
 		assetEntryQuery.setAllCategoryIds(allAssetCategoryIds);
 
+		if (overrideAllKeywords != null) {
+			allKeywords = overrideAllKeywords;
+		}
+
+		assetEntryQuery.setAllKeywords(allKeywords);
+
 		if (overrideAllAssetTagNames != null) {
 			allAssetTagNames = overrideAllAssetTagNames;
 		}
@@ -1181,6 +1249,8 @@ else if (!queryContains && queryAndOperator) {
 
 		assetEntryQuery.setAnyCategoryIds(anyAssetCategoryIds);
 
+		assetEntryQuery.setAnyKeywords(anyKeywords);
+
 		long[] anyAssetTagIds = _assetTagLocalService.getTagIds(
 			siteGroupIds, anyAssetTagNames);
 
@@ -1188,6 +1258,8 @@ else if (!queryContains && queryAndOperator) {
 
 		assetEntryQuery.setNotAllCategoryIds(notAllAssetCategoryIds);
 
+		assetEntryQuery.setNotAllKeywords(notAllKeywords);
+
 		for (String assetTagName : notAllAssetTagNames) {
 			long[] notAllAssetTagIds = _assetTagLocalService.getTagIds(
 				siteGroupIds, assetTagName);
@@ -1197,6 +1269,8 @@ else if (!queryContains && queryAndOperator) {
 
 		assetEntryQuery.setNotAnyCategoryIds(notAnyAssetCategoryIds);
 
+		assetEntryQuery.setNotAnyKeywords(notAnyKeywords);
+
 		long[] notAnyAssetTagIds = _assetTagLocalService.getTagIds(
 			siteGroupIds, notAnyAssetTagNames);
 
diff --git a/modules/apps/asset/asset-publisher-web/src/main/resources/META-INF/resources/js/AutoField.soy b/modules/apps/asset/asset-publisher-web/src/main/resources/META-INF/resources/js/AutoField.soy
index f242dfe3c27bbb..c3231e626e09c5 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/resources/META-INF/resources/js/AutoField.soy
+++ b/modules/apps/asset/asset-publisher-web/src/main/resources/META-INF/resources/js/AutoField.soy
@@ -125,6 +125,7 @@
 					<select class="asset-query-name form-control" data-item-index="{$index}" data-onchange="changeSelector_" id="{$namespace + 'queryName' + $index}" name="{$namespace + 'queryName' + $index}">
 						<option class="" {if $rule.type == 'assetCategories'}selected="selected"{/if} value="assetCategories">{msg desc=""}categories{/msg}</option>
 						<option class="" {if $rule.type == 'assetTags'}selected="selected"{/if} value="assetTags">{msg desc=""}tags{/msg}</option>
+						<option class="" {if $rule.type == 'keywords'}selected="selected"{/if} value="keywords">{msg desc=""}keywords{/msg}</option>
 					</select>
 				</div>
 
@@ -140,6 +141,19 @@
 						{param selectedItems: $rule.selectedItems ?: [] /}
 						{param vocabularyIds: $vocabularyIds /}
 					{/call}
+				{elseif $rule.type == 'keywords'}
+					<div class="form-group">
+						<label for="{$namespace + 'keywords' + $index}">{msg desc=""}keywords{/msg}</label>
+
+						<input
+							type="text"
+							class="form-control asset-query-keywords"
+							data-item-index="{$index}"
+							id="{$namespace + 'keywords' + $index}"
+							name="{$namespace + 'keywords' + $index}"
+							value="{$rule.queryValues ?: ''}"
+						/>
+					</div>
 				{else}
 					{call com.liferay.asset.taglib.AssetTagsSelector.render}
 						{param eventName: $namespace + 'selectTag' /}
diff --git a/modules/apps/asset/asset-tags-selector-web/src/main/java/com/liferay/asset/tags/selector/web/internal/display/context/AssetTagsSelectorDisplayContext.java b/modules/apps/asset/asset-tags-selector-web/src/main/java/com/liferay/asset/tags/selector/web/internal/display/context/AssetTagsSelectorDisplayContext.java
index 5a56631954f92a..324f3177529cad 100644
--- a/modules/apps/asset/asset-tags-selector-web/src/main/java/com/liferay/asset/tags/selector/web/internal/display/context/AssetTagsSelectorDisplayContext.java
+++ b/modules/apps/asset/asset-tags-selector-web/src/main/java/com/liferay/asset/tags/selector/web/internal/display/context/AssetTagsSelectorDisplayContext.java
@@ -43,9 +43,17 @@ public AssetTagsSelectorDisplayContext(
 		RenderRequest renderRequest, RenderResponse renderResponse,
 		HttpServletRequest httpServletRequest) {
 
+		this(renderRequest, renderResponse, httpServletRequest, true);
+	}
+
+	public AssetTagsSelectorDisplayContext(
+		RenderRequest renderRequest, RenderResponse renderResponse,
+		HttpServletRequest httpServletRequest, boolean rowChecker) {
+
 		_renderRequest = renderRequest;
 		_renderResponse = renderResponse;
 		_httpServletRequest = httpServletRequest;
+		_rowChecker = rowChecker;
 	}
 
 	public String getEventName() {
@@ -71,6 +79,18 @@ public String getOrderByType() {
 		return _orderByType;
 	}
 
+	public PortletURL getPortletURL() {
+		PortletURL portletURL = _renderResponse.createRenderURL();
+
+		portletURL.setParameter("eventName", getEventName());
+		portletURL.setParameter("groupIds", StringUtil.merge(_getGroupIds()));
+		portletURL.setParameter("mvcPath", _getMvcPath());
+		portletURL.setParameter(
+			"selectedTagNames", StringUtil.merge(getSelectedTagNames()));
+
+		return portletURL;
+	}
+
 	public String[] getSelectedTagNames() {
 		if (ArrayUtil.isNotEmpty(_selectedTagNames)) {
 			return _selectedTagNames;
@@ -92,7 +112,7 @@ public SearchContainer getTagsSearchContainer() {
 				WebKeys.THEME_DISPLAY);
 
 		SearchContainer tagsSearchContainer = new SearchContainer(
-			_renderRequest, _getPortletURL(), null, "there-are-no-tags");
+			_renderRequest, getPortletURL(), null, "there-are-no-tags");
 
 		String orderByCol = _getOrderByCol();
 
@@ -111,8 +131,10 @@ public SearchContainer getTagsSearchContainer() {
 
 		tagsSearchContainer.setOrderByType(orderByType);
 
-		tagsSearchContainer.setRowChecker(
-			new EntriesChecker(_renderRequest, _renderResponse));
+		if (_rowChecker) {
+			tagsSearchContainer.setRowChecker(
+				new EntriesChecker(_renderRequest, _renderResponse));
+		}
 
 		int tagsCount = AssetTagServiceUtil.getTagsCount(
 			themeDisplay.getScopeGroupId(), _getKeywords());
@@ -160,6 +182,17 @@ private String _getKeywords() {
 		return _keywords;
 	}
 
+	private String _getMvcPath() {
+		if (Validator.isNotNull(_mvcPath)) {
+			return _mvcPath;
+		}
+
+		_mvcPath = ParamUtil.getString(
+			_httpServletRequest, "mvcPath", "/view.jsp");
+
+		return _mvcPath;
+	}
+
 	private String _getOrderByCol() {
 		if (Validator.isNotNull(_orderByCol)) {
 			return _orderByCol;
@@ -171,24 +204,16 @@ private String _getOrderByCol() {
 		return _orderByCol;
 	}
 
-	private PortletURL _getPortletURL() {
-		PortletURL portletURL = _renderResponse.createRenderURL();
-
-		portletURL.setParameter("eventName", getEventName());
-		portletURL.setParameter(
-			"selectedTagNames", StringUtil.merge(getSelectedTagNames()));
-
-		return portletURL;
-	}
-
 	private String _eventName;
 	private long[] _groupIds;
 	private final HttpServletRequest _httpServletRequest;
 	private String _keywords;
+	private String _mvcPath;
 	private String _orderByCol;
 	private String _orderByType;
 	private final RenderRequest _renderRequest;
 	private final RenderResponse _renderResponse;
+	private final boolean _rowChecker;
 	private String[] _selectedTagNames;
 	private SearchContainer _tagsSearchContainer;
 
diff --git a/modules/apps/asset/asset-tags-selector-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/asset/asset-tags-selector-web/src/main/resources/META-INF/resources/init.jsp
index 5e3abfb56ab501..bf2aa616ead08e 100644
--- a/modules/apps/asset/asset-tags-selector-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/asset/asset-tags-selector-web/src/main/resources/META-INF/resources/init.jsp
@@ -28,6 +28,9 @@ page import="com.liferay.portal.kernel.dao.search.SearchContainer" %><%@
 page import="com.liferay.portal.kernel.json.JSONFactoryUtil" %><%@
 page import="com.liferay.portal.kernel.util.HtmlUtil" %>
 
+<%@ page import="java.util.HashMap" %><%@
+page import="java.util.Map" %>
+
 <liferay-frontend:defineObjects />
 
 <liferay-theme:defineObjects />
diff --git a/modules/apps/asset/asset-tags-selector-web/src/main/resources/META-INF/resources/select_single.jsp b/modules/apps/asset/asset-tags-selector-web/src/main/resources/META-INF/resources/select_single.jsp
new file mode 100644
index 00000000000000..1af2a5844ba498
--- /dev/null
+++ b/modules/apps/asset/asset-tags-selector-web/src/main/resources/META-INF/resources/select_single.jsp
@@ -0,0 +1,68 @@
+<%--
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+--%>
+
+<%@ include file="/init.jsp" %>
+
+<%
+assetTagsSelectorDisplayContext = new AssetTagsSelectorDisplayContext(renderRequest, renderResponse, request, false);
+%>
+
+<clay:management-toolbar
+	displayContext="<%= new AssetTagsSelectorManagementToolbarDisplayContext(liferayPortletRequest, liferayPortletResponse, request, assetTagsSelectorDisplayContext) %>"
+/>
+
+<aui:form action="<%= assetTagsSelectorDisplayContext.getPortletURL() %>" cssClass="container-fluid-1280" method="post" name="selectAssetTagFm">
+	<liferay-ui:search-container
+		searchContainer="<%= assetTagsSelectorDisplayContext.getTagsSearchContainer() %>"
+	>
+		<liferay-ui:search-container-row
+			className="com.liferay.asset.kernel.model.AssetTag"
+			escapedModel="<%= true %>"
+			keyProperty="name"
+			modelVar="tag"
+			rowIdProperty="friendlyURL"
+			rowVar="row"
+		>
+
+			<%
+			Map<String, Object> data = new HashMap<String, Object>();
+
+			data.put("entityid", tag.getTagId());
+			data.put("entityname", tag.getName());
+			%>
+
+			<liferay-ui:search-container-column-text
+				name="name"
+				truncate="<%= true %>"
+			>
+				<aui:a cssClass="selector-button" data="<%= data %>" href="javascript:;">
+					<%= HtmlUtil.escape(tag.getName()) %>
+				</aui:a>
+			</liferay-ui:search-container-column-text>
+		</liferay-ui:search-container-row>
+
+		<liferay-ui:search-iterator
+			displayStyle="list"
+			markupView="lexicon"
+		/>
+	</liferay-ui:search-container>
+</aui:form>
+
+<aui:script>
+	const Util = Liferay.Util;
+
+	Util.selectEntityHandler('#<portlet:namespace />selectAssetTagFm', '<%= HtmlUtil.escapeJS(assetTagsSelectorDisplayContext.getEventName()) %>', true);
+</aui:script>
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/.lfrbuild-portal b/modules/apps/asset/asset-vocabularies-selector-web/.lfrbuild-portal
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/bnd.bnd b/modules/apps/asset/asset-vocabularies-selector-web/bnd.bnd
new file mode 100644
index 00000000000000..c8bb8fd8ba6e08
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/bnd.bnd
@@ -0,0 +1,11 @@
+Bundle-Name: Liferay Asset Vocabularies Selector Web
+Bundle-SymbolicName: com.liferay.asset.vocabularies.selector.web
+Bundle-Version: 3.0.0
+Provide-Capability:\
+	soy;\
+		type="asset-vocabularies-selector-web";\
+		version:Version="${Bundle-Version}"
+Require-Capability:\
+	osgi.extender;\
+		filter:="(&(osgi.extender=jsp.taglib)(uri=http://liferay.com/tld/soy))"
+Web-ContextPath: /asset-vocabularies-selector-web
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/build.gradle b/modules/apps/asset/asset-vocabularies-selector-web/build.gradle
new file mode 100644
index 00000000000000..6864906bd01128
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/build.gradle
@@ -0,0 +1,14 @@
+dependencies {
+	compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
+	compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
+	compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
+	compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
+	compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.1"
+	compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+	compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.3.0"
+	compileOnly project(":apps:frontend-taglib:frontend-taglib")
+	compileOnly project(":apps:frontend-taglib:frontend-taglib-soy")
+	compileOnly project(":apps:portal:portal-upgrade-api")
+	compileOnly project(":core:petra:petra-lang")
+	compileOnly project(":core:petra:petra-string")
+}
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/package.json b/modules/apps/asset/asset-vocabularies-selector-web/package.json
new file mode 100644
index 00000000000000..d760af906a5c46
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/package.json
@@ -0,0 +1,16 @@
+{
+	"dependencies": {
+		"frontend-js-web": "*",
+		"metal": "2.16.8",
+		"metal-component": "2.16.8",
+		"metal-soy": "2.16.8",
+		"metal-state": "2.16.8"
+	},
+	"name": "asset-vocabularies-selector-web",
+	"scripts": {
+		"build": "liferay-npm-scripts build",
+		"checkFormat": "liferay-npm-scripts check",
+		"format": "liferay-npm-scripts fix"
+	},
+	"version": "3.0.0"
+}
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/java/com/liferay/asset/vocabularies/selector/web/internal/contants/AssetVocabulariesSelectorPortletKeys.java b/modules/apps/asset/asset-vocabularies-selector-web/src/main/java/com/liferay/asset/vocabularies/selector/web/internal/contants/AssetVocabulariesSelectorPortletKeys.java
new file mode 100644
index 00000000000000..5a445a5963d567
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/java/com/liferay/asset/vocabularies/selector/web/internal/contants/AssetVocabulariesSelectorPortletKeys.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.asset.vocabularies.selector.web.internal.contants;
+
+/**
+ * @author Raymond Augé
+ */
+public class AssetVocabulariesSelectorPortletKeys {
+
+	public static final String ASSET_VOCABULARIES_SELECTOR =
+		"com_liferay_asset_vocabularies_selector_web_portlet_" +
+			"AssetVocabulariesSelectorPortlet";
+
+}
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/java/com/liferay/asset/vocabularies/selector/web/internal/display/context/AssetVocabulariesSelectorDisplayContext.java b/modules/apps/asset/asset-vocabularies-selector-web/src/main/java/com/liferay/asset/vocabularies/selector/web/internal/display/context/AssetVocabulariesSelectorDisplayContext.java
new file mode 100644
index 00000000000000..70c60b70dc8a71
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/java/com/liferay/asset/vocabularies/selector/web/internal/display/context/AssetVocabulariesSelectorDisplayContext.java
@@ -0,0 +1,183 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.asset.vocabularies.selector.web.internal.display.context;
+
+import com.liferay.asset.kernel.model.AssetVocabulary;
+import com.liferay.asset.kernel.service.AssetVocabularyLocalService;
+import com.liferay.asset.kernel.service.AssetVocabularyService;
+import com.liferay.petra.string.StringBundler;
+import com.liferay.petra.string.StringPool;
+import com.liferay.portal.kernel.exception.PortalException;
+import com.liferay.portal.kernel.json.JSONArray;
+import com.liferay.portal.kernel.json.JSONFactory;
+import com.liferay.portal.kernel.json.JSONObject;
+import com.liferay.portal.kernel.language.Language;
+import com.liferay.portal.kernel.model.Group;
+import com.liferay.portal.kernel.service.GroupLocalService;
+import com.liferay.portal.kernel.theme.ThemeDisplay;
+import com.liferay.portal.kernel.util.Html;
+import com.liferay.portal.kernel.util.ParamUtil;
+import com.liferay.portal.kernel.util.Validator;
+import com.liferay.portal.kernel.util.WebKeys;
+
+import java.util.List;
+
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author Raymond Augé
+ */
+public class AssetVocabulariesSelectorDisplayContext {
+
+	public AssetVocabulariesSelectorDisplayContext(
+		RenderRequest renderRequest, RenderResponse renderResponse,
+		HttpServletRequest httpServletRequest) {
+
+		_renderRequest = renderRequest;
+		_renderResponse = renderResponse;
+		_httpServletRequest = httpServletRequest;
+		_assetVocabularyService =
+			(AssetVocabularyService)renderRequest.getAttribute(
+				"assetVocabularyService");
+		_assetVocabularyLocalService =
+			(AssetVocabularyLocalService)renderRequest.getAttribute(
+				"assetVocabularyLocalService");
+		_groupLocalService = (GroupLocalService)renderRequest.getAttribute(
+			"groupLocalService");
+		_html = (Html)renderRequest.getAttribute("html");
+		_jsonFactory = (JSONFactory)renderRequest.getAttribute("jsonFactory");
+		_language = (Language)renderRequest.getAttribute("language");
+	}
+
+	public String getEventName() {
+		if (Validator.isNotNull(_eventName)) {
+			return _eventName;
+		}
+
+		_eventName = ParamUtil.getString(
+			_httpServletRequest, "eventName",
+			_renderResponse.getNamespace() + "selectVocabulary");
+
+		return _eventName;
+	}
+
+	public String getSelectedVocabularies() {
+		if (_selectedVocabularies != null) {
+			return _selectedVocabularies;
+		}
+
+		_selectedVocabularies = ParamUtil.getString(
+			_httpServletRequest, "selectedVocabularies");
+
+		return _selectedVocabularies;
+	}
+
+	public JSONArray getVocabulariesJSONArray() throws Exception {
+		JSONArray jsonArray = _jsonFactory.createJSONArray();
+
+		ThemeDisplay themeDisplay =
+			(ThemeDisplay)_httpServletRequest.getAttribute(
+				WebKeys.THEME_DISPLAY);
+
+		long[] groupIds = getGroupIds(themeDisplay);
+
+		List<AssetVocabulary> vocabularies =
+			_assetVocabularyService.getGroupsVocabularies(groupIds);
+
+		for (AssetVocabulary vocabulary : vocabularies) {
+			JSONObject jsonObject = _jsonFactory.createJSONObject();
+
+			jsonObject.put(
+				"icon", "vocabularies"
+			).put(
+				"id", vocabulary.getVocabularyId()
+			).put(
+				"key", vocabulary.getName()
+			).put(
+				"name", getVocabularyTitle(vocabulary.getVocabularyId())
+			);
+
+			if (getSelectedVocabularies().contains(
+					String.valueOf(vocabulary.getVocabularyId()))) {
+
+				jsonObject.put("selected", true);
+			}
+
+			jsonArray.put(jsonObject);
+		}
+
+		return jsonArray;
+	}
+
+	public String getVocabularyTitle(long vocabularyId) throws PortalException {
+		ThemeDisplay themeDisplay = (ThemeDisplay)_renderRequest.getAttribute(
+			WebKeys.THEME_DISPLAY);
+
+		AssetVocabulary assetVocabulary =
+			_assetVocabularyLocalService.fetchAssetVocabulary(vocabularyId);
+
+		StringBundler sb = new StringBundler(5);
+
+		String title = assetVocabulary.getTitle(themeDisplay.getLocale());
+
+		sb.append(_html.escape(title));
+
+		sb.append(StringPool.SPACE);
+		sb.append(StringPool.OPEN_PARENTHESIS);
+
+		if (assetVocabulary.getGroupId() == themeDisplay.getCompanyGroupId()) {
+			sb.append(_language.get(_httpServletRequest, "global"));
+		}
+		else {
+			Group group = _groupLocalService.fetchGroup(
+				assetVocabulary.getGroupId());
+
+			sb.append(group.getDescriptiveName(themeDisplay.getLocale()));
+		}
+
+		sb.append(StringPool.CLOSE_PARENTHESIS);
+
+		return sb.toString();
+	}
+
+	private long[] getGroupIds(ThemeDisplay themeDisplay) {
+		if (_groupIds != null) {
+			return _groupIds;
+		}
+
+		return _groupIds = ParamUtil.getLongValues(
+			_httpServletRequest, "groupIds",
+			new long[] {
+				themeDisplay.getCompanyGroupId(), themeDisplay.getScopeGroupId()
+			});
+	}
+
+	private final AssetVocabularyLocalService _assetVocabularyLocalService;
+	private final AssetVocabularyService _assetVocabularyService;
+	private String _eventName;
+	private long[] _groupIds;
+	private final GroupLocalService _groupLocalService;
+	private final Html _html;
+	private final HttpServletRequest _httpServletRequest;
+	private final JSONFactory _jsonFactory;
+	private final Language _language;
+	private final RenderRequest _renderRequest;
+	private final RenderResponse _renderResponse;
+	private String _selectedVocabularies;
+
+}
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/java/com/liferay/asset/vocabularies/selector/web/internal/portlet/AssetVocabulariesSelectorBrowserPortletProvider.java b/modules/apps/asset/asset-vocabularies-selector-web/src/main/java/com/liferay/asset/vocabularies/selector/web/internal/portlet/AssetVocabulariesSelectorBrowserPortletProvider.java
new file mode 100644
index 00000000000000..87b8555ebfd7ac
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/java/com/liferay/asset/vocabularies/selector/web/internal/portlet/AssetVocabulariesSelectorBrowserPortletProvider.java
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.asset.vocabularies.selector.web.internal.portlet;
+
+import com.liferay.asset.vocabularies.selector.web.internal.contants.AssetVocabulariesSelectorPortletKeys;
+import com.liferay.portal.kernel.portlet.BasePortletProvider;
+import com.liferay.portal.kernel.portlet.BrowsePortletProvider;
+
+import org.osgi.service.component.annotations.Component;
+
+/**
+ * @author Raymond Augé
+ */
+@Component(
+	immediate = true,
+	property = "model.class.name=com.liferay.asset.kernel.model.AssetVocabulary",
+	service = BrowsePortletProvider.class
+)
+public class AssetVocabulariesSelectorBrowserPortletProvider
+	extends BasePortletProvider implements BrowsePortletProvider {
+
+	@Override
+	public String getPortletName() {
+		return AssetVocabulariesSelectorPortletKeys.ASSET_VOCABULARIES_SELECTOR;
+	}
+
+}
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/java/com/liferay/asset/vocabularies/selector/web/internal/portlet/AssetVocabulariesSelectorPortlet.java b/modules/apps/asset/asset-vocabularies-selector-web/src/main/java/com/liferay/asset/vocabularies/selector/web/internal/portlet/AssetVocabulariesSelectorPortlet.java
new file mode 100644
index 00000000000000..f3066f64c5fa22
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/java/com/liferay/asset/vocabularies/selector/web/internal/portlet/AssetVocabulariesSelectorPortlet.java
@@ -0,0 +1,161 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.asset.vocabularies.selector.web.internal.portlet;
+
+import com.liferay.asset.kernel.model.AssetVocabulary;
+import com.liferay.asset.kernel.service.AssetVocabularyLocalService;
+import com.liferay.asset.kernel.service.AssetVocabularyService;
+import com.liferay.asset.vocabularies.selector.web.internal.contants.AssetVocabulariesSelectorPortletKeys;
+import com.liferay.portal.kernel.json.JSONArray;
+import com.liferay.portal.kernel.json.JSONFactory;
+import com.liferay.portal.kernel.json.JSONFactoryUtil;
+import com.liferay.portal.kernel.json.JSONObject;
+import com.liferay.portal.kernel.json.JSONUtil;
+import com.liferay.portal.kernel.language.Language;
+import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
+import com.liferay.portal.kernel.service.GroupLocalService;
+import com.liferay.portal.kernel.theme.ThemeDisplay;
+import com.liferay.portal.kernel.util.GetterUtil;
+import com.liferay.portal.kernel.util.Html;
+import com.liferay.portal.kernel.util.ParamUtil;
+import com.liferay.portal.kernel.util.WebKeys;
+
+import java.io.IOException;
+
+import java.util.List;
+
+import javax.portlet.Portlet;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequest;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+
+/**
+ * @author Raymond Augé
+ */
+@Component(
+	immediate = true,
+	property = {
+		"com.liferay.portlet.add-default-resource=true",
+		"com.liferay.portlet.css-class-wrapper=portlet-asset-vocabularies-selector",
+		"com.liferay.portlet.header-portlet-css=/css/tree.css",
+		"com.liferay.portlet.private-request-attributes=false",
+		"com.liferay.portlet.private-session-attributes=false",
+		"com.liferay.portlet.render-weight=50",
+		"com.liferay.portlet.system=true",
+		"com.liferay.portlet.use-default-template=true",
+		"javax.portlet.display-name=Asset Vocabularies Selector",
+		"javax.portlet.init-param.template-path=/META-INF/resources/",
+		"javax.portlet.init-param.view-template=/view.jsp",
+		"javax.portlet.name=" + AssetVocabulariesSelectorPortletKeys.ASSET_VOCABULARIES_SELECTOR,
+		"javax.portlet.resource-bundle=content.Language",
+		"javax.portlet.security-role-ref=guest,power-user,user"
+	},
+	service = Portlet.class
+)
+public class AssetVocabulariesSelectorPortlet extends MVCPortlet {
+
+	@Override
+	public void serveResource(
+			ResourceRequest resourceRequest, ResourceResponse resourceResponse)
+		throws IOException, PortletException {
+
+		String resourceID = GetterUtil.getString(
+			resourceRequest.getResourceID());
+
+		if (resourceID.equals("getVocabularies")) {
+			JSONArray jsonArray = JSONFactoryUtil.createJSONArray();
+
+			ThemeDisplay themeDisplay =
+				(ThemeDisplay)resourceRequest.getAttribute(
+					WebKeys.THEME_DISPLAY);
+
+			long[] groupIds = getGroupIds(resourceRequest, themeDisplay);
+
+			List<AssetVocabulary> vocabularies =
+				_assetVocabularyService.getGroupsVocabularies(groupIds);
+
+			for (AssetVocabulary vocabulary : vocabularies) {
+				JSONObject jsonObject = JSONUtil.put(
+					"icon", "vocabularies"
+				).put(
+					"id", vocabulary.getVocabularyId()
+				).put(
+					"key", vocabulary.getName()
+				).put(
+					"name", vocabulary.getTitle(themeDisplay.getLocale())
+				);
+
+				jsonArray.put(jsonObject);
+			}
+
+			writeJSON(resourceRequest, resourceResponse, jsonArray.toString());
+		}
+		else {
+			super.serveResource(resourceRequest, resourceResponse);
+		}
+	}
+
+	@Override
+	protected void doDispatch(
+			RenderRequest renderRequest, RenderResponse renderResponse)
+		throws IOException, PortletException {
+
+		renderRequest.setAttribute(
+			"assetVocabularyLocalService", _assetVocabularyLocalService);
+		renderRequest.setAttribute(
+			"assetVocabularyService", _assetVocabularyService);
+		renderRequest.setAttribute("groupLocalService", _groupLocalService);
+		renderRequest.setAttribute("html", _html);
+		renderRequest.setAttribute("jsonFactory", _jsonFactory);
+		renderRequest.setAttribute("language", _language);
+
+		super.doDispatch(renderRequest, renderResponse);
+	}
+
+	private long[] getGroupIds(
+		PortletRequest portletRequest, ThemeDisplay themeDisplay) {
+
+		return ParamUtil.getLongValues(
+			portletRequest, "groupIds",
+			new long[] {
+				themeDisplay.getCompanyGroupId(), themeDisplay.getScopeGroupId()
+			});
+	}
+
+	@Reference
+	private AssetVocabularyLocalService _assetVocabularyLocalService;
+
+	@Reference
+	private AssetVocabularyService _assetVocabularyService;
+
+	@Reference
+	private GroupLocalService _groupLocalService;
+
+	@Reference
+	private Html _html;
+
+	@Reference
+	private JSONFactory _jsonFactory;
+
+	@Reference
+	private Language _language;
+
+}
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/java/com/liferay/asset/vocabularies/selector/web/internal/upgrade/AssetVocabulariesSelectorWebUpgrade.java b/modules/apps/asset/asset-vocabularies-selector-web/src/main/java/com/liferay/asset/vocabularies/selector/web/internal/upgrade/AssetVocabulariesSelectorWebUpgrade.java
new file mode 100644
index 00000000000000..decc4fa14d55f5
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/java/com/liferay/asset/vocabularies/selector/web/internal/upgrade/AssetVocabulariesSelectorWebUpgrade.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.asset.vocabularies.selector.web.internal.upgrade;
+
+import com.liferay.portal.kernel.upgrade.DummyUpgradeStep;
+import com.liferay.portal.upgrade.registry.UpgradeStepRegistrator;
+
+import org.osgi.service.component.annotations.Component;
+
+/**
+ * @author Raymond Augé
+ */
+@Component(immediate = true, service = UpgradeStepRegistrator.class)
+public class AssetVocabulariesSelectorWebUpgrade
+	implements UpgradeStepRegistrator {
+
+	@Override
+	public void register(Registry registry) {
+		registry.register("0.0.0", "1.0.0", new DummyUpgradeStep());
+	}
+
+}
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/META-INF/resources/css/tree.scss b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/META-INF/resources/css/tree.scss
new file mode 100644
index 00000000000000..8b4cf79c6d52b8
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/META-INF/resources/css/tree.scss
@@ -0,0 +1,145 @@
+$navigation-color: #869cad;
+$spacer: 1rem;
+
+.select-vocabulary-filter {
+	background: #fff;
+	border-bottom: 1px solid #dee2e6;
+	margin-bottom: $spacer * 1.5;
+	padding: $spacer * 0.75;
+}
+
+.vocabulary-tree {
+	.card {
+		border: 1px solid #e7e7ed;
+		box-shadow: none;
+		color: #6b6c7e;
+		margin-bottom: 0;
+
+		&:hover {
+			background-color: #f7f8f9;
+			border-color: #cdced9;
+			color: #272833;
+		}
+
+		&:focus {
+			box-shadow: 0 0 0 2px white, 0 0 0 4px #80afff;
+			color: #272833;
+		}
+	}
+
+	.card-row-padded {
+		padding: 8px 12px;
+	}
+
+	.selected .card {
+		background-color: #80acff;
+		border-color: #80acff;
+		color: #272833;
+	}
+
+	.disabled {
+		.card,
+		.card:hover,
+		.card:focus {
+			background-color: #e7e7ed;
+			border: 1px solid #e7e7ed;
+			box-shadow: none;
+			color: #272833;
+			cursor: not-allowed;
+			outline: none;
+		}
+	}
+
+	.treeview {
+		margin-left: -15px;
+
+		@media (min-width: 768px) {
+			margin-left: -54px;
+		}
+	}
+
+	.treeview-node {
+		margin-bottom: 0.5rem;
+		position: relative;
+	}
+
+	.treeview-node-main {
+		float: none;
+		margin-bottom: 15px;
+		padding-left: 15px;
+		position: relative;
+
+		&:not(.disabled) {
+			cursor: pointer;
+		}
+
+		@media (min-width: 768px) {
+			margin-bottom: 24px;
+			padding-left: 24px;
+		}
+	}
+
+	.treeview-nodes {
+		border-left: 2px solid $navigation-color;
+		list-style: none;
+		margin-left: 15px;
+		padding-left: 0;
+
+		.treeview-nodes {
+			border-left-style: dashed;
+			border-left-width: 1px;
+		}
+
+		@media (min-width: 768px) {
+			margin-left: 54px;
+		}
+	}
+
+	.treeview-node-name {
+		margin-left: 2px;
+	}
+
+	.treeview-node-toggler {
+		background-color: $navigation-color;
+		border-radius: 3px;
+		display: inline-block;
+		height: 14px;
+		left: 0;
+		margin-left: -8px;
+		margin-top: -8px;
+		position: absolute;
+		text-align: center;
+		top: 50%;
+		width: 14px;
+
+		&:before {
+			color: #fff;
+			content: '+';
+			display: block;
+			line-height: 11px;
+
+			.win & {
+				line-height: 14px;
+			}
+		}
+	}
+
+	.treeview-node-wrapper > .treeview-nodes {
+		display: none;
+	}
+
+	.expanded {
+		> .treeview-node-main > .treeview-node-toggler:before {
+			content: '-';
+			font-size: 21px;
+
+			.win & {
+				line-height: 11px;
+			}
+		}
+
+		> .treeview-nodes {
+			display: block;
+		}
+	}
+}
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/META-INF/resources/init-ext.jsp b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/META-INF/resources/init-ext.jsp
new file mode 100644
index 00000000000000..bd7e580a414ba1
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/META-INF/resources/init-ext.jsp
@@ -0,0 +1,15 @@
+<%--
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+--%>
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/META-INF/resources/init.jsp
new file mode 100644
index 00000000000000..8e4f15824ac7b2
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/META-INF/resources/init.jsp
@@ -0,0 +1,39 @@
+<%--
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+--%>
+
+<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
+
+<%@ taglib uri="http://liferay.com/tld/frontend" prefix="liferay-frontend" %><%@
+taglib uri="http://liferay.com/tld/soy" prefix="soy" %><%@
+taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %>
+
+<%@ page import="com.liferay.asset.vocabularies.selector.web.internal.display.context.AssetVocabulariesSelectorDisplayContext" %><%@
+page import="com.liferay.portal.kernel.util.HtmlUtil" %>
+
+<%@ page import="java.util.HashMap" %><%@
+page import="java.util.Map" %>
+
+<liferay-frontend:defineObjects />
+
+<liferay-theme:defineObjects />
+
+<portlet:defineObjects />
+
+<%
+AssetVocabulariesSelectorDisplayContext assetVocabulariesSelectorDisplayContext = new AssetVocabulariesSelectorDisplayContext(renderRequest, renderResponse, request);
+%>
+
+<%@ include file="/init-ext.jsp" %>
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/META-INF/resources/js/SelectVocabulary.es.js b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/META-INF/resources/js/SelectVocabulary.es.js
new file mode 100644
index 00000000000000..5df7bcf7c5cbb0
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/META-INF/resources/js/SelectVocabulary.es.js
@@ -0,0 +1,188 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+import 'frontend-taglib/cards_treeview/CardsTreeview.es';
+import 'metal';
+import 'metal-component';
+import {PortletBase} from 'frontend-js-web';
+import Soy from 'metal-soy';
+import {Config} from 'metal-state';
+
+import templates from './SelectVocabulary.soy';
+
+/**
+ * KeyBoardEvent enter key
+ * @review
+ * @type {!string}
+ */
+
+const ENTER_KEY = 'Enter';
+
+/**
+ * SelectVocabulary
+ *
+ * This component shows a list of available vocabularies to move content in and
+ * allows to filter them by searching.
+ */
+
+class SelectVocabulary extends PortletBase {
+	/**
+	 * Filters deep nested nodes based on a filtering value
+	 *
+	 * @type {Array.<Object>} nodes
+	 * @type {String} filterVAlue
+	 * @protected
+	 */
+
+	filterSiblingNodes_(nodes, filterValue) {
+		let filteredNodes = [];
+
+		nodes.forEach(node => {
+			if (node.name.toLowerCase().indexOf(filterValue) !== -1) {
+				filteredNodes.push(node);
+			}
+
+			if (node.children) {
+				filteredNodes = filteredNodes.concat(
+					this.filterSiblingNodes_(node.children, filterValue)
+				);
+			}
+		});
+
+		return filteredNodes;
+	}
+
+	/**
+	 * When the search form is submitted, nothing should happend,
+	 * as filtering is performed on keypress.
+	 * @param {KeyboardEvent} event
+	 * @private
+	 * @review
+	 */
+
+	_handleSearchFormKeyDown(event) {
+		if (event.key === ENTER_KEY) {
+			event.preventDefault();
+			event.stopImmediatePropagation();
+		}
+	}
+
+	/**
+	 * Searchs for nodes by name based on a filtering value
+	 *
+	 * @param {!Event} event
+	 * @protected
+	 */
+
+	_searchNodes(event) {
+		if (!this.originalNodes) {
+			this.originalNodes = this.nodes;
+		} else {
+			this.nodes = this.originalNodes;
+		}
+
+		const filterValue = event.delegateTarget.value.toLowerCase();
+
+		if (filterValue !== '') {
+			this.viewType = 'flat';
+			this.nodes = this.filterSiblingNodes_(this.nodes, filterValue);
+		} else {
+			this.viewType = 'tree';
+		}
+	}
+
+	/**
+	 * Fires item selector save event on selected node change
+	 *
+	 * @param {!Event} event
+	 * @protected
+	 */
+
+	_selectedNodeChange(event) {
+		const newVal = event.newVal;
+		let selectedNodes = this.selectedNodes_;
+
+		if (!selectedNodes) {
+			selectedNodes = [];
+		}
+
+		if (newVal) {
+			const data = {};
+			newVal.forEach(node => {
+				data[node.id] = {
+					key: node.key,
+					value: node.name,
+					vocabularyId: node.id
+				};
+			});
+
+			selectedNodes.forEach(node => {
+				if (newVal.indexOf(node) === -1) {
+					data[node.id] = {
+						key: node.key,
+						unchecked: true,
+						value: node.name,
+						vocabularyId: node.id
+					};
+				}
+			});
+
+			selectedNodes = [];
+
+			newVal.forEach(node => {
+				selectedNodes.push(node);
+			});
+
+			this.selectedNodes_ = selectedNodes;
+
+			Liferay.Util.getOpener().Liferay.fire(this.itemSelectorSaveEvent, {
+				data
+			});
+		}
+	}
+}
+
+SelectVocabulary.STATE = {
+	/**
+	 * Event name to fire on node selection
+	 * @type {String}
+	 */
+
+	itemSelectorSaveEvent: Config.string(),
+
+	/**
+	 * List of nodes
+	 * @type {Array.<Object>}
+	 */
+
+	nodes: Config.array().required(),
+
+	/**
+	 * Theme images root path
+	 * @type {String}
+	 */
+
+	pathThemeImages: Config.string().required(),
+
+	/**
+	 * Type of view to render. Accepted values are 'tree' and 'flat'
+	 * @type {String}
+	 */
+
+	viewType: Config.string().value('flat')
+};
+
+Soy.register(SelectVocabulary, templates);
+
+export default SelectVocabulary;
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/META-INF/resources/js/SelectVocabulary.soy b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/META-INF/resources/js/SelectVocabulary.soy
new file mode 100644
index 00000000000000..01014ce7c26653
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/META-INF/resources/js/SelectVocabulary.soy
@@ -0,0 +1,55 @@
+{namespace com.liferay.asset.vocabularies.selector.web.SelectVocabulary}
+
+/**
+ * This renders the main element.
+ */
+{template .render}
+	{@param nodes: list<?>}
+	{@param pathThemeImages: string}
+	{@param? _handleSearchFormKeyDown: any}
+	{@param? _selectedNodeChange: any}
+	{@param? namespace: string}
+	{@param? viewType: string}
+
+	<div class="select-vocabulary">
+		<form class="select-vocabulary-filter" role="search">
+			<div class="container-fluid-1280">
+				<div class="input-group">
+					<div class="input-group-item">
+						<input
+							class="form-control input-group-inset input-group-inset-after"
+							data-oninput="_searchNodes"
+							data-onkeydown="{$_handleSearchFormKeyDown}"
+							name="{$namespace}filterKeywords"
+							placeholder="{msg desc=""}search{/msg}"
+							type="text"
+						/>
+
+						<span class="input-group-inset-item input-group-inset-item-after">
+							<button class="btn btn-unstyled" type="submit">
+								<svg class="lexicon-icon lexicon-icon-search" focusable="false" role="presentation">
+									<use xlink:href="{$pathThemeImages}/lexicon/icons.svg#search"></use>
+								</svg>
+							</button>
+						</span>
+					</div>
+				</div>
+			</div>
+		</form>
+
+		<form name="{$namespace}selectVocabularyFm">
+			<fieldset class="container-fluid-1280">
+				<div class="vocabulary-tree" id="{$namespace}vocabularyContainer">
+					{call liferay.frontend.CardsTreeview.render}
+						{param events: [
+							'selectedNodesChanged': $_selectedNodeChange
+						]/}
+						{param nodes: $nodes /}
+						{param pathThemeImages: $pathThemeImages /}
+						{param viewType: $viewType /}
+					{/call}
+				</div>
+			</fieldset>
+		</form>
+	</div>
+{/template}
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/META-INF/resources/view.jsp b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/META-INF/resources/view.jsp
new file mode 100644
index 00000000000000..bf8478899c06e8
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/META-INF/resources/view.jsp
@@ -0,0 +1,33 @@
+<%--
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+--%>
+
+<%@ include file="/init.jsp" %>
+
+<%
+Map<String, Object> context = new HashMap<>();
+
+context.put("itemSelectorSaveEvent", HtmlUtil.escapeJS(assetVocabulariesSelectorDisplayContext.getEventName()));
+context.put("namespace", liferayPortletResponse.getNamespace());
+context.put("nodes", assetVocabulariesSelectorDisplayContext.getVocabulariesJSONArray());
+context.put("pathThemeImages", themeDisplay.getPathThemeImages());
+context.put("viewType", "flat");
+%>
+
+<soy:component-renderer
+	context="<%= context %>"
+	module="js/SelectVocabulary.es"
+	templateNamespace="com.liferay.asset.vocabularies.selector.web.SelectVocabulary.render"
+/>
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language.properties
new file mode 100644
index 00000000000000..93c70684a53c31
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_ar.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_ar.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_ar.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_bg.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_bg.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_bg.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_ca.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_ca.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_ca.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_cs.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_cs.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_cs.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_da.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_da.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_da.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_de.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_de.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_de.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_el.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_el.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_el.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_en.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_en.properties
new file mode 100644
index 00000000000000..93c70684a53c31
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_en.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_es.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_es.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_es.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_et.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_et.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_et.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_eu.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_eu.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_eu.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_fa.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_fa.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_fa.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_fi.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_fi.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_fi.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_fr.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_fr.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_fr.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_gl.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_gl.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_gl.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_hi_IN.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_hi_IN.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_hi_IN.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_hr.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_hr.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_hr.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_hu.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_hu.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_hu.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_in.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_in.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_in.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_it.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_it.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_it.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_iw.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_iw.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_iw.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_ja.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_ja.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_ja.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_kk.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_kk.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_kk.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_ko.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_ko.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_ko.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_lo.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_lo.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_lo.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_lt.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_lt.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_lt.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_nb.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_nb.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_nb.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_nl.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_nl.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_nl.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_nl_BE.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_nl_BE.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_nl_BE.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_pl.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_pl.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_pl.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_pt_BR.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_pt_BR.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_pt_BR.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_pt_PT.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_pt_PT.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_pt_PT.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_ro.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_ro.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_ro.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_ru.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_ru.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_ru.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_sk.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_sk.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_sk.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_sl.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_sl.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_sl.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_sr_RS.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_sr_RS.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_sr_RS.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_sr_RS_latin.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_sr_RS_latin.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_sr_RS_latin.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_sv.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_sv.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_sv.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_ta_IN.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_ta_IN.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_ta_IN.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_th.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_th.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_th.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_tr.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_tr.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_tr.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_uk.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_uk.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_uk.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_vi.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_vi.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_vi.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_zh_CN.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_zh_CN.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_zh_CN.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_zh_TW.properties b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_zh_TW.properties
new file mode 100644
index 00000000000000..fd6c274b1f939d
--- /dev/null
+++ b/modules/apps/asset/asset-vocabularies-selector-web/src/main/resources/content/Language_zh_TW.properties
@@ -0,0 +1 @@
+javax.portlet.title.com_liferay_asset_vocabularies_selector_web_portlet_AssetVocabulariesSelectorPortlet=Asset Vocabularies Selector (Automatic Copy)
\ No newline at end of file
diff --git a/modules/apps/export-import/export-import-service/src/main/java/com/liferay/exportimport/internal/exportimport/content/processor/LayoutReferencesExportImportContentProcessor.java b/modules/apps/export-import/export-import-service/src/main/java/com/liferay/exportimport/internal/exportimport/content/processor/LayoutReferencesExportImportContentProcessor.java
index a3a052d5c8ae7b..cf37fe956809d1 100644
--- a/modules/apps/export-import/export-import-service/src/main/java/com/liferay/exportimport/internal/exportimport/content/processor/LayoutReferencesExportImportContentProcessor.java
+++ b/modules/apps/export-import/export-import-service/src/main/java/com/liferay/exportimport/internal/exportimport/content/processor/LayoutReferencesExportImportContentProcessor.java
@@ -52,6 +52,7 @@
 
 import java.util.Locale;
 import java.util.Map;
+import java.util.TreeMap;
 
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -121,14 +122,14 @@ protected String replaceExportHostname(
 
 		LayoutSet publicLayoutSet = group.getPublicLayoutSet();
 
-		String publicLayoutSetVirtualHostname =
-			publicLayoutSet.getVirtualHostname();
+		TreeMap<String, String> publicLayoutSetVirtualHostnames =
+			publicLayoutSet.getVirtualHostnames();
 
 		String portalUrl = StringPool.BLANK;
 
-		if (Validator.isNotNull(publicLayoutSetVirtualHostname)) {
+		if (!publicLayoutSetVirtualHostnames.isEmpty()) {
 			portalUrl = _portal.getPortalURL(
-				publicLayoutSetVirtualHostname, serverPort, secure);
+				publicLayoutSetVirtualHostnames.firstKey(), serverPort, secure);
 
 			if (url.startsWith(portalUrl)) {
 				if (secure) {
@@ -144,12 +145,13 @@ protected String replaceExportHostname(
 
 		LayoutSet privateLayoutSet = group.getPrivateLayoutSet();
 
-		String privateLayoutSetVirtualHostname =
-			privateLayoutSet.getVirtualHostname();
+		TreeMap<String, String> privateLayoutSetVirtualHostnames =
+			privateLayoutSet.getVirtualHostnames();
 
-		if (Validator.isNotNull(privateLayoutSetVirtualHostname)) {
+		if (!privateLayoutSetVirtualHostnames.isEmpty()) {
 			portalUrl = _portal.getPortalURL(
-				privateLayoutSetVirtualHostname, serverPort, secure);
+				privateLayoutSetVirtualHostnames.firstKey(), serverPort,
+				secure);
 
 			if (url.startsWith(portalUrl)) {
 				if (secure) {
@@ -558,17 +560,23 @@ protected String replaceImportLayoutReferences(
 					company.getVirtualHostname(), serverPort, false);
 			}
 
-			if (Validator.isNotNull(privateLayoutSet.getVirtualHostname())) {
+			TreeMap<String, String> privateVirtualHostnames =
+				privateLayoutSet.getVirtualHostnames();
+
+			if (!privateVirtualHostnames.isEmpty()) {
 				privateLayoutSetPortalURL = _portal.getPortalURL(
-					privateLayoutSet.getVirtualHostname(), serverPort, false);
+					privateVirtualHostnames.firstKey(), serverPort, false);
 			}
 			else {
 				privateLayoutSetPortalURL = companyPortalURL;
 			}
 
-			if (Validator.isNotNull(publicLayoutSet.getVirtualHostname())) {
+			TreeMap<String, String> publicVirtualHostnames =
+				publicLayoutSet.getVirtualHostnames();
+
+			if (!publicVirtualHostnames.isEmpty()) {
 				publicLayoutSetPortalURL = _portal.getPortalURL(
-					publicLayoutSet.getVirtualHostname(), serverPort, false);
+					publicVirtualHostnames.firstKey(), serverPort, false);
 			}
 			else {
 				publicLayoutSetPortalURL = companyPortalURL;
@@ -587,16 +595,20 @@ protected String replaceImportLayoutReferences(
 					company.getVirtualHostname(), secureSecurePort, true);
 			}
 
-			if (Validator.isNotNull(privateLayoutSet.getVirtualHostname())) {
+			TreeMap<String, String> privateVirtualHostnames =
+				privateLayoutSet.getVirtualHostnames();
+
+			if (!privateVirtualHostnames.isEmpty()) {
 				privateLayoutSetSecurePortalURL = _portal.getPortalURL(
-					privateLayoutSet.getVirtualHostname(), secureSecurePort,
-					true);
+					privateVirtualHostnames.firstKey(), secureSecurePort, true);
 			}
 
-			if (Validator.isNotNull(publicLayoutSet.getVirtualHostname())) {
+			TreeMap<String, String> publicVirtualHostnames =
+				publicLayoutSet.getVirtualHostnames();
+
+			if (!publicVirtualHostnames.isEmpty()) {
 				publicLayoutSetSecurePortalURL = _portal.getPortalURL(
-					publicLayoutSet.getVirtualHostname(), secureSecurePort,
-					true);
+					publicVirtualHostnames.firstKey(), secureSecurePort, true);
 			}
 		}
 
diff --git a/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/internal/util/JournalUtil.java b/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/internal/util/JournalUtil.java
index f39f3e5ee470b5..8e7bdb9e57806c 100644
--- a/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/internal/util/JournalUtil.java
+++ b/modules/apps/journal/journal-service/src/main/java/com/liferay/journal/internal/util/JournalUtil.java
@@ -73,6 +73,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 
 import javax.portlet.PortletRequest;
 import javax.portlet.PortletURL;
@@ -762,10 +763,11 @@ else if (group.isUserGroup()) {
 
 		String layoutSetFriendlyUrl = themeDisplay.getI18nPath();
 
-		String virtualHostname = layoutSet.getVirtualHostname();
+		TreeMap<String, String> virtualHostnames =
+			layoutSet.getVirtualHostnames();
 
-		if (Validator.isNull(virtualHostname) ||
-			!virtualHostname.equals(themeDisplay.getServerName())) {
+		if (virtualHostnames.isEmpty() ||
+			!virtualHostnames.containsKey(themeDisplay.getServerName())) {
 
 			layoutSetFriendlyUrl = friendlyUrlCurrent + group.getFriendlyURL();
 		}
@@ -838,10 +840,11 @@ else if (group.isUserGroup()) {
 
 		String layoutSetFriendlyUrl = themeDisplayModel.getI18nPath();
 
-		String virtualHostname = layoutSet.getVirtualHostname();
+		TreeMap<String, String> virtualHostnames =
+			layoutSet.getVirtualHostnames();
 
-		if (Validator.isNull(virtualHostname) ||
-			!virtualHostname.equals(themeDisplayModel.getServerName())) {
+		if (virtualHostnames.isEmpty() ||
+			!virtualHostnames.containsKey(themeDisplayModel.getServerName())) {
 
 			layoutSetFriendlyUrl = friendlyUrlCurrent + group.getFriendlyURL();
 		}
diff --git a/modules/apps/layout/layout-admin-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/layout/layout-admin-web/src/main/resources/META-INF/resources/init.jsp
index 1a045ce1c5da25..9bd6c653eda692 100644
--- a/modules/apps/layout/layout-admin-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/layout/layout-admin-web/src/main/resources/META-INF/resources/init.jsp
@@ -166,7 +166,8 @@ page import="java.util.List" %><%@
 page import="java.util.Locale" %><%@
 page import="java.util.Map" %><%@
 page import="java.util.Objects" %><%@
-page import="java.util.ResourceBundle" %>
+page import="java.util.ResourceBundle" %><%@
+page import="java.util.TreeMap" %>
 
 <%@ page import="javax.portlet.PortletRequest" %><%@
 page import="javax.portlet.PortletURL" %><%@
diff --git a/modules/apps/layout/layout-admin-web/src/main/resources/META-INF/resources/layout/details.jsp b/modules/apps/layout/layout-admin-web/src/main/resources/META-INF/resources/layout/details.jsp
index 76f2bbf554018c..34724e7cf7949e 100644
--- a/modules/apps/layout/layout-admin-web/src/main/resources/META-INF/resources/layout/details.jsp
+++ b/modules/apps/layout/layout-admin-web/src/main/resources/META-INF/resources/layout/details.jsp
@@ -44,9 +44,9 @@ StringBuilder friendlyURLBase = new StringBuilder();
 
 	LayoutSet layoutSet = selLayout.getLayoutSet();
 
-	String virtualHostname = layoutSet.getVirtualHostname();
+	TreeMap<String, String> virtualHostnames = layoutSet.getVirtualHostnames();
 
-	if (Validator.isNull(virtualHostname) || (friendlyURLBase.indexOf(virtualHostname) == -1)) {
+	if (virtualHostnames.isEmpty() || !_matchesHostname(friendlyURLBase, virtualHostnames)) {
 		friendlyURLBase.append(group.getPathFriendlyURL(layoutsAdminDisplayContext.isPrivateLayout(), themeDisplay));
 		friendlyURLBase.append(HttpUtil.decodeURL(group.getFriendlyURL()));
 	}
@@ -205,4 +205,16 @@ StringBuilder friendlyURLBase = new StringBuilder();
 			}
 		);
 	}
-</aui:script>
\ No newline at end of file
+</aui:script>
+
+<%!
+private boolean _matchesHostname(StringBuilder friendlyURLBase, TreeMap<String, String> virtualHostnames) {
+	for (String virtualHostname : virtualHostnames.keySet()) {
+		if (friendlyURLBase.indexOf(virtualHostname) != -1) {
+			return true;
+		}
+	}
+
+	return false;
+}
+%>
\ No newline at end of file
diff --git a/modules/apps/layout/layout-admin-web/src/main/resources/META-INF/resources/layout_set/sitemap.jsp b/modules/apps/layout/layout-admin-web/src/main/resources/META-INF/resources/layout_set/sitemap.jsp
index ca57e716adc2b4..daed3e94f64516 100644
--- a/modules/apps/layout/layout-admin-web/src/main/resources/META-INF/resources/layout_set/sitemap.jsp
+++ b/modules/apps/layout/layout-admin-web/src/main/resources/META-INF/resources/layout_set/sitemap.jsp
@@ -23,7 +23,9 @@ String sitemapUrl = PortalUtil.getPortalURL(request) + themeDisplay.getPathConte
 
 LayoutSet layoutSet = layoutsAdminDisplayContext.getSelLayoutSet();
 
-if (!host.equals(layoutSet.getVirtualHostname())) {
+TreeMap<String, String> virtualHostnames = layoutSet.getVirtualHostnames();
+
+if (!virtualHostnames.containsKey(host)) {
 	sitemapUrl += "?groupId=" + layoutsAdminDisplayContext.getLiveGroupId() + "&privateLayout=" + layoutsAdminDisplayContext.isPrivateLayout();
 }
 %>
diff --git a/modules/apps/layout/layout-impl/src/main/java/com/liferay/layout/internal/model/adapter/StagedLayoutSetImpl.java b/modules/apps/layout/layout-impl/src/main/java/com/liferay/layout/internal/model/adapter/StagedLayoutSetImpl.java
index 9ca54097eb10ef..90c8c35e384434 100644
--- a/modules/apps/layout/layout-impl/src/main/java/com/liferay/layout/internal/model/adapter/StagedLayoutSetImpl.java
+++ b/modules/apps/layout/layout-impl/src/main/java/com/liferay/layout/internal/model/adapter/StagedLayoutSetImpl.java
@@ -44,6 +44,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.TreeMap;
 
 /**
  * @author Máté Thurzó
@@ -308,11 +309,21 @@ public String getUuid() {
 		return String.valueOf(_layoutSet.isPrivateLayout());
 	}
 
+	/**
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 #getVirtualHostnames()}
+	 */
+	@Deprecated
 	@Override
 	public String getVirtualHostname() {
 		return _layoutSet.getVirtualHostname();
 	}
 
+	@Override
+	public TreeMap<String, String> getVirtualHostnames() {
+		return _layoutSet.getVirtualHostnames();
+	}
+
 	@Override
 	public boolean hasSetModifiedDate() {
 		return _layoutSet.hasSetModifiedDate();
@@ -537,11 +548,21 @@ public void setUuid(String uuid) {
 		throw new UnsupportedOperationException();
 	}
 
+	/**
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 #setVirtualHostnames(TreeMap)}
+	 */
+	@Deprecated
 	@Override
 	public void setVirtualHostname(String virtualHostname) {
 		_layoutSet.setVirtualHostname(virtualHostname);
 	}
 
+	@Override
+	public void setVirtualHostnames(TreeMap virtualHostnames) {
+		_layoutSet.setVirtualHostnames(virtualHostnames);
+	}
+
 	@Override
 	public CacheModel<LayoutSet> toCacheModel() {
 		return _layoutSet.toCacheModel();
diff --git a/modules/apps/nested-portlets/nested-portlets-web/src/main/java/com/liferay/nested/portlets/web/internal/display/context/NestedPortletsDisplayContext.java b/modules/apps/nested-portlets/nested-portlets-web/src/main/java/com/liferay/nested/portlets/web/internal/display/context/NestedPortletsDisplayContext.java
index 00fd5c9cf30d90..da07e67a490569 100644
--- a/modules/apps/nested-portlets/nested-portlets-web/src/main/java/com/liferay/nested/portlets/web/internal/display/context/NestedPortletsDisplayContext.java
+++ b/modules/apps/nested-portlets/nested-portlets-web/src/main/java/com/liferay/nested/portlets/web/internal/display/context/NestedPortletsDisplayContext.java
@@ -23,11 +23,11 @@
 import com.liferay.portal.kernel.theme.PortletDisplay;
 import com.liferay.portal.kernel.theme.ThemeDisplay;
 import com.liferay.portal.kernel.util.ListUtil;
-import com.liferay.portal.kernel.util.Validator;
 import com.liferay.portal.kernel.util.WebKeys;
 import com.liferay.portal.plugin.PluginUtil;
 
 import java.util.List;
+import java.util.TreeMap;
 
 import javax.servlet.DispatcherType;
 import javax.servlet.http.HttpServletRequest;
@@ -162,10 +162,13 @@ private boolean _isVirtualHostRequest(
 		LayoutSet layoutSet = (LayoutSet)httpServletRequest.getAttribute(
 			WebKeys.VIRTUAL_HOST_LAYOUT_SET);
 
-		if ((layoutSet != null) &&
-			Validator.isNotNull(layoutSet.getVirtualHostname())) {
+		if (layoutSet != null) {
+			TreeMap<String, String> virtualHostnames =
+				layoutSet.getVirtualHostnames();
 
-			return true;
+			if (!virtualHostnames.isEmpty()) {
+				return true;
+			}
 		}
 
 		return false;
diff --git a/modules/apps/portal/portal-servlet-test/src/testIntegration/java/com/liferay/portal/servlet/filters/multihost/locale/test/MultiVirtualHostLocaleFilterTest.java b/modules/apps/portal/portal-servlet-test/src/testIntegration/java/com/liferay/portal/servlet/filters/multihost/locale/test/MultiVirtualHostLocaleFilterTest.java
new file mode 100644
index 00000000000000..f72878677b4d04
--- /dev/null
+++ b/modules/apps/portal/portal-servlet-test/src/testIntegration/java/com/liferay/portal/servlet/filters/multihost/locale/test/MultiVirtualHostLocaleFilterTest.java
@@ -0,0 +1,255 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.servlet.filters.multihost.locale.test;
+
+import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian;
+import com.liferay.petra.string.StringPool;
+import com.liferay.portal.kernel.exception.AvailableLocaleException;
+import com.liferay.portal.kernel.exception.PortalException;
+import com.liferay.portal.kernel.language.LanguageUtil;
+import com.liferay.portal.kernel.model.LayoutSet;
+import com.liferay.portal.kernel.model.VirtualHost;
+import com.liferay.portal.kernel.service.LayoutSetLocalService;
+import com.liferay.portal.kernel.service.VirtualHostLocalService;
+import com.liferay.portal.kernel.test.rule.AggregateTestRule;
+import com.liferay.portal.kernel.test.util.TestPropsValues;
+import com.liferay.portal.kernel.util.LocaleUtil;
+import com.liferay.portal.kernel.util.Validator;
+import com.liferay.portal.kernel.util.WebKeys;
+import com.liferay.portal.servlet.filters.absoluteredirects.AbsoluteRedirectsFilter;
+import com.liferay.portal.test.rule.Inject;
+import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+
+/**
+ * @author Noemi Zamarripa
+ */
+@RunWith(Arquillian.class)
+public class MultiVirtualHostLocaleFilterTest {
+
+	@ClassRule
+	@Rule
+	public static final AggregateTestRule aggregateTestRule =
+		new LiferayIntegrationTestRule();
+
+	@Before
+	public void setUp() throws PortalException {
+		_groupId = TestPropsValues.getGroupId();
+		_availableLocales = LanguageUtil.getAvailableLocales(_groupId);
+
+		LayoutSet layoutSet = _layoutSetLocalService.getLayoutSet(
+			_groupId, false);
+
+		_layoutSetId = layoutSet.getLayoutSetId();
+
+		_treeMap = new TreeMap<>();
+	}
+
+	@After
+	public void tearDown() throws PortalException {
+		for (String hostname : _treeMap.keySet()) {
+			VirtualHost virtualHost = _virtualHostLocalService.getVirtualHost(
+				hostname);
+
+			_virtualHostLocalService.deleteVirtualHost(virtualHost);
+		}
+	}
+
+	@Test
+	public void testMultipleVirtualHostsWithLocale() throws Exception {
+		_treeMap.put(_TESTHOST_FR, _LANGUAGE_ID_FR);
+		_treeMap.put(_TESTHOST_ES, _LANGUAGE_ID_ES);
+
+		_layoutSetLocalService.updateVirtualHosts(_groupId, false, _treeMap);
+
+		for (Map.Entry<String, String> entry : _treeMap.entrySet()) {
+			String hostname = entry.getKey();
+			String languageId = entry.getValue();
+
+			_setupRequest(hostname, languageId);
+
+			_invokeFilter();
+
+			VirtualHost virtualHost = _virtualHostLocalService.getVirtualHost(
+				hostname);
+
+			Assert.assertEquals(
+				virtualHost.getLanguageId(),
+				_mockHttpServletRequest.getAttribute(WebKeys.I18N_LANGUAGE_ID));
+
+			LayoutSet layoutSet =
+				(LayoutSet)_mockHttpServletRequest.getAttribute(
+					WebKeys.VIRTUAL_HOST_LAYOUT_SET);
+
+			Assert.assertEquals(_layoutSetId, layoutSet.getLayoutSetId());
+
+			_cleanUpRequest();
+		}
+	}
+
+	@Test
+	public void testMultipleVirtualHostsWithoutLocale() throws Exception {
+		_treeMap.put(_TESTHOST_FR, StringPool.BLANK);
+		_treeMap.put(_TESTHOST_ES, StringPool.BLANK);
+
+		_layoutSetLocalService.updateVirtualHosts(_groupId, false, _treeMap);
+
+		for (Map.Entry<String, String> entry : _treeMap.entrySet()) {
+			String hostname = entry.getKey();
+			String languageId = entry.getValue();
+
+			_setupRequest(hostname, languageId);
+
+			_invokeFilter();
+
+			LayoutSet layoutSet =
+				(LayoutSet)_mockHttpServletRequest.getAttribute(
+					WebKeys.VIRTUAL_HOST_LAYOUT_SET);
+
+			Assert.assertEquals(_layoutSetId, layoutSet.getLayoutSetId());
+
+			_cleanUpRequest();
+		}
+	}
+
+	@Test
+	public void testSingleVirtualHostWithLocale() throws Exception {
+		_treeMap.put(_TESTHOST_DE, _LANGUAGE_ID_DE);
+
+		_layoutSetLocalService.updateVirtualHosts(_groupId, false, _treeMap);
+
+		String hostname = _treeMap.firstKey();
+
+		_setupRequest(hostname, _treeMap.get(hostname));
+
+		_invokeFilter();
+
+		VirtualHost virtualHost = _virtualHostLocalService.getVirtualHost(
+			hostname);
+
+		Assert.assertEquals(
+			virtualHost.getLanguageId(),
+			_mockHttpServletRequest.getAttribute(WebKeys.I18N_LANGUAGE_ID));
+
+		LayoutSet layoutSet = (LayoutSet)_mockHttpServletRequest.getAttribute(
+			WebKeys.VIRTUAL_HOST_LAYOUT_SET);
+
+		Assert.assertEquals(_layoutSetId, layoutSet.getLayoutSetId());
+	}
+
+	@Test
+	public void testSingleVirtualHostWithoutLocale() throws Exception {
+		_treeMap.put(_TESTHOST_DE, StringPool.BLANK);
+
+		_layoutSetLocalService.updateVirtualHosts(_groupId, false, _treeMap);
+
+		String hostname = _treeMap.firstKey();
+
+		_setupRequest(hostname, _treeMap.get(hostname));
+
+		_invokeFilter();
+
+		LayoutSet layoutSet = (LayoutSet)_mockHttpServletRequest.getAttribute(
+			WebKeys.VIRTUAL_HOST_LAYOUT_SET);
+
+		Assert.assertEquals(_layoutSetId, layoutSet.getLayoutSetId());
+	}
+
+	private void _cleanUpRequest() {
+		_mockHttpServletRequest.invalidate();
+	}
+
+	private void _invokeFilter() throws Exception {
+		_absoluteRedirectsFilter.doFilterTry(
+			_mockHttpServletRequest, new MockHttpServletResponse());
+	}
+
+	private void _setupRequest(String hostname, String languageId)
+		throws AvailableLocaleException {
+
+		_mockHttpServletRequest = new MockHttpServletRequest();
+
+		if (Validator.isNotNull(languageId)) {
+			List<Locale> locales = new ArrayList<>();
+
+			Locale locale = LocaleUtil.fromLanguageId(languageId);
+
+			locales.add(locale);
+
+			if (!_availableLocales.contains(locale)) {
+				throw new AvailableLocaleException(languageId);
+			}
+
+			_mockHttpServletRequest.setPreferredLocales(locales);
+		}
+
+		_mockHttpServletRequest.setRemoteHost(hostname);
+		_mockHttpServletRequest.setServerName(hostname);
+		_mockHttpServletRequest.setServerPort(_SERVER_PORT);
+		_mockHttpServletRequest.setRequestURI(_WEB_GUEST);
+		_mockHttpServletRequest.addHeader(_HOST, hostname);
+	}
+
+	private static final String _HOST = "Host";
+
+	private static final String _LANGUAGE_ID_DE = "de_DE";
+
+	private static final String _LANGUAGE_ID_ES = "es_ES";
+
+	private static final String _LANGUAGE_ID_FR = "fr_FR";
+
+	private static final int _SERVER_PORT = 8080;
+
+	private static final String _TESTHOST_DE = "testhost.de";
+
+	private static final String _TESTHOST_ES = "testhost.es";
+
+	private static final String _TESTHOST_FR = "testhost.fr";
+
+	private static final String _WEB_GUEST = "/web/guest";
+
+	private static Set<Locale> _availableLocales;
+	private static long _groupId;
+	private static long _layoutSetId;
+
+	@Inject
+	private static LayoutSetLocalService _layoutSetLocalService;
+
+	@Inject
+	private static VirtualHostLocalService _virtualHostLocalService;
+
+	private final AbsoluteRedirectsFilter _absoluteRedirectsFilter =
+		new AbsoluteRedirectsFilter();
+	private MockHttpServletRequest _mockHttpServletRequest;
+	private TreeMap<String, String> _treeMap;
+
+}
\ No newline at end of file
diff --git a/modules/apps/segments/segments-asah-connector/src/main/java/com/liferay/segments/asah/connector/internal/client/model/util/ExperimentUtil.java b/modules/apps/segments/segments-asah-connector/src/main/java/com/liferay/segments/asah/connector/internal/client/model/util/ExperimentUtil.java
index 2f539008f1f8b3..3fb808d0de2c82 100644
--- a/modules/apps/segments/segments-asah-connector/src/main/java/com/liferay/segments/asah/connector/internal/client/model/util/ExperimentUtil.java
+++ b/modules/apps/segments/segments-asah-connector/src/main/java/com/liferay/segments/asah/connector/internal/client/model/util/ExperimentUtil.java
@@ -27,7 +27,6 @@
 import com.liferay.portal.kernel.util.Portal;
 import com.liferay.portal.kernel.util.StringBundler;
 import com.liferay.portal.kernel.util.StringUtil;
-import com.liferay.portal.kernel.util.Validator;
 import com.liferay.portal.util.PropsValues;
 import com.liferay.segments.asah.connector.internal.client.model.Experiment;
 import com.liferay.segments.asah.connector.internal.client.model.ExperimentStatus;
@@ -46,6 +45,7 @@
 
 import java.util.List;
 import java.util.Locale;
+import java.util.TreeMap;
 
 /**
  * @author Sarai Díaz
@@ -182,8 +182,11 @@ private static String _getLayoutFullURL(
 
 		LayoutSet layoutSet = layout.getLayoutSet();
 
-		if (Validator.isNotNull(layoutSet.getVirtualHostname())) {
-			virtualHostname = layoutSet.getVirtualHostname();
+		TreeMap<String, String> virtualHostnames =
+			layoutSet.getVirtualHostnames();
+
+		if (!virtualHostnames.isEmpty()) {
+			virtualHostname = virtualHostnames.firstKey();
 		}
 		else {
 			Company company = companyLocalService.getCompany(
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language.properties
index 67895e808d0847..0772bfa4dbdc94 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Enable Content Recommendation
 enable-content-recommendation-help=Enable this option to filter the content with user's terms of interest.
 equals=Equals
 estimated-time-to-declare-winner=Estimated Time to Declare Winner
+field.asset-tag-ids=Tag
 field.browser=Browser
 field.cookies=Cookies
+field.country=Country
 field.date-modified=Date Modified
 field.device-brand=Device Brand
 field.device-model=Device Model
@@ -72,6 +74,7 @@ field.name-tree-path=Hierarchy Path
 field.organization-id=Organization
 field.parent-organization-id=Parent Organization
 field.referrer-url=Referrer URL
+field.region=Region
 field.request-parameters=Request Parameters
 field.role-ids=Role
 field.screen-name=Screen Name
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_ar.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_ar.properties
index cc3f1db2650047..86d3c37c0edcd9 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_ar.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_ar.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=تمكين توصية المحتوى (Automatic Tr
 enable-content-recommendation-help=تمكين هذا الخيار لتصفية المحتوى مع شروط اهتمام المستخدم. (Automatic Translation)
 equals=يساوي
 estimated-time-to-declare-winner=الوقت المقدر لإعلان الفائز
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=المتصفح
 field.cookies=ملفات تعريف الارتباط
+field.country=Country (Automatic Copy)
 field.date-modified=تاريخ التعديل
 field.device-brand=العلامة التجارية للجهاز
 field.device-model=طراز الجهاز
@@ -72,6 +74,7 @@ field.name-tree-path=مسار شجرة الاسم
 field.organization-id=المنظمة
 field.parent-organization-id=المؤسسة الأصل
 field.referrer-url=عنوان URL لجهة الإحالة
+field.region=Region (Automatic Copy)
 field.request-parameters=معلمات الطلب (Automatic Translation)
 field.role-ids=الدور
 field.screen-name=الإسم الظاهر
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_bg.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_bg.properties
index 90b31c5e48f009..2c78ee79454aba 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_bg.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_bg.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Разрешаване на препоръка з
 enable-content-recommendation-help=Активирайте тази опция, за да филтрирате съдържанието с условията на потребителя за интерес. (Automatic Translation)
 equals=Е равно (Automatic Translation)
 estimated-time-to-declare-winner=Очаквано време за обявяване на победителя (Automatic Translation)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Браузър (Automatic Translation)
 field.cookies=Бисквитки (Automatic Translation)
+field.country=Country (Automatic Copy)
 field.date-modified=Дата на промяна (Automatic Translation)
 field.device-brand=Устройството марка (Automatic Translation)
 field.device-model=Модел на устройството (Automatic Translation)
@@ -72,6 +74,7 @@ field.name-tree-path=Йерархичният път (Automatic Translation)
 field.organization-id=Организация (Automatic Translation)
 field.parent-organization-id=Родителската организация (Automatic Translation)
 field.referrer-url=Препращащият URL адрес (Automatic Translation)
+field.region=Region (Automatic Copy)
 field.request-parameters=Параметри на заявката (Automatic Translation)
 field.role-ids=Роля (Automatic Translation)
 field.screen-name=Екранно име (Automatic Translation)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_ca.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_ca.properties
index 8ec3e27e994dd9..3e49314970571b 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_ca.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_ca.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Habiliteu la recomanació de contingut
 enable-content-recommendation-help=Habiliteu aquesta opció per filtrar el contingut amb els termes d'interès de l'usuari.
 equals=Iguals
 estimated-time-to-declare-winner=Temps estimat per declarar el guanyador
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Navegador
 field.cookies=Galetes
+field.country=Country (Automatic Copy)
 field.date-modified=Data de modificació
 field.device-brand=Marca del dispositiu
 field.device-model=Model del dispositiu
@@ -72,6 +74,7 @@ field.name-tree-path=Camí de l'arbre de noms
 field.organization-id=Organització
 field.parent-organization-id=Organització principal
 field.referrer-url=URL del recomanador
+field.region=Region (Automatic Copy)
 field.request-parameters=Paràmetres de sol·licitud
 field.role-ids=Rol
 field.screen-name=Nom d'usuari
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_cs.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_cs.properties
index f7b54da38fc265..d077b8e355a80c 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_cs.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_cs.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Povolit doporučení obsahu (Automatic Translation
 enable-content-recommendation-help=Povolte tuto volbu, pokud chcete filtrovat obsah s úrokovými podmínkami uživatele. (Automatic Translation)
 equals=Rovná se (Automatic Translation)
 estimated-time-to-declare-winner=Odhadovaný čas pro deklaraci vítěze (Automatic Translation)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Prohlížeč (Automatic Translation)
 field.cookies=Soubory cookie (Automatic Translation)
+field.country=Country (Automatic Copy)
 field.date-modified=Datum změny (Automatic Translation)
 field.device-brand=Značka zařízení (Automatic Translation)
 field.device-model=Model zařízení (Automatic Translation)
@@ -72,6 +74,7 @@ field.name-tree-path=Hierarchická cesta (Automatic Translation)
 field.organization-id=Organizace (Automatic Translation)
 field.parent-organization-id=Nadřazená organizace (Automatic Translation)
 field.referrer-url=Adresu URL odkazujícího serveru (Automatic Translation)
+field.region=Region (Automatic Copy)
 field.request-parameters=Parametry požadavku (Automatic Translation)
 field.role-ids=Role (Automatic Translation)
 field.screen-name=Název obrazovky (Automatic Translation)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_da.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_da.properties
index ea3adddb404417..94cced791a5aa3 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_da.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_da.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Enable Content Recommendation (Automatic Copy)
 enable-content-recommendation-help=Enable this option to filter the content with user's terms of interest. (Automatic Copy)
 equals=Equals (Automatic Copy)
 estimated-time-to-declare-winner=Estimated Time to Declare Winner (Automatic Copy)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Browser (Automatic Copy)
 field.cookies=Cookies (Automatic Copy)
+field.country=Country (Automatic Copy)
 field.date-modified=Date Modified (Automatic Copy)
 field.device-brand=Device Brand (Automatic Copy)
 field.device-model=Device Model (Automatic Copy)
@@ -72,6 +74,7 @@ field.name-tree-path=Hierarchy Path (Automatic Copy)
 field.organization-id=Organization (Automatic Copy)
 field.parent-organization-id=Parent Organization (Automatic Copy)
 field.referrer-url=Referrer URL (Automatic Copy)
+field.region=Region (Automatic Copy)
 field.request-parameters=Request Parameters (Automatic Copy)
 field.role-ids=Role (Automatic Copy)
 field.screen-name=Screen Name (Automatic Copy)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_de.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_de.properties
index bb68352170d45c..b5f95ed78541e3 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_de.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_de.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Inhaltsempfehlung aktivieren
 enable-content-recommendation-help=Aktivieren Sie diese Option, um den Inhalt nach den Interessen des Benutzers zu filtern.
 equals=Ist gleich
 estimated-time-to-declare-winner=Geschätzte Zeit bis zur Verkündung des Siegers
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Browser
 field.cookies=Cookies
+field.country=Country (Automatic Copy)
 field.date-modified=Änderungsdatum
 field.device-brand=Gerätemarke
 field.device-model=Gerätemodell
@@ -72,6 +74,7 @@ field.name-tree-path=Name des Verzeichnispfades
 field.organization-id=Organisation
 field.parent-organization-id=Übergeordnete Organisation
 field.referrer-url=Referrer-URL
+field.region=Region (Automatic Copy)
 field.request-parameters=Anfrageparameter
 field.role-ids=Rolle
 field.screen-name=Benutzername
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_el.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_el.properties
index 54bfdc27097bcb..1ef600b2c8c7fb 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_el.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_el.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Ενεργοποίηση σύστασης περι
 enable-content-recommendation-help=Ενεργοποιήστε αυτήν την επιλογή για να φιλτράρετε το περιεχόμενο με τους όρους ενδιαφέροντος του χρήστη. (Automatic Translation)
 equals=Ισούται με (Automatic Translation)
 estimated-time-to-declare-winner=Εκτιμώμενος χρόνος για τη διακήρυξη του νικητή (Automatic Translation)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Πρόγραμμα περιήγησης (Automatic Translation)
 field.cookies=Τα cookies (Automatic Translation)
+field.country=Country (Automatic Copy)
 field.date-modified=Ημερομηνία τροποποίησης (Automatic Translation)
 field.device-brand=Συσκευή μάρκα (Automatic Translation)
 field.device-model=Μοντέλο συσκευής (Automatic Translation)
@@ -72,6 +74,7 @@ field.name-tree-path=Διαδρομή ιεραρχίας (Automatic Translation)
 field.organization-id=Οργάνωση (Automatic Translation)
 field.parent-organization-id=Μητρική οργάνωση (Automatic Translation)
 field.referrer-url=Referrer URL (Automatic Translation)
+field.region=Region (Automatic Copy)
 field.request-parameters=Παράμετροι αίτησης (Automatic Translation)
 field.role-ids=Ρόλο (Automatic Translation)
 field.screen-name=Όνομα οθόνης (Automatic Translation)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_en.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_en.properties
index 67895e808d0847..0772bfa4dbdc94 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_en.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_en.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Enable Content Recommendation
 enable-content-recommendation-help=Enable this option to filter the content with user's terms of interest.
 equals=Equals
 estimated-time-to-declare-winner=Estimated Time to Declare Winner
+field.asset-tag-ids=Tag
 field.browser=Browser
 field.cookies=Cookies
+field.country=Country
 field.date-modified=Date Modified
 field.device-brand=Device Brand
 field.device-model=Device Model
@@ -72,6 +74,7 @@ field.name-tree-path=Hierarchy Path
 field.organization-id=Organization
 field.parent-organization-id=Parent Organization
 field.referrer-url=Referrer URL
+field.region=Region
 field.request-parameters=Request Parameters
 field.role-ids=Role
 field.screen-name=Screen Name
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_es.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_es.properties
index 277178fd9082ca..116ad6763f8a70 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_es.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_es.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Habilitar recomendación de contenido
 enable-content-recommendation-help=Habilite esta opción para filtrar el contenido con las condiciones de interés del usuario.
 equals=Igual
 estimated-time-to-declare-winner=Tiempo estimado para declarar el ganador
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Navegador
 field.cookies=Cookies
+field.country=Country (Automatic Copy)
 field.date-modified=Fecha de modificación
 field.device-brand=Marca de dispositivo
 field.device-model=Modelo de dispositivo
@@ -72,6 +74,7 @@ field.name-tree-path=Ruta del árbol de nombres
 field.organization-id=Organización
 field.parent-organization-id=Organización padre
 field.referrer-url=URL de referencia
+field.region=Region (Automatic Copy)
 field.request-parameters=Parámetros de la petición
 field.role-ids=Rol
 field.screen-name=Nombre de usuario
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_et.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_et.properties
index 27d805613731f7..6c74c77ba961bb 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_et.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_et.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Luba Sisusoovitus (Automatic Translation)
 enable-content-recommendation-help=Lubage see suvand sisu filtreerimiseks kasutaja huvide tingimustega. (Automatic Translation)
 equals=Võrdub (Automatic Translation)
 estimated-time-to-declare-winner=Hinnanguline aeg võitja deklareerimiseks (Automatic Translation)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Brauser (Automatic Translation)
 field.cookies=Küpsised (Automatic Translation)
+field.country=Country (Automatic Copy)
 field.date-modified=Muutmise kuupäev (Automatic Translation)
 field.device-brand=Seadme Mark (Automatic Translation)
 field.device-model=Seadme mudel (Automatic Translation)
@@ -72,6 +74,7 @@ field.name-tree-path=Hierarhia tee (Automatic Translation)
 field.organization-id=Organisatsiooni (Automatic Translation)
 field.parent-organization-id=Emaettevõttele (Automatic Translation)
 field.referrer-url=Viitav URL (Automatic Translation)
+field.region=Region (Automatic Copy)
 field.request-parameters=Taotle parameetreid (Automatic Translation)
 field.role-ids=Rolli (Automatic Translation)
 field.screen-name=Kasutajanimi (Automatic Translation)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_eu.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_eu.properties
index ea3adddb404417..94cced791a5aa3 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_eu.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_eu.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Enable Content Recommendation (Automatic Copy)
 enable-content-recommendation-help=Enable this option to filter the content with user's terms of interest. (Automatic Copy)
 equals=Equals (Automatic Copy)
 estimated-time-to-declare-winner=Estimated Time to Declare Winner (Automatic Copy)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Browser (Automatic Copy)
 field.cookies=Cookies (Automatic Copy)
+field.country=Country (Automatic Copy)
 field.date-modified=Date Modified (Automatic Copy)
 field.device-brand=Device Brand (Automatic Copy)
 field.device-model=Device Model (Automatic Copy)
@@ -72,6 +74,7 @@ field.name-tree-path=Hierarchy Path (Automatic Copy)
 field.organization-id=Organization (Automatic Copy)
 field.parent-organization-id=Parent Organization (Automatic Copy)
 field.referrer-url=Referrer URL (Automatic Copy)
+field.region=Region (Automatic Copy)
 field.request-parameters=Request Parameters (Automatic Copy)
 field.role-ids=Role (Automatic Copy)
 field.screen-name=Screen Name (Automatic Copy)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_fa.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_fa.properties
index 19f8540dce9d7c..796551cadc278a 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_fa.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_fa.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=فعال کردن توصیه محتوا (Automatic
 enable-content-recommendation-help=این گزینه را برای فیلتر کردن محتوا با شرایط مورد علاقه کاربر فعال کنید. (Automatic Translation)
 equals=برابر است
 estimated-time-to-declare-winner=زمان تخمینی برای اعلام برنده (Automatic Translation)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=مرورگر
 field.cookies=کوکی ها
+field.country=Country (Automatic Copy)
 field.date-modified=تاریخ ویرایش (Automatic Translation)
 field.device-brand=دستگاه با نام تجاری (Automatic Translation)
 field.device-model=مدل دستگاه (Automatic Translation)
@@ -72,6 +74,7 @@ field.name-tree-path=سلسله مراتب مسیر (Automatic Translation)
 field.organization-id=سازمان (Automatic Translation)
 field.parent-organization-id=پدر و مادر سازمان (Automatic Translation)
 field.referrer-url=URL ارجاع دهنده (Automatic Translation)
+field.region=Region (Automatic Copy)
 field.request-parameters=پارامترهای درخواست (Automatic Translation)
 field.role-ids=نقش
 field.screen-name=نام صفحه نمایش (Automatic Translation)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_fi.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_fi.properties
index e1ed9d1761341c..4573f538d53b0e 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_fi.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_fi.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Ota Käyttöön Sisältösuositus
 enable-content-recommendation-help=Ota käyttöön tämä vaihtoehto suodattaaksesi sisältöä käyttäjän kiinnostuksen kohteiden mukaan.
 equals=Yhtä suuri kuin
 estimated-time-to-declare-winner=Arvioitu Aika Voittajan Julistamiseen
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Selain
 field.cookies=Evästeet
+field.country=Country (Automatic Copy)
 field.date-modified=Muokkauspäivämäärä
 field.device-brand=Laitteen Merkki
 field.device-model=Laitteen Malli
@@ -72,6 +74,7 @@ field.name-tree-path=Nimipuun Polku
 field.organization-id=Organisaatio
 field.parent-organization-id=Isäntäorganisaatio
 field.referrer-url=Viitattu URL
+field.region=Region (Automatic Copy)
 field.request-parameters=Pyynnön Parametrit
 field.role-ids=Rooli
 field.screen-name=Nimimerkki
@@ -158,4 +161,4 @@ x-member={0} Jäsen
 x-members={0} Jäsentä
 x-properties={0} Ominaisuutta
 x-with-property-x={0} Ominaisuudella {1}
-x-with-property-x-x-x={0} Ominaisuudella {1} {2} {3}
\ No newline at end of file
+x-with-property-x-x-x={0} Ominaisuudella {1} {2} {3}
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_fr.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_fr.properties
index ca421a86c77eea..51398890b50721 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_fr.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_fr.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Activer les recommandation de contenu
 enable-content-recommendation-help=Activez cette option pour filtrer le contenu en fonction des conditions d'intérêt de l'utilisateur.
 equals=Égal à
 estimated-time-to-declare-winner=Temps estimé pour déclarer le gagnant (Automatic Translation)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Navigateur
 field.cookies=Cookies
+field.country=Country (Automatic Copy)
 field.date-modified=Date de modification
 field.device-brand=Marque de l'appareil
 field.device-model=Modèle du dispositif
@@ -72,6 +74,7 @@ field.name-tree-path=Chemin de l'arbre des noms
 field.organization-id=Organisation
 field.parent-organization-id=Organisation parente
 field.referrer-url=URL de la recommandation
+field.region=Region (Automatic Copy)
 field.request-parameters=Demander les paramètres
 field.role-ids=Rôle
 field.screen-name=login
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_gl.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_gl.properties
index ea3adddb404417..94cced791a5aa3 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_gl.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_gl.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Enable Content Recommendation (Automatic Copy)
 enable-content-recommendation-help=Enable this option to filter the content with user's terms of interest. (Automatic Copy)
 equals=Equals (Automatic Copy)
 estimated-time-to-declare-winner=Estimated Time to Declare Winner (Automatic Copy)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Browser (Automatic Copy)
 field.cookies=Cookies (Automatic Copy)
+field.country=Country (Automatic Copy)
 field.date-modified=Date Modified (Automatic Copy)
 field.device-brand=Device Brand (Automatic Copy)
 field.device-model=Device Model (Automatic Copy)
@@ -72,6 +74,7 @@ field.name-tree-path=Hierarchy Path (Automatic Copy)
 field.organization-id=Organization (Automatic Copy)
 field.parent-organization-id=Parent Organization (Automatic Copy)
 field.referrer-url=Referrer URL (Automatic Copy)
+field.region=Region (Automatic Copy)
 field.request-parameters=Request Parameters (Automatic Copy)
 field.role-ids=Role (Automatic Copy)
 field.screen-name=Screen Name (Automatic Copy)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_hi_IN.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_hi_IN.properties
index 2b1733e6aa0140..29d90d7cb6b694 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_hi_IN.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_hi_IN.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=सामग्री अनुशंसा सक
 enable-content-recommendation-help=उपयोगकर्ता की रुचि की शर्तों के साथ सामग्री फ़िल्टर करने के लिए इस विकल्प को सक्षम करें। (Automatic Translation)
 equals=बराबर (Automatic Translation)
 estimated-time-to-declare-winner=विजेता घोषित करने के लिए अनुमानित समय (Automatic Translation)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=ब्राउज़र (Automatic Translation)
 field.cookies=कुकीज़ (Automatic Translation)
+field.country=Country (Automatic Copy)
 field.date-modified=दिनांक संशोधित (Automatic Translation)
 field.device-brand=डिवाइस ब्रांड (Automatic Translation)
 field.device-model=डिवाइस मॉडल (Automatic Translation)
@@ -72,6 +74,7 @@ field.name-tree-path=पदानुक्रम पथ (Automatic Translation)
 field.organization-id=संगठन (Automatic Translation)
 field.parent-organization-id=पैरेंट संगठन (Automatic Translation)
 field.referrer-url=संदर्भ URL (Automatic Translation)
+field.region=Region (Automatic Copy)
 field.request-parameters=पैरामीटर का अनुरोध करें (Automatic Translation)
 field.role-ids=भूमिका (Automatic Translation)
 field.screen-name=स्क्रीन नाम (Automatic Translation)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_hr.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_hr.properties
index ea3adddb404417..94cced791a5aa3 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_hr.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_hr.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Enable Content Recommendation (Automatic Copy)
 enable-content-recommendation-help=Enable this option to filter the content with user's terms of interest. (Automatic Copy)
 equals=Equals (Automatic Copy)
 estimated-time-to-declare-winner=Estimated Time to Declare Winner (Automatic Copy)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Browser (Automatic Copy)
 field.cookies=Cookies (Automatic Copy)
+field.country=Country (Automatic Copy)
 field.date-modified=Date Modified (Automatic Copy)
 field.device-brand=Device Brand (Automatic Copy)
 field.device-model=Device Model (Automatic Copy)
@@ -72,6 +74,7 @@ field.name-tree-path=Hierarchy Path (Automatic Copy)
 field.organization-id=Organization (Automatic Copy)
 field.parent-organization-id=Parent Organization (Automatic Copy)
 field.referrer-url=Referrer URL (Automatic Copy)
+field.region=Region (Automatic Copy)
 field.request-parameters=Request Parameters (Automatic Copy)
 field.role-ids=Role (Automatic Copy)
 field.screen-name=Screen Name (Automatic Copy)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_hu.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_hu.properties
index c37e962fb2722e..9053c31fb4721e 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_hu.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_hu.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Tartalomajánlat engedélyezése
 enable-content-recommendation-help=Engedélyezze a lehetőséget a tartalom felhasználó érdeklődése alapján történő szűréséhez.
 equals=Egyenlő
 estimated-time-to-declare-winner=A győztes kihirdetésének becsült időpontja
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Böngésző
 field.cookies=Cookie-k
+field.country=Country (Automatic Copy)
 field.date-modified=Módosítás dátuma
 field.device-brand=Eszköz márkája
 field.device-model=Eszköz modellje
@@ -72,6 +74,7 @@ field.name-tree-path=Hierarchia útvonala
 field.organization-id=Szervezet
 field.parent-organization-id=Szülő szervezet
 field.referrer-url=Hivatkozás URL-címe
+field.region=Region (Automatic Copy)
 field.request-parameters=Paraméterek kérelmezése
 field.role-ids=Szerepkör
 field.screen-name=Képernyőnév
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_in.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_in.properties
index c69f62e78dfb15..02260ca7cd90b6 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_in.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_in.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Aktifkan rekomendasi konten (Automatic Translation
 enable-content-recommendation-help=Aktifkan opsi ini untuk memfilter konten dengan persyaratan minat pengguna. (Automatic Translation)
 equals=Sama dengan (Automatic Translation)
 estimated-time-to-declare-winner=Perkiraan waktu untuk mengumumkan pemenang (Automatic Translation)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Browser (Automatic Translation)
 field.cookies=Cookie (Automatic Translation)
+field.country=Country (Automatic Copy)
 field.date-modified=Tanggal dimodifikasi (Automatic Translation)
 field.device-brand=Merek perangkat (Automatic Translation)
 field.device-model=Model perangkat (Automatic Translation)
@@ -72,6 +74,7 @@ field.name-tree-path=Hirarki Path (Automatic Translation)
 field.organization-id=Organisasi (Automatic Translation)
 field.parent-organization-id=Organisasi induk (Automatic Translation)
 field.referrer-url=URL perujuk (Automatic Translation)
+field.region=Region (Automatic Copy)
 field.request-parameters=Parameter permintaan (Automatic Translation)
 field.role-ids=Peran (Automatic Translation)
 field.screen-name=Nama layar (Automatic Translation)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_it.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_it.properties
index 8c10f8ee05cc1b..830b456f7ef9eb 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_it.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_it.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Abilita raccomandazione sui contenuti (Automatic T
 enable-content-recommendation-help=Attivare questa opzione per filtrare il contenuto in base alle condizioni di interesse dell'utente. (Automatic Translation)
 equals=È uguale a (Automatic Translation)
 estimated-time-to-declare-winner=Tempo stimato per dichiarare il vincitore (Automatic Translation)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Browser (Automatic Translation)
 field.cookies=Cookie (Automatic Translation)
+field.country=Country (Automatic Copy)
 field.date-modified=Data di modifica (Automatic Translation)
 field.device-brand=Marca di dispositivo (Automatic Translation)
 field.device-model=Modello di dispositivo (Automatic Translation)
@@ -72,6 +74,7 @@ field.name-tree-path=Percorso della gerarchia (Automatic Translation)
 field.organization-id=Organizzazione (Automatic Translation)
 field.parent-organization-id=Organizzazione principale (Automatic Translation)
 field.referrer-url=Referrer URL (Automatic Translation)
+field.region=Region (Automatic Copy)
 field.request-parameters=Parametri di richiesta (Automatic Translation)
 field.role-ids=Ruolo (Automatic Translation)
 field.screen-name=Nome di schermo (Automatic Translation)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_iw.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_iw.properties
index fe0bdbf284bf95..ed54bedf1d7871 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_iw.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_iw.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=אפשר המלצת תוכן (Automatic Translatio
 enable-content-recommendation-help=הפוך אפשרות זו לזמינה כדי לסנן את התוכן עם תנאי העניין של המשתמש. (Automatic Translation)
 equals=שווה ל- (Automatic Translation)
 estimated-time-to-declare-winner=זמן משוער להכריז על הזוכה (Automatic Translation)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=דפדפן (Automatic Translation)
 field.cookies=עוגיות (Automatic Translation)
+field.country=Country (Automatic Copy)
 field.date-modified=התאריך שונה (Automatic Translation)
 field.device-brand=המכשיר המותג (Automatic Translation)
 field.device-model=מודל המכשיר (Automatic Translation)
@@ -72,6 +74,7 @@ field.name-tree-path=נתיב הירארכיה (Automatic Translation)
 field.organization-id=הארגון (Automatic Translation)
 field.parent-organization-id=ארגון אב (Automatic Translation)
 field.referrer-url=כתובת URL של המפנה (Automatic Translation)
+field.region=Region (Automatic Copy)
 field.request-parameters=בקשה לפרמטרים (Automatic Translation)
 field.role-ids=תפקיד (Automatic Translation)
 field.screen-name=שם מסך (Automatic Translation)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_ja.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_ja.properties
index 2172945f9a4fa8..1b95b4a790fa03 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_ja.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_ja.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=コンテンツ推薦を有効にする
 enable-content-recommendation-help=ユーザーが関心のある言葉でコンテンツを絞り込むには、このオプションを有効にしてください。
 equals=等しい
 estimated-time-to-declare-winner=勝者を宣言するための予想時間
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=ブラウザ
 field.cookies=Cookie
+field.country=Country (Automatic Copy)
 field.date-modified=変更日
 field.device-brand=デバイスのブランド
 field.device-model=デバイスのモデル
@@ -72,6 +74,7 @@ field.name-tree-path=名前ツリーパス
 field.organization-id=組織
 field.parent-organization-id=親企業
 field.referrer-url=リファラーURL
+field.region=Region (Automatic Copy)
 field.request-parameters=リクエストパラメータ
 field.role-ids=ロール
 field.screen-name=スクリーン名
@@ -158,4 +161,4 @@ x-member=メンバー{0}名
 x-members=メンバー{0}名
 x-properties={0}件のプロパティ
 x-with-property-x=プロパティ {1} の {0}
-x-with-property-x-x-x=プロパティ {1} {2} {3} の {0}
\ No newline at end of file
+x-with-property-x-x-x=プロパティ {1} {2} {3} の {0}
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_kk.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_kk.properties
index ea3adddb404417..94cced791a5aa3 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_kk.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_kk.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Enable Content Recommendation (Automatic Copy)
 enable-content-recommendation-help=Enable this option to filter the content with user's terms of interest. (Automatic Copy)
 equals=Equals (Automatic Copy)
 estimated-time-to-declare-winner=Estimated Time to Declare Winner (Automatic Copy)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Browser (Automatic Copy)
 field.cookies=Cookies (Automatic Copy)
+field.country=Country (Automatic Copy)
 field.date-modified=Date Modified (Automatic Copy)
 field.device-brand=Device Brand (Automatic Copy)
 field.device-model=Device Model (Automatic Copy)
@@ -72,6 +74,7 @@ field.name-tree-path=Hierarchy Path (Automatic Copy)
 field.organization-id=Organization (Automatic Copy)
 field.parent-organization-id=Parent Organization (Automatic Copy)
 field.referrer-url=Referrer URL (Automatic Copy)
+field.region=Region (Automatic Copy)
 field.request-parameters=Request Parameters (Automatic Copy)
 field.role-ids=Role (Automatic Copy)
 field.screen-name=Screen Name (Automatic Copy)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_ko.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_ko.properties
index 3a4548f0fb576c..509ab7b749477a 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_ko.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_ko.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=콘텐츠 추천 사용 (Automatic Translation)
 enable-content-recommendation-help=이 옵션을 사용하여 사용자의 관심 조건으로 콘텐츠를 필터링합니다. (Automatic Translation)
 equals=같음 (Automatic Translation)
 estimated-time-to-declare-winner=우승자를 선언할 예상 시간 (Automatic Translation)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=브라우저 (Automatic Translation)
 field.cookies=쿠키 (Automatic Translation)
+field.country=Country (Automatic Copy)
 field.date-modified=최종 수정 날짜 (Automatic Translation)
 field.device-brand=장치 브랜드 (Automatic Translation)
 field.device-model=장치 모델 (Automatic Translation)
@@ -72,6 +74,7 @@ field.name-tree-path=계층 경로 (Automatic Translation)
 field.organization-id=조직 (Automatic Translation)
 field.parent-organization-id=부모 조직 (Automatic Translation)
 field.referrer-url=참조 URL (Automatic Translation)
+field.region=Region (Automatic Copy)
 field.request-parameters=요청 매개 변수 (Automatic Translation)
 field.role-ids=역할 (Automatic Translation)
 field.screen-name=화면 이름 (Automatic Translation)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_lo.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_lo.properties
index ea3adddb404417..94cced791a5aa3 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_lo.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_lo.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Enable Content Recommendation (Automatic Copy)
 enable-content-recommendation-help=Enable this option to filter the content with user's terms of interest. (Automatic Copy)
 equals=Equals (Automatic Copy)
 estimated-time-to-declare-winner=Estimated Time to Declare Winner (Automatic Copy)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Browser (Automatic Copy)
 field.cookies=Cookies (Automatic Copy)
+field.country=Country (Automatic Copy)
 field.date-modified=Date Modified (Automatic Copy)
 field.device-brand=Device Brand (Automatic Copy)
 field.device-model=Device Model (Automatic Copy)
@@ -72,6 +74,7 @@ field.name-tree-path=Hierarchy Path (Automatic Copy)
 field.organization-id=Organization (Automatic Copy)
 field.parent-organization-id=Parent Organization (Automatic Copy)
 field.referrer-url=Referrer URL (Automatic Copy)
+field.region=Region (Automatic Copy)
 field.request-parameters=Request Parameters (Automatic Copy)
 field.role-ids=Role (Automatic Copy)
 field.screen-name=Screen Name (Automatic Copy)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_lt.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_lt.properties
index 4b03bd876d8938..805d28737361b3 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_lt.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_lt.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Turinio rekomendacijos įjungimas (Automatic Trans
 enable-content-recommendation-help=Įgalinkite šią parinktį, kad turinys būtų filtruojamas pagal vartotojo dominantas sąlygas. (Automatic Translation)
 equals=Yra lygi (Automatic Translation)
 estimated-time-to-declare-winner=Numatomas laikas paskelbti nugalėtoją (Automatic Translation)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Naršyklė (Automatic Translation)
 field.cookies=Slapukai (Automatic Translation)
+field.country=Country (Automatic Copy)
 field.date-modified=Modifikavimo data (Automatic Translation)
 field.device-brand=Įrenginio prekės ženklo (Automatic Translation)
 field.device-model=Prietaiso modelis (Automatic Translation)
@@ -72,6 +74,7 @@ field.name-tree-path=Hierarchija kelią (Automatic Translation)
 field.organization-id=Organizacijos (Automatic Translation)
 field.parent-organization-id=Pirminės organizacijos (Automatic Translation)
 field.referrer-url=Persiuntėjo URL (Automatic Translation)
+field.region=Region (Automatic Copy)
 field.request-parameters=Užklausos parametrai (Automatic Translation)
 field.role-ids=Vaidmuo (Automatic Translation)
 field.screen-name=Ekrano pavadinimas (Automatic Translation)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_nb.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_nb.properties
index 48189719de5695..7dc2272df6439f 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_nb.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_nb.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Aktivere innholds anbefaling (Automatic Translatio
 enable-content-recommendation-help=Aktiver dette alternativet for å filtrere innholdet med brukerens interesse uttrykk. (Automatic Translation)
 equals=Er lik (Automatic Translation)
 estimated-time-to-declare-winner=Anslått tid for å erklære Winner (Automatic Translation)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Nettleser (Automatic Translation)
 field.cookies=Informasjonskapsler (Automatic Translation)
+field.country=Country (Automatic Copy)
 field.date-modified=Endringsdato (Automatic Translation)
 field.device-brand=Apparat merket (Automatic Translation)
 field.device-model=Enhetsmodellen (Automatic Translation)
@@ -72,6 +74,7 @@ field.name-tree-path=Hierarkibanen (Automatic Translation)
 field.organization-id=Organisasjon (Automatic Translation)
 field.parent-organization-id=Overordnede organisasjonen (Automatic Translation)
 field.referrer-url=Henvisningswebadressen (Automatic Translation)
+field.region=Region (Automatic Copy)
 field.request-parameters=Be om parametere (Automatic Translation)
 field.role-ids=Rolle (Automatic Translation)
 field.screen-name=Navnet (Automatic Translation)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_nl.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_nl.properties
index ab6663c0e01732..e794096c202a05 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_nl.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_nl.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Inhoudaanbeveling inschakelen
 enable-content-recommendation-help=Schakel deze optie in om de inhoud te filteren volgens de termen van de interesses van de gebruiker.
 equals=Is gelijk aan
 estimated-time-to-declare-winner=De geschatte tijd om een winnaar aan te kondigen
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Browser
 field.cookies=Cookies
+field.country=Country (Automatic Copy)
 field.date-modified=Datum gewijzigd
 field.device-brand=Merk apparaat
 field.device-model=Model apparaat
@@ -72,6 +74,7 @@ field.name-tree-path=Naam pad boomstructuur
 field.organization-id=Organisatie
 field.parent-organization-id=Bovenliggende organisatie
 field.referrer-url=Doorverwijs-URL
+field.region=Region (Automatic Copy)
 field.request-parameters=Verzoekparameters
 field.role-ids=Functie
 field.screen-name=Gebruikersnaam
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_nl_BE.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_nl_BE.properties
index ea3adddb404417..94cced791a5aa3 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_nl_BE.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_nl_BE.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Enable Content Recommendation (Automatic Copy)
 enable-content-recommendation-help=Enable this option to filter the content with user's terms of interest. (Automatic Copy)
 equals=Equals (Automatic Copy)
 estimated-time-to-declare-winner=Estimated Time to Declare Winner (Automatic Copy)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Browser (Automatic Copy)
 field.cookies=Cookies (Automatic Copy)
+field.country=Country (Automatic Copy)
 field.date-modified=Date Modified (Automatic Copy)
 field.device-brand=Device Brand (Automatic Copy)
 field.device-model=Device Model (Automatic Copy)
@@ -72,6 +74,7 @@ field.name-tree-path=Hierarchy Path (Automatic Copy)
 field.organization-id=Organization (Automatic Copy)
 field.parent-organization-id=Parent Organization (Automatic Copy)
 field.referrer-url=Referrer URL (Automatic Copy)
+field.region=Region (Automatic Copy)
 field.request-parameters=Request Parameters (Automatic Copy)
 field.role-ids=Role (Automatic Copy)
 field.screen-name=Screen Name (Automatic Copy)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_pl.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_pl.properties
index 6e956d24e221af..515efabac8e8d0 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_pl.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_pl.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Włącz rekomendację treści (Automatic Translati
 enable-content-recommendation-help=Włącz tę opcję, aby filtrować zawartość z warunkami użytkownika. (Automatic Translation)
 equals=Jest równa (Automatic Translation)
 estimated-time-to-declare-winner=Szacowany czas na zadeklarowanie zwycięzcy (Automatic Translation)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Przeglądarka (Automatic Translation)
 field.cookies=Pliki cookie (Automatic Translation)
+field.country=Country (Automatic Copy)
 field.date-modified=Data modyfikacji (Automatic Translation)
 field.device-brand=Urządzenia marki (Automatic Translation)
 field.device-model=Model urządzenia (Automatic Translation)
@@ -72,6 +74,7 @@ field.name-tree-path=Hierarchii ścieżki (Automatic Translation)
 field.organization-id=Organizacja (Automatic Translation)
 field.parent-organization-id=Organizacji nadrzędnej (Automatic Translation)
 field.referrer-url=Referrer URL (Automatic Translation)
+field.region=Region (Automatic Copy)
 field.request-parameters=Parametry żądania (Automatic Translation)
 field.role-ids=Rola (Automatic Translation)
 field.screen-name=Nazwa ekranu (Automatic Translation)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_pt_BR.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_pt_BR.properties
index dfe2b67d1edb34..b54ed7ef837389 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_pt_BR.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_pt_BR.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Habilitar Recomendação de Conteúdo
 enable-content-recommendation-help=Habilitar esta opção para filtrar o conteúdo com os termos de interesse do usuário.
 equals=Igual
 estimated-time-to-declare-winner=Tempo Estimado para Declarar o Vencedor
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Navegador
 field.cookies=Cookies
+field.country=Country (Automatic Copy)
 field.date-modified=Data de modificação
 field.device-brand=Marca do dispositivo
 field.device-model=Modelo do dispositivo
@@ -72,6 +74,7 @@ field.name-tree-path=Caminho da hierarquia
 field.organization-id=Organização
 field.parent-organization-id=Organização Superior
 field.referrer-url=URL de referência
+field.region=Region (Automatic Copy)
 field.request-parameters=Parâmetros da Solicitação
 field.role-ids=Função
 field.screen-name=Nome de Usuário
@@ -158,4 +161,4 @@ x-member={0} Membro
 x-members={0} Membros
 x-properties={0} Propriedades
 x-with-property-x={0} Com a Propriedade {1}
-x-with-property-x-x-x={0} Com a Propriedade {1} {2} {3}
\ No newline at end of file
+x-with-property-x-x-x={0} Com a Propriedade {1} {2} {3}
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_pt_PT.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_pt_PT.properties
index 5b55afa0baf3c3..4a4992a33dfb61 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_pt_PT.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_pt_PT.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Enable Content Recommendation (Automatic Copy)
 enable-content-recommendation-help=Enable this option to filter the content with user's terms of interest. (Automatic Copy)
 equals=Equals (Automatic Copy)
 estimated-time-to-declare-winner=Tempo estimado para declarar vencedor (Automatic Translation)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Browser (Automatic Copy)
 field.cookies=Cookies (Automatic Copy)
+field.country=Country (Automatic Copy)
 field.date-modified=Date Modified (Automatic Copy)
 field.device-brand=Device Brand (Automatic Copy)
 field.device-model=Device Model (Automatic Copy)
@@ -72,6 +74,7 @@ field.name-tree-path=Hierarchy Path (Automatic Copy)
 field.organization-id=Organization (Automatic Copy)
 field.parent-organization-id=Parent Organization (Automatic Copy)
 field.referrer-url=Referrer URL (Automatic Copy)
+field.region=Region (Automatic Copy)
 field.request-parameters=Request Parameters (Automatic Copy)
 field.role-ids=Role (Automatic Copy)
 field.screen-name=Screen Name (Automatic Copy)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_ro.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_ro.properties
index 10570e4dbd8eba..e52dbe0e51cabb 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_ro.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_ro.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Activare recomandare conținut (Automatic Translat
 enable-content-recommendation-help=Activați această opțiune pentru a filtra conținutul cu termenii de interes ai utilizatorului. (Automatic Translation)
 equals=Este egal cu (Automatic Translation)
 estimated-time-to-declare-winner=Timpul estimat de declarare a câștigătorului (Automatic Translation)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Browser-ul (Automatic Translation)
 field.cookies=Cookie-uri (Automatic Translation)
+field.country=Country (Automatic Copy)
 field.date-modified=Data modificat (Automatic Translation)
 field.device-brand=Dispozitiv de Brand (Automatic Translation)
 field.device-model=Model de aparat (Automatic Translation)
@@ -72,6 +74,7 @@ field.name-tree-path=Ierarhia calea (Automatic Translation)
 field.organization-id=Organizarea (Automatic Translation)
 field.parent-organization-id=Organizaţia mamă (Automatic Translation)
 field.referrer-url=Referrer URL (Automatic Translation)
+field.region=Region (Automatic Copy)
 field.request-parameters=Parametrii de solicitare (Automatic Translation)
 field.role-ids=Rolul (Automatic Translation)
 field.screen-name=Nume ecran (Automatic Translation)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_ru.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_ru.properties
index fca8c13823f8f9..7baf98f8f40e16 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_ru.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_ru.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Рекомендация включить конт
 enable-content-recommendation-help=Включите эту опцию для фильтрации содержимого с условиями интереса пользователя. (Automatic Translation)
 equals=Равняется (Automatic Translation)
 estimated-time-to-declare-winner=Ориентировочное время для объявления победителя (Automatic Translation)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Обозреватель (Automatic Translation)
 field.cookies=Печенье (Automatic Translation)
+field.country=Country (Automatic Copy)
 field.date-modified=Дата изменения (Automatic Translation)
 field.device-brand=Марка устройства (Automatic Translation)
 field.device-model=Модель устройства (Automatic Translation)
@@ -72,6 +74,7 @@ field.name-tree-path=Путь иерархии (Automatic Translation)
 field.organization-id=Организации (Automatic Translation)
 field.parent-organization-id=Вышестоящая организация (Automatic Translation)
 field.referrer-url=Реферер URL (Automatic Translation)
+field.region=Region (Automatic Copy)
 field.request-parameters=Параметры запроса (Automatic Translation)
 field.role-ids=Роль (Automatic Translation)
 field.screen-name=Имя экрана (Automatic Translation)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_sk.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_sk.properties
index 534fd694c21fcf..054c38db840fc6 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_sk.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_sk.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Povoliť odporúčanie pre obsah (Automatic Transl
 enable-content-recommendation-help=Povoľte túto možnosť na filtrovanie obsahu s podmienkami používateľa. (Automatic Translation)
 equals=Rovná sa (Automatic Translation)
 estimated-time-to-declare-winner=Odhadovaný čas na deklarovanie víťaza (Automatic Translation)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Prehliadač (Automatic Translation)
 field.cookies=Súbory "cookie" (Automatic Translation)
+field.country=Country (Automatic Copy)
 field.date-modified=Dátum úpravy (Automatic Translation)
 field.device-brand=Zariadenie značky (Automatic Translation)
 field.device-model=Model zariadenia (Automatic Translation)
@@ -72,6 +74,7 @@ field.name-tree-path=Hierarchická cesta (Automatic Translation)
 field.organization-id=Organizácia (Automatic Translation)
 field.parent-organization-id=Materskej organizácie (Automatic Translation)
 field.referrer-url=Adresa URL odkazujúceho servera (Automatic Translation)
+field.region=Region (Automatic Copy)
 field.request-parameters=Požiadavky na parametre (Automatic Translation)
 field.role-ids=Úloha (Automatic Translation)
 field.screen-name=Názov obrazovky (Automatic Translation)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_sl.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_sl.properties
index 34ef289df29d51..0180d616542cb5 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_sl.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_sl.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Omogoči priporočilo o vsebini (Automatic Transla
 enable-content-recommendation-help=Omogočite to možnost, če želite vsebino filtrirati s pogoji zanimanja uporabnika. (Automatic Translation)
 equals=Je enako (Automatic Translation)
 estimated-time-to-declare-winner=Predviden čas za razglasitev zmagovalca (Automatic Translation)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Brskalnik (Automatic Translation)
 field.cookies=Piškotki (Automatic Translation)
+field.country=Country (Automatic Copy)
 field.date-modified=Datum spremembe (Automatic Translation)
 field.device-brand=Naprava blagovne znamke (Automatic Translation)
 field.device-model=Model naprave (Automatic Translation)
@@ -72,6 +74,7 @@ field.name-tree-path=Hierarhična pot (Automatic Translation)
 field.organization-id=Organizacija (Automatic Translation)
 field.parent-organization-id=Nadrejeni organizaciji. (Automatic Translation)
 field.referrer-url=Referrer URL (Automatic Translation)
+field.region=Region (Automatic Copy)
 field.request-parameters=Parametri zahteve (Automatic Translation)
 field.role-ids=Vlogo (Automatic Translation)
 field.screen-name=Prikazno ime (Automatic Translation)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_sr_RS.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_sr_RS.properties
index ea3adddb404417..94cced791a5aa3 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_sr_RS.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_sr_RS.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Enable Content Recommendation (Automatic Copy)
 enable-content-recommendation-help=Enable this option to filter the content with user's terms of interest. (Automatic Copy)
 equals=Equals (Automatic Copy)
 estimated-time-to-declare-winner=Estimated Time to Declare Winner (Automatic Copy)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Browser (Automatic Copy)
 field.cookies=Cookies (Automatic Copy)
+field.country=Country (Automatic Copy)
 field.date-modified=Date Modified (Automatic Copy)
 field.device-brand=Device Brand (Automatic Copy)
 field.device-model=Device Model (Automatic Copy)
@@ -72,6 +74,7 @@ field.name-tree-path=Hierarchy Path (Automatic Copy)
 field.organization-id=Organization (Automatic Copy)
 field.parent-organization-id=Parent Organization (Automatic Copy)
 field.referrer-url=Referrer URL (Automatic Copy)
+field.region=Region (Automatic Copy)
 field.request-parameters=Request Parameters (Automatic Copy)
 field.role-ids=Role (Automatic Copy)
 field.screen-name=Screen Name (Automatic Copy)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_sr_RS_latin.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_sr_RS_latin.properties
index ea3adddb404417..94cced791a5aa3 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_sr_RS_latin.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_sr_RS_latin.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Enable Content Recommendation (Automatic Copy)
 enable-content-recommendation-help=Enable this option to filter the content with user's terms of interest. (Automatic Copy)
 equals=Equals (Automatic Copy)
 estimated-time-to-declare-winner=Estimated Time to Declare Winner (Automatic Copy)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Browser (Automatic Copy)
 field.cookies=Cookies (Automatic Copy)
+field.country=Country (Automatic Copy)
 field.date-modified=Date Modified (Automatic Copy)
 field.device-brand=Device Brand (Automatic Copy)
 field.device-model=Device Model (Automatic Copy)
@@ -72,6 +74,7 @@ field.name-tree-path=Hierarchy Path (Automatic Copy)
 field.organization-id=Organization (Automatic Copy)
 field.parent-organization-id=Parent Organization (Automatic Copy)
 field.referrer-url=Referrer URL (Automatic Copy)
+field.region=Region (Automatic Copy)
 field.request-parameters=Request Parameters (Automatic Copy)
 field.role-ids=Role (Automatic Copy)
 field.screen-name=Screen Name (Automatic Copy)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_sv.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_sv.properties
index 66c902f07c8c55..4ec3900831f1c0 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_sv.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_sv.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Aktivera innehållsrekommendation
 enable-content-recommendation-help=Aktivera det här alternativet för att filtrera innehållet med användarens intressetermer.
 equals=Lika med
 estimated-time-to-declare-winner=Beräknad tid för att utse vinnare
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Webbläsare
 field.cookies=Cookies
+field.country=Country (Automatic Copy)
 field.date-modified=Senast ändrad
 field.device-brand=Enhetens märke
 field.device-model=Enhetsmodell
@@ -72,6 +74,7 @@ field.name-tree-path=Namnge sökväg för träd
 field.organization-id=Organisation
 field.parent-organization-id=Övergripande organisation
 field.referrer-url=Referent-URL
+field.region=Region (Automatic Copy)
 field.request-parameters=Begär parametrar
 field.role-ids=Roll
 field.screen-name=Användarnamn
@@ -158,4 +161,4 @@ x-member={0} medlem
 x-members={0} medlemmar
 x-properties={0} egenskaper
 x-with-property-x={0} med egenskapen {1}
-x-with-property-x-x-x={0} med egenskapen {1} {2} {3}
\ No newline at end of file
+x-with-property-x-x-x={0} med egenskapen {1} {2} {3}
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_ta_IN.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_ta_IN.properties
index 6c8d6ed6923bc5..332078936d1be0 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_ta_IN.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_ta_IN.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Enable Content Recommendation (Automatic Copy)
 enable-content-recommendation-help=Enable this option to filter the content with user's terms of interest. (Automatic Copy)
 equals=சமம்
 estimated-time-to-declare-winner=Estimated Time to Declare Winner (Automatic Copy)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=ப்ரவுசர்
 field.cookies=Cookies
+field.country=Country (Automatic Copy)
 field.date-modified=மாற்றப்பட்ட தேதி
 field.device-brand=டிவைஸ் பிராண்டு
 field.device-model=டிவைஸ் மாடல்
@@ -72,6 +74,7 @@ field.name-tree-path=Hierarchy Path
 field.organization-id=நிறுவனம்
 field.parent-organization-id=மூல நிறுவனம்
 field.referrer-url=Referrer URL
+field.region=Region (Automatic Copy)
 field.request-parameters=Request Parameters (Automatic Copy)
 field.role-ids=பங்கு
 field.screen-name=Screen Name
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_th.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_th.properties
index 85793b756db668..70e7cd9cebc90c 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_th.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_th.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=เปิดใช้งานการแนะ
 enable-content-recommendation-help=เปิดใช้งานตัวเลือกนี้เพื่อกรองเนื้อหาด้วยเงื่อนไขที่น่าสนใจของผู้ใช้ (Automatic Translation)
 equals=เท่ากับ (Automatic Translation)
 estimated-time-to-declare-winner=เวลาโดยประมาณที่จะประกาศผู้ชนะ (Automatic Translation)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=เบราว์เซอร์ (Automatic Translation)
 field.cookies=คุกกี้ (Automatic Translation)
+field.country=Country (Automatic Copy)
 field.date-modified=วันที่แก้ไข (Automatic Translation)
 field.device-brand=แบรนด์อุปกรณ์ (Automatic Translation)
 field.device-model=รุ่นของอุปกรณ์ (Automatic Translation)
@@ -72,6 +74,7 @@ field.name-tree-path=เส้นทางของลำดับชั้น (
 field.organization-id=องค์กร (Automatic Translation)
 field.parent-organization-id=องค์กรหลัก (Automatic Translation)
 field.referrer-url=ทำการอ้างอิง URL (Automatic Translation)
+field.region=Region (Automatic Copy)
 field.request-parameters=พารามิเตอร์คำขอ (Automatic Translation)
 field.role-ids=บทบาท (Automatic Translation)
 field.screen-name=ชื่อหน้าจอ (Automatic Translation)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_tr.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_tr.properties
index 2ebf0d898468b0..c491db917195b7 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_tr.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_tr.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Içerik önerisini etkinleştir (Automatic Transla
 enable-content-recommendation-help=İçeriği kullanıcının ilgi koşulları ile filtrelemek için bu seçeneği etkinleştirin. (Automatic Translation)
 equals=Eşittir (Automatic Translation)
 estimated-time-to-declare-winner=Kazananı Beyan Etmek Için Tahmini Süre (Automatic Translation)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Tarayıcı (Automatic Translation)
 field.cookies=Tanımlama bilgileri (Automatic Translation)
+field.country=Country (Automatic Copy)
 field.date-modified=Değiştirilme tarihi (Automatic Translation)
 field.device-brand=Cihaz marka (Automatic Translation)
 field.device-model=Cihaz modeli (Automatic Translation)
@@ -72,6 +74,7 @@ field.name-tree-path=Hiyerarşi yolu (Automatic Translation)
 field.organization-id=Organizasyon (Automatic Translation)
 field.parent-organization-id=Üst kuruluş (Automatic Translation)
 field.referrer-url=Yönlendirme URL (Automatic Translation)
+field.region=Region (Automatic Copy)
 field.request-parameters=İstek Parametreleri (Automatic Translation)
 field.role-ids=Rolü (Automatic Translation)
 field.screen-name=Ekran adı (Automatic Translation)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_uk.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_uk.properties
index b9cccd608abeab..8761cb98c6ffbb 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_uk.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_uk.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Увімкнути рекомендації щод
 enable-content-recommendation-help=Увімкніть цей параметр, щоб Фільтрувати вміст за допомогою умов, що становлять користувач. (Automatic Translation)
 equals=Дорівнює (Automatic Translation)
 estimated-time-to-declare-winner=Розрахунковий час оголосити переможця (Automatic Translation)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Браузер (Automatic Translation)
 field.cookies=Печиво (Automatic Translation)
+field.country=Country (Automatic Copy)
 field.date-modified=Дата змінення (Automatic Translation)
 field.device-brand=Пристрій бренду (Automatic Translation)
 field.device-model=Модель пристрою (Automatic Translation)
@@ -72,6 +74,7 @@ field.name-tree-path=Повний шлях (Automatic Translation)
 field.organization-id=Організація (Automatic Translation)
 field.parent-organization-id=Організацію батьків (Automatic Translation)
 field.referrer-url=Реферер URL (Automatic Translation)
+field.region=Region (Automatic Copy)
 field.request-parameters=Параметри запиту (Automatic Translation)
 field.role-ids=Роль (Automatic Translation)
 field.screen-name=Псевдонім (Automatic Translation)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_vi.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_vi.properties
index 926a87a619334b..7c43d2064a964e 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_vi.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_vi.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=Bật khuyến nghị nội dung (Automatic Transl
 enable-content-recommendation-help=Bật tùy chọn này để lọc nội dung bằng các điều khoản quan tâm của người dùng. (Automatic Translation)
 equals=Tương đương (Automatic Translation)
 estimated-time-to-declare-winner=Thời gian ước tính tuyên bố người chiến thắng (Automatic Translation)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=Trình duyệt (Automatic Translation)
 field.cookies=Cookie (Automatic Translation)
+field.country=Country (Automatic Copy)
 field.date-modified=Ngày sửa đổi (Automatic Translation)
 field.device-brand=Thương hiệu thiết bị (Automatic Translation)
 field.device-model=Mô hình thiết bị (Automatic Translation)
@@ -72,6 +74,7 @@ field.name-tree-path=Hệ thống phân cấp đường (Automatic Translation)
 field.organization-id=Tổ chức (Automatic Translation)
 field.parent-organization-id=Tổ chức phụ huynh (Automatic Translation)
 field.referrer-url=URL tham chiếu (Automatic Translation)
+field.region=Region (Automatic Copy)
 field.request-parameters=Yêu cầu tham số (Automatic Translation)
 field.role-ids=Vai trò (Automatic Translation)
 field.screen-name=Tên màn hình (Automatic Translation)
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_zh_CN.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_zh_CN.properties
index f6ba0811d5d690..628b58f28bb22c 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_zh_CN.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_zh_CN.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=启用内容推荐
 enable-content-recommendation-help=启用此选项可以使用用户感兴趣的词筛选内容。
 equals=等于
 estimated-time-to-declare-winner=声明获胜者的估计时间
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=浏览器
 field.cookies=Cookie
+field.country=Country (Automatic Copy)
 field.date-modified=修改日期
 field.device-brand=设备品牌
 field.device-model=设备型号
@@ -72,6 +74,7 @@ field.name-tree-path=名称树路径
 field.organization-id=组织
 field.parent-organization-id=上级组织
 field.referrer-url=来源页面 URL
+field.region=Region (Automatic Copy)
 field.request-parameters=请求参数 (Automatic Translation)
 field.role-ids=角色
 field.screen-name=屏幕显示名称
diff --git a/modules/apps/segments/segments-lang/src/main/resources/content/Language_zh_TW.properties b/modules/apps/segments/segments-lang/src/main/resources/content/Language_zh_TW.properties
index 7c9fa3f1e052bd..002c7f709d73a2 100644
--- a/modules/apps/segments/segments-lang/src/main/resources/content/Language_zh_TW.properties
+++ b/modules/apps/segments/segments-lang/src/main/resources/content/Language_zh_TW.properties
@@ -51,8 +51,10 @@ enable-content-recommendation=啟用內容建議 (Automatic Translation)
 enable-content-recommendation-help=啟用此選項可按使用者感興趣的條款篩選內容。 (Automatic Translation)
 equals=等於 (Automatic Translation)
 estimated-time-to-declare-winner=宣佈獲勝者的估計時間 (Automatic Translation)
+field.asset-tag-ids=Tag (Automatic Copy)
 field.browser=瀏覽器 (Automatic Translation)
 field.cookies=餅乾 (Automatic Translation)
+field.country=Country (Automatic Copy)
 field.date-modified=修改日期 (Automatic Translation)
 field.device-brand=設備品牌 (Automatic Translation)
 field.device-model=設備型號 (Automatic Translation)
@@ -72,6 +74,7 @@ field.name-tree-path=層次結構路徑 (Automatic Translation)
 field.organization-id=組織 (Automatic Translation)
 field.parent-organization-id=家長組織 (Automatic Translation)
 field.referrer-url=推薦人網址 (Automatic Translation)
+field.region=Region (Automatic Copy)
 field.request-parameters=請求參數 (Automatic Translation)
 field.role-ids=作用 (Automatic Translation)
 field.screen-name=螢幕名稱 (Automatic Translation)
diff --git a/modules/apps/segments/segments-service/build.gradle b/modules/apps/segments/segments-service/build.gradle
index 0d2eff36c74399..be09de12651a6d 100644
--- a/modules/apps/segments/segments-service/build.gradle
+++ b/modules/apps/segments/segments-service/build.gradle
@@ -26,6 +26,7 @@ dependencies {
 	compileOnly project(":apps:portal:portal-upgrade-api")
 	compileOnly project(":apps:segments:segments-api")
 	compileOnly project(":apps:staging:staging-api")
+	compileOnly project(":apps:static:osgi:osgi-util")
 	compileOnly project(":apps:static:portal-configuration:portal-configuration-metatype-api")
 	compileOnly project(":apps:xstream:xstream-configurator-api")
 	compileOnly project(":core:osgi-service-tracker-collections")
diff --git a/modules/apps/segments/segments-service/src/main/java/com/liferay/segments/internal/field/customizer/SegmentsFieldCustomizerRegistryImpl.java b/modules/apps/segments/segments-service/src/main/java/com/liferay/segments/internal/field/customizer/SegmentsFieldCustomizerRegistryImpl.java
index 2d80b20930a2e0..5fb198cbdbc790 100644
--- a/modules/apps/segments/segments-service/src/main/java/com/liferay/segments/internal/field/customizer/SegmentsFieldCustomizerRegistryImpl.java
+++ b/modules/apps/segments/segments-service/src/main/java/com/liferay/segments/internal/field/customizer/SegmentsFieldCustomizerRegistryImpl.java
@@ -18,6 +18,7 @@
 import com.liferay.osgi.service.tracker.collections.map.ServiceReferenceMapper;
 import com.liferay.osgi.service.tracker.collections.map.ServiceTrackerMap;
 import com.liferay.osgi.service.tracker.collections.map.ServiceTrackerMapFactory;
+import com.liferay.osgi.util.StringPlus;
 import com.liferay.portal.kernel.util.Validator;
 import com.liferay.segments.field.customizer.SegmentsFieldCustomizer;
 import com.liferay.segments.field.customizer.SegmentsFieldCustomizerRegistry;
@@ -104,10 +105,13 @@ public void map(
 			ServiceReference<SegmentsFieldCustomizer> serviceReference,
 			Emitter<String> emitter) {
 
-			String entityName = (String)serviceReference.getProperty(
-				"segments.field.customizer.entity.name");
+			List<String> entityNames = StringPlus.asList(
+				serviceReference.getProperty(
+					"segments.field.customizer.entity.name"));
 
-			emitter.emit(entityName);
+			for (String entityName : entityNames) {
+				emitter.emit(entityName);
+			}
 		}
 
 	}
diff --git a/modules/apps/segments/segments-service/src/main/java/com/liferay/segments/internal/odata/entity/OrganizationEntityModel.java b/modules/apps/segments/segments-service/src/main/java/com/liferay/segments/internal/odata/entity/OrganizationEntityModel.java
index 74e1dace8b25bd..bdb4d69415bfa5 100644
--- a/modules/apps/segments/segments-service/src/main/java/com/liferay/segments/internal/odata/entity/OrganizationEntityModel.java
+++ b/modules/apps/segments/segments-service/src/main/java/com/liferay/segments/internal/odata/entity/OrganizationEntityModel.java
@@ -41,6 +41,8 @@ public OrganizationEntityModel(List<EntityField> customEntityFields) {
 				"dateModified",
 				locale -> Field.getSortableFieldName(Field.MODIFIED_DATE),
 				locale -> Field.MODIFIED_DATE),
+			new IdEntityField(
+				"assetTagIds", locale -> Field.ASSET_TAG_IDS, String::valueOf),
 			new IdEntityField(
 				"classPK", locale -> Field.ORGANIZATION_ID, String::valueOf),
 			new IdEntityField(
@@ -51,6 +53,8 @@ public OrganizationEntityModel(List<EntityField> customEntityFields) {
 			new IdEntityField(
 				"parentOrganizationId", locale -> "parentOrganizationId",
 				String::valueOf),
+			new StringEntityField("country", locale -> "country"),
+			new StringEntityField("region", locale -> "region"),
 			new StringEntityField(
 				"name", locale -> Field.getSortableFieldName(Field.NAME)),
 			new StringEntityField(
diff --git a/modules/apps/segments/segments-service/src/main/java/com/liferay/segments/internal/odata/entity/UserEntityModel.java b/modules/apps/segments/segments-service/src/main/java/com/liferay/segments/internal/odata/entity/UserEntityModel.java
index 97c9a7300e8449..affa903b205ae4 100644
--- a/modules/apps/segments/segments-service/src/main/java/com/liferay/segments/internal/odata/entity/UserEntityModel.java
+++ b/modules/apps/segments/segments-service/src/main/java/com/liferay/segments/internal/odata/entity/UserEntityModel.java
@@ -44,6 +44,8 @@ public UserEntityModel(List<EntityField> customEntityFields) {
 			new IdEntityField(
 				"ancestorOrganizationIds", locale -> "ancestorOrganizationIds",
 				String::valueOf),
+			new IdEntityField(
+				"assetTagIds", locale -> Field.ASSET_TAG_IDS, String::valueOf),
 			new IdEntityField(
 				"classPK", locale -> Field.USER_ID, String::valueOf),
 			new IdEntityField(
diff --git a/modules/apps/segments/segments-web/build.gradle b/modules/apps/segments/segments-web/build.gradle
index a686a4d8e974c2..d2c5853506773e 100644
--- a/modules/apps/segments/segments-web/build.gradle
+++ b/modules/apps/segments/segments-web/build.gradle
@@ -17,5 +17,6 @@ dependencies {
 	compileOnly project(":core:osgi-service-tracker-collections")
 	compileOnly project(":core:petra:petra-function")
 	compileOnly project(":core:petra:petra-lang")
+	compileOnly project(":core:petra:petra-reflect")
 	compileOnly project(":core:petra:petra-string")
 }
\ No newline at end of file
diff --git a/modules/apps/segments/segments-web/src/main/java/com/liferay/segments/web/internal/field/customizer/AssetTagSegmentsFieldCustomizer.java b/modules/apps/segments/segments-web/src/main/java/com/liferay/segments/web/internal/field/customizer/AssetTagSegmentsFieldCustomizer.java
new file mode 100644
index 00000000000000..b0348df7afc19c
--- /dev/null
+++ b/modules/apps/segments/segments-web/src/main/java/com/liferay/segments/web/internal/field/customizer/AssetTagSegmentsFieldCustomizer.java
@@ -0,0 +1,153 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.segments.web.internal.field.customizer;
+
+import com.liferay.asset.kernel.model.AssetTag;
+import com.liferay.asset.kernel.service.AssetTagLocalService;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.model.ClassedModel;
+import com.liferay.portal.kernel.model.Group;
+import com.liferay.portal.kernel.portlet.LiferayWindowState;
+import com.liferay.portal.kernel.portlet.PortletProvider;
+import com.liferay.portal.kernel.portlet.PortletProviderUtil;
+import com.liferay.portal.kernel.security.auth.CompanyThreadLocal;
+import com.liferay.portal.kernel.service.GroupLocalService;
+import com.liferay.portal.kernel.util.GetterUtil;
+import com.liferay.portal.kernel.util.ListUtil;
+import com.liferay.portal.kernel.util.Portal;
+import com.liferay.segments.field.Field;
+import com.liferay.segments.field.customizer.SegmentsFieldCustomizer;
+
+import java.util.List;
+import java.util.Locale;
+
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletURL;
+
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+
+/**
+ * @author Raymond Augé
+ */
+@Component(
+	immediate = true,
+	property = {
+		"segments.field.customizer.entity.name=Organization",
+		"segments.field.customizer.entity.name=User",
+		"segments.field.customizer.key=" + AssetTagSegmentsFieldCustomizer.KEY,
+		"segments.field.customizer.priority:Integer=50"
+	},
+	service = SegmentsFieldCustomizer.class
+)
+public class AssetTagSegmentsFieldCustomizer
+	extends BaseSegmentsFieldCustomizer {
+
+	public static final String KEY = "tag";
+
+	@Override
+	public ClassedModel getClassedModel(String fieldValue) {
+		return _getAssetTag(fieldValue);
+	}
+
+	@Override
+	public String getClassName() {
+		return AssetTag.class.getName();
+	}
+
+	@Override
+	public List<String> getFieldNames() {
+		return _fieldNames;
+	}
+
+	@Override
+	public String getFieldValueName(String fieldValue, Locale locale) {
+		AssetTag assetTag = _getAssetTag(fieldValue);
+
+		if (assetTag == null) {
+			return fieldValue;
+		}
+
+		return assetTag.getName();
+	}
+
+	@Override
+	public String getKey() {
+		return KEY;
+	}
+
+	@Override
+	public Field.SelectEntity getSelectEntity(PortletRequest portletRequest) {
+		try {
+			PortletURL portletURL = PortletProviderUtil.getPortletURL(
+				portletRequest, AssetTag.class.getName(),
+				PortletProvider.Action.BROWSE);
+
+			if (portletURL == null) {
+				return null;
+			}
+
+			Group companyGroup = _groupLocalService.getCompanyGroup(
+				CompanyThreadLocal.getCompanyId());
+
+			portletURL.setParameter("eventName", "selectEntity");
+			portletURL.setParameter(
+				"groupIds", String.valueOf(companyGroup.getGroupId()));
+			portletURL.setParameter("mvcPath", "/select_single.jsp");
+			portletURL.setWindowState(LiferayWindowState.POP_UP);
+
+			return new Field.SelectEntity(
+				"selectEntity",
+				getSelectEntityTitle(
+					_portal.getLocale(portletRequest),
+					AssetTag.class.getName()),
+				portletURL.toString(), false);
+		}
+		catch (Exception e) {
+			if (_log.isWarnEnabled()) {
+				_log.warn("Unable to get select entity", e);
+			}
+
+			return null;
+		}
+	}
+
+	private AssetTag _getAssetTag(String fieldValue) {
+		long assetTagId = GetterUtil.getLong(fieldValue);
+
+		if (assetTagId == 0) {
+			return null;
+		}
+
+		return _assetTagLocalService.fetchAssetTag(assetTagId);
+	}
+
+	private static final Log _log = LogFactoryUtil.getLog(
+		AssetTagSegmentsFieldCustomizer.class);
+
+	private static final List<String> _fieldNames = ListUtil.fromArray(
+		new String[] {"assetTagIds"});
+
+	@Reference
+	private AssetTagLocalService _assetTagLocalService;
+
+	@Reference
+	private GroupLocalService _groupLocalService;
+
+	@Reference
+	private Portal _portal;
+
+}
\ No newline at end of file
diff --git a/modules/apps/segments/segments-web/src/main/java/com/liferay/segments/web/internal/field/customizer/CountrySegmentsFieldCustomizer.java b/modules/apps/segments/segments-web/src/main/java/com/liferay/segments/web/internal/field/customizer/CountrySegmentsFieldCustomizer.java
new file mode 100644
index 00000000000000..366d609a7f1d48
--- /dev/null
+++ b/modules/apps/segments/segments-web/src/main/java/com/liferay/segments/web/internal/field/customizer/CountrySegmentsFieldCustomizer.java
@@ -0,0 +1,78 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.segments.web.internal.field.customizer;
+
+import com.liferay.portal.kernel.model.Country;
+import com.liferay.portal.kernel.service.CountryService;
+import com.liferay.portal.kernel.util.ListUtil;
+import com.liferay.segments.field.Field;
+import com.liferay.segments.field.customizer.SegmentsFieldCustomizer;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+
+/**
+ * @author Raymond Augé
+ */
+@Component(
+	immediate = true,
+	property = {
+		"segments.field.customizer.entity.name=Organization",
+		"segments.field.customizer.key=" + CountrySegmentsFieldCustomizer.KEY,
+		"segments.field.customizer.priority:Integer=50"
+	},
+	service = SegmentsFieldCustomizer.class
+)
+public class CountrySegmentsFieldCustomizer
+	extends BaseSegmentsFieldCustomizer {
+
+	public static final String KEY = "country";
+
+	@Override
+	public List<String> getFieldNames() {
+		return _fieldNames;
+	}
+
+	@Override
+	public String getKey() {
+		return KEY;
+	}
+
+	@Override
+	public List<Field.Option> getOptions(Locale locale) {
+		List<Country> countries = _countryService.getCountries();
+
+		Stream<Country> stream = countries.stream();
+
+		return stream.map(
+			country -> new Field.Option(
+				country.getName(locale), String.valueOf(country.getName()))
+		).collect(
+			Collectors.toList()
+		);
+	}
+
+	private static final List<String> _fieldNames = ListUtil.fromArray(
+		new String[] {"country"});
+
+	@Reference
+	private CountryService _countryService;
+
+}
\ No newline at end of file
diff --git a/modules/apps/segments/segments-web/src/main/java/com/liferay/segments/web/internal/field/customizer/FreeformTextSegmentsFieldCustomizer.java b/modules/apps/segments/segments-web/src/main/java/com/liferay/segments/web/internal/field/customizer/FreeformTextSegmentsFieldCustomizer.java
new file mode 100644
index 00000000000000..d9f7d33aab6f51
--- /dev/null
+++ b/modules/apps/segments/segments-web/src/main/java/com/liferay/segments/web/internal/field/customizer/FreeformTextSegmentsFieldCustomizer.java
@@ -0,0 +1,130 @@
+package com.liferay.segments.web.internal.field.customizer;
+
+import com.liferay.asset.kernel.model.AssetVocabulary;
+import com.liferay.asset.kernel.service.AssetCategoryLocalService;
+import com.liferay.asset.kernel.service.AssetVocabularyLocalService;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.model.ClassedModel;
+import com.liferay.portal.kernel.portlet.LiferayWindowState;
+import com.liferay.portal.kernel.portlet.PortletProvider;
+import com.liferay.portal.kernel.portlet.PortletProviderUtil;
+import com.liferay.portal.kernel.util.GetterUtil;
+import com.liferay.portal.kernel.util.Portal;
+import com.liferay.segments.context.Context;
+import com.liferay.segments.field.Field;
+import com.liferay.segments.field.customizer.SegmentsFieldCustomizer;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletURL;
+
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+
+@Component(
+	immediate = true,
+	property = {
+		"segments.field.customizer.entity.name=User",
+		"segments.field.customizer.entity.name=Organization",
+		"segments.field.customizer.entity.name=Context",
+		"segments.field.customizer.key=" + FreeformTextSegmentsFieldCustomizer.KEY,
+		"segments.field.customizer.priority:Integer=50"
+	},
+	service = SegmentsFieldCustomizer.class
+)
+public class FreeformTextSegmentsFieldCustomizer
+	extends BaseSegmentsFieldCustomizer {
+
+	public static final String KEY = "freeform";
+
+	@Override
+	public ClassedModel getClassedModel(String fieldValue) {
+		return _getAssetVocabulary(fieldValue);
+	}
+
+	@Override
+	public String getClassName() {
+		return AssetVocabulary.class.getName();
+	}
+
+	@Override
+	public List<String> getFieldNames() {
+		return _fieldNames;
+	}
+
+	@Override
+	public String getFieldValueName(String fieldValue, Locale locale) {
+		AssetVocabulary assetVocabulary = _getAssetVocabulary(fieldValue);
+
+		if (assetVocabulary == null) {
+			return fieldValue;
+		}
+
+		return assetVocabulary.getName();
+	}
+
+	@Override
+	public String getKey() {
+		return KEY;
+	}
+
+	@Override
+	public Field.SelectEntity getSelectEntity(PortletRequest portletRequest) {
+		try {
+			PortletURL portletURL = PortletProviderUtil.getPortletURL(
+				portletRequest, AssetVocabulary.class.getName(),
+				PortletProvider.Action.BROWSE);
+
+			portletURL.setParameter("eventName", "selectEntity");
+			portletURL.setWindowState(LiferayWindowState.POP_UP);
+
+			return new Field.SelectEntity(
+				"selectEntity",
+				getSelectEntityTitle(
+					_portal.getLocale(portletRequest),
+					AssetVocabulary.class.getName()),
+				portletURL.toString(), true);
+		}
+		catch (Exception e) {
+			if (_log.isWarnEnabled()) {
+				_log.warn("Unable to get select entity", e);
+			}
+
+			return null;
+		}
+	}
+
+	private AssetVocabulary _getAssetVocabulary(String fieldValue) {
+		long _vocabularyId = GetterUtil.getLong(fieldValue);
+
+		if (_vocabularyId == 0) {
+			return null;
+		}
+
+		return _assetVocabularyLocalService.fetchAssetVocabulary(_vocabularyId);
+	}
+
+	private static final Log _log = LogFactoryUtil.getLog(
+		FreeformTextSegmentsFieldCustomizer.class);
+
+	private static final List<String> _fieldNames = Arrays.asList(
+		"emailAddress", "firstName", "jobTitle", "lastName", "screenName",
+		"userName", "country", "region", "name", "nameTreePath", "type",
+		Context.BROWSER, Context.DEVICE_BRAND, Context.DEVICE_MODEL,
+		Context.HOSTNAME, Context.REFERRER_URL, Context.URL, Context.USER_AGENT,
+		Context.COOKIES, Context.REQUEST_PARAMETERS);
+
+	@Reference
+	private AssetCategoryLocalService _assetCategoryLocalService;
+
+	@Reference
+	private AssetVocabularyLocalService _assetVocabularyLocalService;
+
+	@Reference
+	private Portal _portal;
+
+}
\ No newline at end of file
diff --git a/modules/apps/segments/segments-web/src/main/java/com/liferay/segments/web/internal/field/customizer/RegionSegmentsFieldCustomizer.java b/modules/apps/segments/segments-web/src/main/java/com/liferay/segments/web/internal/field/customizer/RegionSegmentsFieldCustomizer.java
new file mode 100644
index 00000000000000..81e9269fd0c84d
--- /dev/null
+++ b/modules/apps/segments/segments-web/src/main/java/com/liferay/segments/web/internal/field/customizer/RegionSegmentsFieldCustomizer.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.segments.web.internal.field.customizer;
+
+import com.liferay.petra.reflect.ReflectionUtil;
+import com.liferay.petra.string.StringBundler;
+import com.liferay.portal.kernel.model.Country;
+import com.liferay.portal.kernel.model.Region;
+import com.liferay.portal.kernel.service.CountryService;
+import com.liferay.portal.kernel.service.RegionService;
+import com.liferay.portal.kernel.util.ListUtil;
+import com.liferay.segments.field.Field;
+import com.liferay.segments.field.customizer.SegmentsFieldCustomizer;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+
+/**
+ * @author Raymond Augé
+ */
+@Component(
+	immediate = true,
+	property = {
+		"segments.field.customizer.entity.name=Organization",
+		"segments.field.customizer.key=" + RegionSegmentsFieldCustomizer.KEY,
+		"segments.field.customizer.priority:Integer=50"
+	},
+	service = SegmentsFieldCustomizer.class
+)
+public class RegionSegmentsFieldCustomizer extends BaseSegmentsFieldCustomizer {
+
+	public static final String KEY = "region";
+
+	@Override
+	public List<String> getFieldNames() {
+		return _fieldNames;
+	}
+
+	@Override
+	public String getKey() {
+		return KEY;
+	}
+
+	@Override
+	public List<Field.Option> getOptions(Locale locale) {
+		List<Region> regions = _regionService.getRegions();
+
+		Stream<Region> stream = regions.stream();
+
+		return stream.map(
+			region -> new Field.Option(
+				_getRegionLabel(region, locale), region.getName())
+		).sorted(
+			(a, b) -> a.getLabel(
+			).compareTo(
+				b.getLabel()
+			)
+		).collect(
+			Collectors.toList()
+		);
+	}
+
+	private String _getRegionLabel(Region region, Locale locale) {
+		try {
+			Country country = _countryService.getCountry(region.getCountryId());
+
+			return StringBundler.concat(
+				country.getName(locale), " - ", region.getName());
+		}
+		catch (Exception e) {
+			return ReflectionUtil.throwException(e);
+		}
+	}
+
+	private static final List<String> _fieldNames = ListUtil.fromArray(
+		new String[] {"region"});
+
+	@Reference
+	private CountryService _countryService;
+
+	@Reference
+	private RegionService _regionService;
+
+}
\ No newline at end of file
diff --git a/modules/apps/segments/segments-web/src/main/resources/META-INF/resources/js/components/inputs/CollectionInput.es.js b/modules/apps/segments/segments-web/src/main/resources/META-INF/resources/js/components/inputs/CollectionInput.es.js
index b5c19a8dfe3cdc..d2f39328dd7fa7 100644
--- a/modules/apps/segments/segments-web/src/main/resources/META-INF/resources/js/components/inputs/CollectionInput.es.js
+++ b/modules/apps/segments/segments-web/src/main/resources/META-INF/resources/js/components/inputs/CollectionInput.es.js
@@ -26,6 +26,12 @@ class CollectionInput extends React.Component {
 	static propTypes = {
 		disabled: propTypes.bool,
 		onChange: propTypes.func.isRequired,
+		selectEntity: propTypes.shape({
+			id: propTypes.string,
+			multiple: propTypes.bool,
+			title: propTypes.string,
+			uri: propTypes.string
+		}),
 		value: propTypes.string
 	};
 
@@ -75,22 +81,97 @@ class CollectionInput extends React.Component {
 		};
 	};
 
+	/**
+	 * Opens a modal for selecting entities. Uses different methods for
+	 * selecting multiple entities versus single because of the way the event
+	 * and data is submitted.
+	 */
+	_handleSelectEntity = () => {
+		const {
+			onChange,
+			selectEntity: {id, multiple, title, uri}
+		} = this.props;
+
+		if (multiple) {
+			AUI().use('liferay-item-selector-dialog', A => {
+				const itemSelectorDialog = new A.LiferayItemSelectorDialog({
+					eventName: id,
+					on: {
+						selectedItemChange: event => {
+							const newVal = event.newVal;
+
+							if (newVal) {
+								const selectedValues = event.newVal.map(
+									item => ({
+										displayValue: item.name,
+										value: item.id
+									})
+								);
+
+								onChange(selectedValues);
+							}
+						}
+					},
+					strings: {
+						add: Liferay.Language.get('select'),
+						cancel: Liferay.Language.get('cancel')
+					},
+					title,
+					url: uri
+				});
+
+				itemSelectorDialog.open();
+			});
+		} else {
+			Liferay.Util.selectEntity(
+				{
+					dialog: {
+						constrain: true,
+						destroyOnHide: true,
+						modal: true
+					},
+					id,
+					title,
+					uri
+				},
+				event => {
+					onChange({
+						displayValue: event.entityname,
+						value: event.entityid
+					});
+				}
+			);
+		}
+	};
+
 	render() {
 		const {disabled} = this.props;
 		const {key, value} = this._stringToKeyValueObject(this.props.value);
 
 		return (
 			<>
-				<input
-					className="criterion-input form-control"
-					data-testid="collection-key-input"
-					disabled={disabled}
-					onChange={this._handleKeyChange}
-					onKeyDown={this._handleKeyDown}
-					placeholder={Liferay.Language.get('key')}
-					type="text"
-					value={key}
-				/>
+				<div className="criterion-input input-group">
+					<input
+						className="form-control"
+						data-testid="collection-key-input"
+						disabled={disabled}
+						onChange={this._handleKeyChange}
+						onKeyDown={this._handleKeyDown}
+						placeholder={Liferay.Language.get('key')}
+						type="text"
+						value={key}
+					/>
+					<div className="input-group-append">
+						<button
+							className="btn btn-secondary"
+							id="button-addon1"
+							onClick={this._handleSelectEntity}
+							type="button"
+						>
+							{Liferay.Language.get('select')}
+						</button>
+					</div>
+				</div>
 
 				<input
 					className="criterion-input form-control"
diff --git a/modules/apps/segments/segments-web/src/main/resources/META-INF/resources/js/components/inputs/StringInput.es.js b/modules/apps/segments/segments-web/src/main/resources/META-INF/resources/js/components/inputs/StringInput.es.js
index 1e42a0c4ef40bc..17fd7cd3d81f08 100644
--- a/modules/apps/segments/segments-web/src/main/resources/META-INF/resources/js/components/inputs/StringInput.es.js
+++ b/modules/apps/segments/segments-web/src/main/resources/META-INF/resources/js/components/inputs/StringInput.es.js
@@ -21,6 +21,12 @@ class StringInput extends React.Component {
 		disabled: propTypes.bool,
 		onChange: propTypes.func.isRequired,
 		options: propTypes.array,
+		selectEntity: propTypes.shape({
+			id: propTypes.string,
+			multiple: propTypes.bool,
+			title: propTypes.string,
+			uri: propTypes.string
+		}),
 		value: propTypes.oneOfType([propTypes.string, propTypes.number])
 	};
 
@@ -32,18 +38,94 @@ class StringInput extends React.Component {
 		this.props.onChange({value: event.target.value});
 	};
 
+	/**
+	 * Opens a modal for selecting entities. Uses different methods for
+	 * selecting multiple entities versus single because of the way the event
+	 * and data is submitted.
+	 */
+	_handleSelectEntity = () => {
+		const {
+			onChange,
+			selectEntity: {id, multiple, title, uri}
+		} = this.props;
+
+		if (multiple) {
+			AUI().use('liferay-item-selector-dialog', A => {
+				const itemSelectorDialog = new A.LiferayItemSelectorDialog({
+					eventName: id,
+					on: {
+						selectedItemChange: event => {
+							const newVal = event.newVal;
+
+							if (newVal) {
+								const selectedValues = event.newVal.map(
+									item => ({
+										displayValue: item.name,
+										value: item.id
+									})
+								);
+
+								onChange(selectedValues);
+							}
+						}
+					},
+					strings: {
+						add: Liferay.Language.get('select'),
+						cancel: Liferay.Language.get('cancel')
+					},
+					title,
+					url: uri
+				});
+
+				itemSelectorDialog.open();
+			});
+		} else {
+			Liferay.Util.selectEntity(
+				{
+					dialog: {
+						constrain: true,
+						destroyOnHide: true,
+						modal: true
+					},
+					id,
+					title,
+					uri
+				},
+				event => {
+					onChange({
+						displayValue: event.entityname,
+						value: event.entityid
+					});
+				}
+			);
+		}
+	};
+
 	render() {
 		const {disabled, options, value} = this.props;
 
 		return options.length === 0 ? (
-			<input
-				className="criterion-input form-control"
-				data-testid="simple-string"
-				disabled={disabled}
-				onChange={this._handleChange}
-				type="text"
-				value={value}
-			/>
+			<div className="criterion-input input-group">
+				<input
+					className="form-control"
+					data-testid="simple-string"
+					disabled={disabled}
+					onChange={this._handleChange}
+					placeholder={Liferay.Language.get('value')}
+					type="text"
+					value={value}
+				/>
+				<div className="input-group-append">
+					<button
+						className="btn btn-secondary"
+						id="button-addon1"
+						onClick={this._handleSelectEntity}
+						type="button"
+					>
+						{Liferay.Language.get('select')}
+					</button>
+				</div>
+			</div>
 		) : (
 			<ClaySelectWithOption
 				className="criterion-input form-control"
diff --git a/modules/apps/site/site-admin-web/src/main/java/com/liferay/site/admin/web/internal/portlet/SiteAdminPortlet.java b/modules/apps/site/site-admin-web/src/main/java/com/liferay/site/admin/web/internal/portlet/SiteAdminPortlet.java
index 97a7f62d3c13a0..a55e58be50df60 100644
--- a/modules/apps/site/site-admin-web/src/main/java/com/liferay/site/admin/web/internal/portlet/SiteAdminPortlet.java
+++ b/modules/apps/site/site-admin-web/src/main/java/com/liferay/site/admin/web/internal/portlet/SiteAdminPortlet.java
@@ -22,6 +22,7 @@
 import com.liferay.portal.kernel.backgroundtask.BackgroundTaskConstants;
 import com.liferay.portal.kernel.backgroundtask.BackgroundTaskManager;
 import com.liferay.portal.kernel.dao.orm.QueryUtil;
+import com.liferay.portal.kernel.exception.AvailableLocaleException;
 import com.liferay.portal.kernel.exception.DuplicateGroupException;
 import com.liferay.portal.kernel.exception.GroupFriendlyURLException;
 import com.liferay.portal.kernel.exception.GroupInheritContentException;
@@ -112,6 +113,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.concurrent.Callable;
 
 import javax.portlet.ActionRequest;
@@ -615,6 +617,37 @@ protected void setUserService(UserService userService) {
 		this.userService = userService;
 	}
 
+	protected TreeMap<String, String> toTreeMap(
+			ActionRequest actionRequest, String parameterPrefix,
+			Set<Locale> availableLocales)
+		throws AvailableLocaleException {
+
+		TreeMap<String, String> treeMap = new TreeMap<>();
+
+		String[] virtualHostNames = ParamUtil.getStringValues(
+			actionRequest, parameterPrefix + "Name[]");
+		String[] virtualHostLocales = ParamUtil.getStringValues(
+			actionRequest, parameterPrefix + "Locale[]");
+
+		for (int i = 0; i < virtualHostNames.length; i++) {
+			String virtualHostName = virtualHostNames[i];
+
+			String virtualHostLocale = virtualHostLocales[i];
+
+			if (Validator.isNotNull(virtualHostLocale)) {
+				Locale locale = LocaleUtil.fromLanguageId(virtualHostLocale);
+
+				if (!availableLocales.contains(locale)) {
+					throw new AvailableLocaleException(virtualHostLocale);
+				}
+			}
+
+			treeMap.put(virtualHostName, virtualHostLocale);
+		}
+
+		return treeMap;
+	}
+
 	protected void updateActive(ActionRequest actionRequest, boolean active)
 		throws Exception {
 
@@ -918,21 +951,18 @@ protected Group updateGroup(ActionRequest actionRequest) throws Exception {
 
 		LayoutSet publicLayoutSet = liveGroup.getPublicLayoutSet();
 
-		String publicVirtualHost = ParamUtil.getString(
-			actionRequest, "publicVirtualHost",
-			publicLayoutSet.getVirtualHostname());
+		Set<Locale> availableLocales = LanguageUtil.getAvailableLocales(
+			liveGroup.getGroupId());
 
-		layoutSetService.updateVirtualHost(
-			liveGroup.getGroupId(), false, publicVirtualHost);
+		layoutSetService.updateVirtualHosts(
+			liveGroup.getGroupId(), false,
+			toTreeMap(actionRequest, "publicVirtualHost", availableLocales));
 
 		LayoutSet privateLayoutSet = liveGroup.getPrivateLayoutSet();
 
-		String privateVirtualHost = ParamUtil.getString(
-			actionRequest, "privateVirtualHost",
-			privateLayoutSet.getVirtualHostname());
-
-		layoutSetService.updateVirtualHost(
-			liveGroup.getGroupId(), true, privateVirtualHost);
+		layoutSetService.updateVirtualHosts(
+			liveGroup.getGroupId(), true,
+			toTreeMap(actionRequest, "privateVirtualHost", availableLocales));
 
 		// Staging
 
@@ -946,25 +976,17 @@ protected Group updateGroup(ActionRequest actionRequest) throws Exception {
 			groupService.updateFriendlyURL(
 				stagingGroup.getGroupId(), friendlyURL);
 
-			LayoutSet stagingPublicLayoutSet =
-				stagingGroup.getPublicLayoutSet();
-
-			publicVirtualHost = ParamUtil.getString(
-				actionRequest, "stagingPublicVirtualHost",
-				stagingPublicLayoutSet.getVirtualHostname());
-
-			layoutSetService.updateVirtualHost(
-				stagingGroup.getGroupId(), false, publicVirtualHost);
-
-			LayoutSet stagingPrivateLayoutSet =
-				stagingGroup.getPrivateLayoutSet();
-
-			privateVirtualHost = ParamUtil.getString(
-				actionRequest, "stagingPrivateVirtualHost",
-				stagingPrivateLayoutSet.getVirtualHostname());
-
-			layoutSetService.updateVirtualHost(
-				stagingGroup.getGroupId(), true, privateVirtualHost);
+			layoutSetService.updateVirtualHosts(
+				stagingGroup.getGroupId(), false,
+				toTreeMap(
+					actionRequest, "stagingPublicVirtualHost",
+					availableLocales));
+
+			layoutSetService.updateVirtualHosts(
+				stagingGroup.getGroupId(), true,
+				toTreeMap(
+					actionRequest, "stagingPrivateVirtualHost",
+					availableLocales));
 
 			UnicodeProperties stagedGroupTypeSettingsProperties =
 				stagingGroup.getTypeSettingsProperties();
diff --git a/modules/apps/site/site-admin-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/site/site-admin-web/src/main/resources/META-INF/resources/init.jsp
index bc73ed82008a65..db510693479a27 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/site/site-admin-web/src/main/resources/META-INF/resources/init.jsp
@@ -34,7 +34,6 @@ taglib uri="http://liferay.com/tld/util" prefix="liferay-util" %>
 page import="com.liferay.frontend.taglib.clay.servlet.taglib.util.NavigationItem" %><%@
 page import="com.liferay.map.constants.MapProviderWebKeys" %><%@
 page import="com.liferay.petra.string.StringPool" %><%@
-page import="com.liferay.portal.kernel.bean.BeanParamUtil" %><%@
 page import="com.liferay.portal.kernel.dao.search.SearchContainer" %><%@
 page import="com.liferay.portal.kernel.exception.DuplicateGroupException" %><%@
 page import="com.liferay.portal.kernel.exception.GroupFriendlyURLException" %><%@
@@ -128,7 +127,8 @@ page import="java.util.List" %><%@
 page import="java.util.Locale" %><%@
 page import="java.util.Map" %><%@
 page import="java.util.Objects" %><%@
-page import="java.util.Set" %>
+page import="java.util.Set" %><%@
+page import="java.util.TreeMap" %>
 
 <%@ page import="javax.portlet.PortletPreferences" %><%@
 page import="javax.portlet.PortletRequest" %><%@
diff --git a/modules/apps/site/site-admin-web/src/main/resources/META-INF/resources/site/site_url.jsp b/modules/apps/site/site-admin-web/src/main/resources/META-INF/resources/site/site_url.jsp
index e77f0d61b0be00..2656e6b0f137a7 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/META-INF/resources/site/site_url.jsp
+++ b/modules/apps/site/site-admin-web/src/main/resources/META-INF/resources/site/site_url.jsp
@@ -25,8 +25,26 @@ Long stagingGroupId = (Long)request.getAttribute("site.stagingGroupId");
 LayoutSet publicLayoutSet = LayoutSetLocalServiceUtil.getLayoutSet(liveGroupId, false);
 LayoutSet privateLayoutSet = LayoutSetLocalServiceUtil.getLayoutSet(liveGroupId, true);
 
-String publicVirtualHost = ParamUtil.getString(request, "publicVirtualHost", BeanParamUtil.getString(publicLayoutSet, request, "virtualHostname"));
-String privateVirtualHost = ParamUtil.getString(request, "privateVirtualHost", BeanParamUtil.getString(privateLayoutSet, request, "virtualHostname"));
+//// The list of locales available for the site
+
+Set<Locale> availableLocales = LanguageUtil.getAvailableLocales(liveGroupId);
+
+//// Conversions to/from Local/languageId
+
+// String languageId = LocaleUtil.toLanguageId(locale);
+// Locale locale = LocaleUtil.fromLanguageId(languageId);
+
+TreeMap<String, String> publicVirtualHosts = publicLayoutSet.getVirtualHostnames();
+
+if (publicVirtualHosts.size() == 0) {
+	publicVirtualHosts.put(StringPool.BLANK, StringPool.BLANK);
+}
+
+TreeMap<String, String> privateVirtualHosts = privateLayoutSet.getVirtualHostnames();
+
+if (privateVirtualHosts.size() == 0) {
+	privateVirtualHosts.put(StringPool.BLANK, StringPool.BLANK);
+}
 %>
 
 <liferay-ui:error-marker
@@ -127,42 +145,210 @@ String privateVirtualHost = ParamUtil.getString(request, "privateVirtualHost", B
 		<liferay-ui:message arguments="<%= new Object[] {HttpUtil.getProtocol(request), themeDisplay.getPortalURL() + themeDisplay.getPathFriendlyURLPublic()} %>" key="for-example,-if-the-public-virtual-host-is-www.helloworld.com-and-the-friendly-url-is-/helloworld" translateArguments="<%= false %>" />
 	</p>
 
-	<aui:input label="public-pages" maxlength="200" name="publicVirtualHost" placeholder="public-pages" type="text" value="<%= publicVirtualHost %>" />
+	<div id="<portlet:namespace />publicVirtualHostFields">
 
-	<aui:input label="private-pages" maxlength="200" name="privateVirtualHost" placeholder="private-pages" type="text" value="<%= privateVirtualHost %>">
-		<aui:validator errorMessage="please-enter-a-unique-virtual-host" name="custom">
-			function(val, fieldNode, ruleValue) {
-				return (val != A.one('#<portlet:namespace />publicVirtualHost').val());
-			}
-		</aui:validator>
-	</aui:input>
+		<%
+		for (Map.Entry<String, String> entry : publicVirtualHosts.entrySet()) {
+			String hostName = entry.getKey();
+
+			String hostLocale = Validator.isNotNull(entry.getValue()) ? entry.getValue() : StringPool.BLANK;
+		%>
+
+			<div class="container-fluid lfr-form-row">
+				<div class="row">
+					<aui:input inlineField="<%= true %>" label="public-pages" maxlength="200" name="publicVirtualHostName[]" placeholder="virtual-host" type="text" value="<%= hostName %>" wrapperCssClass="col-sm-6" />
+
+					<aui:select inlineField="<%= true %>" label="language" name="publicVirtualHostLocale[]" wrapperCssClass="col-sm-6">
+						<aui:option label="default-language" value="" />
+
+						<%
+						for (Locale localeEntry : availableLocales) {
+							String languageId = LocaleUtil.toLanguageId(localeEntry);
+						%>
+
+							<aui:option label="<%= localeEntry.getDisplayName(themeDisplay.getLocale()) %>" selected="<%= languageId.equals(hostLocale) %>" value="<%= languageId %>" />
+
+						<%
+						}
+						%>
+
+					</aui:select>
+				</div>
+			</div>
+
+		<%
+		}
+		%>
+
+	</div>
+
+	<div id="<portlet:namespace />privateVirtualHostFields">
+
+		<%
+		for (Map.Entry<String, String> entry : privateVirtualHosts.entrySet()) {
+			String hostName = entry.getKey();
+
+			String hostLocale = Validator.isNotNull(entry.getValue()) ? entry.getValue() : StringPool.BLANK;
+		%>
+
+			<div class="container-fluid lfr-form-row">
+				<div class="row">
+					<aui:input inlineField="<%= true %>" label="private-pages" maxlength="200" name="privateVirtualHostName[]" placeholder="virtual-host" type="text" value="<%= hostName %>" wrapperCssClass="col-sm-6" />
+
+					<aui:select inlineField="<%= true %>" label="language" name="privateVirtualHostLocale[]" wrapperCssClass="col-sm-6">
+						<aui:option label="default-language" value="" />
+
+						<%
+						for (Locale localeEntry : availableLocales) {
+							String languageId = LocaleUtil.toLanguageId(localeEntry);
+						%>
+
+							<aui:option label="<%= localeEntry.getDisplayName(themeDisplay.getLocale()) %>" selected="<%= languageId.equals(hostLocale) %>" value="<%= languageId %>" />
+
+						<%
+						}
+						%>
+
+					</aui:select>
+				</div>
+			</div>
+
+		<%
+		}
+		%>
+
+	</div>
 
 	<c:if test="<%= liveGroup.hasStagingGroup() %>">
 
 		<%
 		LayoutSet stagingPublicLayoutSet = LayoutSetLocalServiceUtil.getLayoutSet(stagingGroupId, false);
 
-		String stagingPublicVirtualHost = ParamUtil.getString(request, "stagingPublicVirtualHost", stagingPublicLayoutSet.getVirtualHostname());
+		TreeMap<String, String> stagingPublicVirtualHosts = stagingPublicLayoutSet.getVirtualHostnames();
+
+		if (stagingPublicVirtualHosts.size() == 0) {
+			stagingPublicVirtualHosts.put(StringPool.BLANK, StringPool.BLANK);
+		}
 		%>
 
-		<aui:input label="staging-public-pages" maxlength="200" name="stagingPublicVirtualHost" type="text" value="<%= stagingPublicVirtualHost %>" />
+		<div id="<portlet:namespace />stagingPublicVirtualHostFields">
+
+			<%
+			for (Map.Entry<String, String> entry : stagingPublicVirtualHosts.entrySet()) {
+				String hostName = entry.getKey();
+
+				String hostLocale = Validator.isNotNull(entry.getValue()) ? entry.getValue() : StringPool.BLANK;
+			%>
+
+				<div class="container-fluid lfr-form-row">
+					<div class="row">
+						<aui:input inlineField="<%= true %>" label="staging-public-pages" maxlength="200" name="stagingPublicVirtualHostName[]" placeholder="virtual-host" type="text" value="<%= hostName %>" wrapperCssClass="col-sm-6" />
+
+						<aui:select inlineField="<%= true %>" label="language" name="stagingPublicVirtualHostLocale[]" wrapperCssClass="col-sm-6">
+							<aui:option label="default-language" value="" />
+
+							<%
+							for (Locale localeEntry : availableLocales) {
+								String languageId = LocaleUtil.toLanguageId(localeEntry);
+							%>
+
+								<aui:option label="<%= localeEntry.getDisplayName(themeDisplay.getLocale()) %>" selected="<%= languageId.equals(hostLocale) %>" value="<%= languageId %>" />
+
+							<%
+							}
+							%>
+
+						</aui:select>
+					</div>
+				</div>
+
+			<%
+			}
+			%>
+
+		</div>
 
 		<%
 		LayoutSet stagingPrivateLayoutSet = LayoutSetLocalServiceUtil.getLayoutSet(stagingGroupId, true);
 
-		String stagingPrivateVirtualHost = ParamUtil.getString(request, "stagingPrivateVirtualHost", stagingPrivateLayoutSet.getVirtualHostname());
+		TreeMap<String, String> stagingPrivateVirtualHosts = stagingPrivateLayoutSet.getVirtualHostnames();
+
+		if (stagingPrivateVirtualHosts.size() == 0) {
+			stagingPrivateVirtualHosts.put(StringPool.BLANK, StringPool.BLANK);
+		}
 		%>
 
-		<aui:input label="staging-private-pages" maxlength="200" name="stagingPrivateVirtualHost" type="text" value="<%= stagingPrivateVirtualHost %>">
-			<aui:validator errorMessage="please-enter-a-unique-virtual-host" name="custom">
-				function(val, fieldNode, ruleValue) {
-					return (val != A.one('#<portlet:namespace />stagingPublicVirtualHost').val());
-				}
-			</aui:validator>
-		</aui:input>
+		<div id="<portlet:namespace />stagingPrivateVirtualHostFields">
+
+			<%
+			for (Map.Entry<String, String> entry : stagingPrivateVirtualHosts.entrySet()) {
+				String hostName = entry.getKey();
+
+				String hostLocale = Validator.isNotNull(entry.getValue()) ? entry.getValue() : StringPool.BLANK;
+			%>
+
+				<div class="container-fluid lfr-form-row">
+					<div class="row">
+						<aui:input inlineField="<%= true %>" label="staging-private-pages" maxlength="200" name="stagingPrivateVirtualHostName[]" placeholder="virtual-host" type="text" value="<%= hostName %>" wrapperCssClass="col-sm-6" />
+
+						<aui:select inlineField="<%= true %>" label="language" name="stagingPrivateVirtualHostLocale[]" wrapperCssClass="col-sm-6">
+							<aui:option label="default-language" value="" />
+
+							<%
+							for (Locale localeEntry : availableLocales) {
+								String languageId = LocaleUtil.toLanguageId(localeEntry);
+							%>
+
+								<aui:option label="<%= localeEntry.getDisplayName(themeDisplay.getLocale()) %>" selected="<%= languageId.equals(hostLocale) %>" value="<%= languageId %>" />
+
+							<%
+							}
+							%>
+
+						</aui:select>
+					</div>
+				</div>
+
+			<%
+			}
+			%>
+
+		</div>
 	</c:if>
 </aui:fieldset>
 
+<aui:script use="liferay-auto-fields">
+	new Liferay.AutoFields(
+		{
+			contentBox: '#<portlet:namespace />publicVirtualHostFields',
+			namespace: '<portlet:namespace />'
+		}
+	).render();
+
+	new Liferay.AutoFields(
+		{
+			contentBox: '#<portlet:namespace />privateVirtualHostFields',
+			namespace: '<portlet:namespace />'
+		}
+	).render();
+
+	<c:if test="<%= liveGroup.hasStagingGroup() %>">
+		new Liferay.AutoFields(
+			{
+				contentBox: '#<portlet:namespace />stagingPublicVirtualHostFields',
+				namespace: '<portlet:namespace />'
+			}
+		).render();
+
+		new Liferay.AutoFields(
+			{
+				contentBox: '#<portlet:namespace />stagingPrivateVirtualHostFields',
+				namespace: '<portlet:namespace />'
+			}
+		).render();
+	</c:if>
+</aui:script>
+
 <script>
 	var friendlyURL = document.getElementById('<portlet:namespace />groupFriendlyURL');
 
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_ar.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_ar.properties
index b6a298fd68c6c4..333deb38e593ff 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_ar.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_ar.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=الحد الأقصى لعمر إدخالات سلة ال
 trash-entries-max-age-help=عدد الدقائق لحفظ الإدخالات في سلة المحذوفات. يتم تلقائيًا حذف الإدخالات التي كانت في "سلة المحذوفات" لأكثر من هذا الوقت.
 use-the-default-language-options=استخدم خيارات اللغة الافتراضية.
 view-child-sites=إضافة صفحة فرعية
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=الموقع الإفتراضي
 virtual-hosts-must-be-valid-domain-names=المضيف الافتراضي يجب أن يكون اسم نطاق صالح.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=يتعذر عليك تطبيق قالب موقع لأنك قمت بتعديل إعدادات العرض لهذا الموقع. استخدم خيارات اللغة الافتراضية لتطبيق قوالب المواقع.
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_bg.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_bg.properties
index 0a3e1534f7af57..189f4e9844e142 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_bg.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_bg.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Боклук записи Макс възраст (Automat
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=Използвайте опциите по подразбиране език. (Automatic Translation)
 view-child-sites=Добавяне на подстраница
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Виртуален хост
 virtual-hosts-must-be-valid-domain-names=Виртуалните хостове трябва да бъдат валидни имена на домейни.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=Не можете да приложите шаблон на сайт, защото вие променихте настройките на дисплея на този сайт. Използвайте опциите по подразбиране език да приложите шаблони за сайтове. (Automatic Translation)
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_ca.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_ca.properties
index b1478c68c43584..f9f409c8d988f4 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_ca.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_ca.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Antiguitat màxima dels elements de la paperera
 trash-entries-max-age-help=Nombre de minuts que les entrades es mantenen a la paperera de reciclatge. Les entrades que han estat a la paperera de reciclatge des de fa més d'aquest temps s'eliminen automàticament.
 use-the-default-language-options=Utilitza les opcions de llenguatge per defecte.
 view-child-sites=Mostra els llocs inferiors
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Amfitrions virtuals
 virtual-hosts-must-be-valid-domain-names=Els amfitrions virtuals han de tenir un nom de domini vàlid.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=No podeu aplicar una plantilla de lloc perquè vareu modificar les preferències de visualització d'aquest lloc. Utilitzeu les opcions de llenguatge per defecte per a aplicar plantilles de lloc.
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_cs.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_cs.properties
index 860a8afa9cc753..1237d6d49d6bd4 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_cs.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_cs.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Maximální stáří položek v Koši
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=Použít volby výchozího jazyka.
 view-child-sites=Přidat podstránku
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Virtuální hostitelé
 virtual-hosts-must-be-valid-domain-names=Vitrtuální hostitelé/servery musí mít platná DNS jména
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=Šablonu nelze použít, protože jste změnili nastavení zobrazení tohoto webu. Použití šablon webů pomocí výchozí jazykové nastavení. (Automatic Translation)
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_da.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_da.properties
index ae09e59312ad8c..f58208e63504dc 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_da.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_da.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Trash Entries Max Age (Automatic Copy)
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=Use the default language options. (Automatic Copy)
 view-child-sites=Tilføj underside
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Virtuelle værter
 virtual-hosts-must-be-valid-domain-names=Virtuelle værter skal være gyldige domænenavne.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=You cannot apply a site template because you modified the display settings of this site. Use the default language options to apply site templates. (Automatic Copy)
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_de.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_de.properties
index 85e3563bd619cf..80b4a96d7c7251 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_de.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_de.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Aufbewahrungsdauer im Papierkorb
 trash-entries-max-age-help=Anzahl der Minuten, während derer Einträge im Papierkorb vorgehalten werden. Einträge, die sich länger im Papierkorb befinden werden automatisch gelöscht.
 use-the-default-language-options=Standardspracheinstellungen verwenden
 view-child-sites=Untergeordnete Seite anzeigen
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Virtuelle Hosts
 virtual-hosts-must-be-valid-domain-names=Virtuelle Hosts müssen gültige Domänennamen sein.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=Sie können dieser Site keine Sitevorlage zuweisen, da Sie die Darstellungsoptionen der Site geändert haben. Benutzen Sie die standardmäßigen Sprachoptionen, um die Sitevorlage zuzuweisen.
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_el.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_el.properties
index c53ec32b0e0980..f829f0e6308770 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_el.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_el.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Σκουπίδια εγγραφές Max ηλικία (Auto
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=Χρησιμοποιήστε τις προεπιλεγμένες επιλογές γλώσσας. (Automatic Translation)
 view-child-sites=Προσθήκη υπο-σελίδας.
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Εικονικοί hosts
 virtual-hosts-must-be-valid-domain-names=Οι εικονικοί hosts πρέπει να είναι έγκυρα ονόματα DNS.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=Δεν μπορείτε να εφαρμόσετε ένα πρότυπο τοποθεσίας, επειδή τροποποιήσατε τις ρυθμίσεις της οθόνης από αυτό το site. Χρησιμοποιήστε τις προεπιλεγμένες επιλογές γλώσσας για να εφαρμόσετε πρότυπα τοποθεσίας. (Automatic Translation)
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_en.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_en.properties
index 2a298909f74dc0..e0468c91455b0c 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_en.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_en.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Trash Entries Max Age
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=Use the default language options.
 view-child-sites=View Child Sites
+virtual-host=Virtual Host
 virtual-hosts=Virtual Hosts
 virtual-hosts-must-be-valid-domain-names=Virtual hosts must be valid domain names.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=You cannot apply a site template because you modified the display settings of this site. Use the default language options to apply site templates.
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_es.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_es.properties
index 4a2aaa2747b2d3..4932858053597f 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_es.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_es.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Máxima antigüedad de los elementos de la papelera
 trash-entries-max-age-help=Número de minutos que se mantendrán las entradas en la Papelera de reciclaje. Las entradas que permanezcan en la Papelera de reciclaje durante más tiempo del especificado se eliminarán automáticamente.
 use-the-default-language-options=Usar las opciones de idioma por defecto.
 view-child-sites=Ver sitios hijo
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Servidor virtual
 virtual-hosts-must-be-valid-domain-names=Los nombres de dominio virtuales deben tener nombres de dominio válidos.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=No puede aplicarse la plantilla de sitio porque se ha modificado las preferencias de presentación de este sitio. Utilice las opciones de idioma por defecto para aplicar plantillas de sitio.
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_et.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_et.properties
index 41a6d821332c09..4a17202323c30d 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_et.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_et.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Prügikast kanded Max vanus (Automatic Translation)
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=Saate vaikimisi keel. (Automatic Translation)
 view-child-sites=Lisa alamleht
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Virtuaal host
 virtual-hosts-must-be-valid-domain-names=Virtuaalhostid peavad olema kehtivad domeeninimed.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=Saidi malli ei saa rakendada, kuna te muutsite selle saidi kuvasätted. Vaikimisi keelesuvandite abil saidimallid. (Automatic Translation)
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_eu.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_eu.properties
index 5c0707c0b7c1d7..c4a5031016f009 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_eu.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_eu.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Trash Entries Max Age (Automatic Copy)
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=Use the default language options. (Automatic Copy)
 view-child-sites=Gehitu orri semea
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Zerbitzari Birtualak
 virtual-hosts-must-be-valid-domain-names=Host birtualak domeinu izen baliodunak izan behar dira.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=You cannot apply a site template because you modified the display settings of this site. Use the default language options to apply site templates. (Automatic Copy)
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_fa.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_fa.properties
index d43541aee057ab..3e49c627f18786 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_fa.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_fa.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=حداکثر مقدار ورودی زباله
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=از گزینه های زبان پیش‌فرض استفاده شود.
 view-child-sites=اضافه کردن زیرصفحات
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=میزبان‌های مجازی
 virtual-hosts-must-be-valid-domain-names=میزبان مجازی باید یک نام دامنه‌ی معتبر باشد.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=زیرا شما تنظیمات نمایش این سایت را تغییر داده اید.از زبان پیش‌فرض استفاده کنید.
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_fi.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_fi.properties
index 2a3d843b0804a6..7150b6a29940cb 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_fi.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_fi.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Roskakorin tietojen maksimi-ikä.
 trash-entries-max-age-help=Minuuttimäärä, jonka ajan kohteita pidetään roskakorissa. Tätä kauemmin roskissa olleet kohteet poistetaan automaattisesti.
 use-the-default-language-options=Käytä vakiokielimäärityksiä
 view-child-sites=Katso alisivut
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Virtuaalinen isäntäosoite
 virtual-hosts-must-be-valid-domain-names=Virtuaalisen isäntäosoiteen tulee olla validi verkkotunnus.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=Et voi lisätä sivustomallia, koska sinä olet muokannut sivuston esityksen asetuksia. Käytä vakio, kielimäärityksiä ja aseta ne sivustomalleille.
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_fr.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_fr.properties
index bf117fd5e73a39..1e64f77f9887e5 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_fr.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_fr.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Âge maximum des entrées dans la corbeille
 trash-entries-max-age-help=Nombre de minutes pendant lesquelles les entrées sont conservées dans la Corbeille. Les entrées sont automatiquement supprimées de la Corbeille une fois ce temps écoulé.
 use-the-default-language-options=Utiliser les options par défaut des langues.
 view-child-sites=Voir les sites enfants
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Hôtes virtuels
 virtual-hosts-must-be-valid-domain-names=Les hôtes virtuels doivent avoir des noms de domaine valides.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=Vous ne pouvez pas appliquer un modèle de site car vous avez modifié les paramètres d'affichage de ce site. Utilisez les paramètres de langue par défaut pour appliquer les modèles de site.
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_gl.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_gl.properties
index a20aaa05202ee0..eb71d354c88abc 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_gl.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_gl.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Trash Entries Max Age (Automatic Copy)
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=Use the default language options. (Automatic Copy)
 view-child-sites=Engadir subpáxina
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Máquinas virtuais
 virtual-hosts-must-be-valid-domain-names=Os nomes de dominio virtuales deben ter nomes de dominio válidos.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=You cannot apply a site template because you modified the display settings of this site. Use the default language options to apply site templates. (Automatic Copy)
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_hi_IN.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_hi_IN.properties
index d513da33ad3375..ce5cb9b80e0bab 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_hi_IN.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_hi_IN.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=कचरा प्रविष्टियों अध
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=डिफ़ॉल्ट भाषा विकल्प का उपयोग करें। (Automatic Translation)
 view-child-sites=चाइल्ड पेज जोड़े
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=वर्चुयल होस्ट
 virtual-hosts-must-be-valid-domain-names=वर्चुयल होस्ट ठीक डोमेन नाम होना चाहिए|
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=क्योंकि आप इस साइट के प्रदर्शन सेटिंग्स संशोधित आप एक साइट टेम्पलेट लागू नहीं कर सकते। साइट टेम्पलेट लागू करने के लिए डिफ़ॉल्ट भाषा विकल्प का उपयोग करें। (Automatic Translation)
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_hr.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_hr.properties
index 1d6b572b6703df..d973e697826b53 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_hr.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_hr.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Trash Entries Max Age (Automatic Copy)
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=Use the default language options. (Automatic Copy)
 view-child-sites=Dodaj podstranicu
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Virtualni hostovi
 virtual-hosts-must-be-valid-domain-names=Virtualni domaćini moraju biti točni nazivi domena.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=You cannot apply a site template because you modified the display settings of this site. Use the default language options to apply site templates. (Automatic Copy)
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_hu.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_hu.properties
index 6f5d20d23696d2..dca40ba5ba5605 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_hu.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_hu.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Kukázott bejegyzések maximális kora
 trash-entries-max-age-help=Napok száma, amíg a bejegyzések a Lomtárban megőrződnek. Azok a bejegyzések amelyek több mint ennyi ideje a lomtárban vannak, automatikusan törtlődnek.
 use-the-default-language-options=Használd az alapértelmeztt nyelvi lehetőségeket.
 view-child-sites=Alwebhelyek megtekintése
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Virtuális hosztok
 virtual-hosts-must-be-valid-domain-names=A virtuális hostok érvényes domainnevek kell legyenek.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=Nem alkalmazhatsz webhely sablont, mivel megváltoztattad ennek a webhelynek a megjelenítési beállításait. Használd az eredeti nyelvi opciókat a webhely sablonok alkalmazásához.
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_in.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_in.properties
index 3bf4362c3da4b1..d10be772c35679 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_in.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_in.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Sampah entri Max usia (Automatic Translation)
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=Menggunakan pilihan bahasa default. (Automatic Translation)
 view-child-sites=Menambah Sub Halaman
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Virtual Hosts
 virtual-hosts-must-be-valid-domain-names=Virtual host harus nama domain yang valid.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=Anda tidak dapat menerapkan template situs karena Anda memodifikasi pengaturan tampilan situs ini. Menggunakan pilihan bahasa default untuk menerapkan template situs. (Automatic Translation)
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_it.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_it.properties
index 88ce76a140001d..76f8ed75a83b51 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_it.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_it.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Età Massima degli Elementi del Cestino
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=Usa le impostazioni di lingua predefinite.
 view-child-sites=Visualizza Siti Figli
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Host Virtuali
 virtual-hosts-must-be-valid-domain-names=Gli host virtuali devono avere nomi di dominio validi.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=Non puoi applicare il modello di sito perché hai modificato le impostazioni di visualizzazione di questo sito. Usa la lingua predefinita per applicare il modello di sito.
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_iw.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_iw.properties
index a662edce213b30..e32c424a4ecafb 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_iw.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_iw.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=גיל מירבי לרשומות זבל
 trash-entries-max-age-help=מספר הדקות בהן רשומות נשמרות בסל המיחזור. רשומות שהיו בסל המיחזור יותר מהפעם הזאת תמחקנה אוטומטית.
 use-the-default-language-options=השתמש בברירת המחדל של אפשרויות השפה.
 view-child-sites=הצג אתרי בן
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=מארחים וירטואליים
 virtual-hosts-must-be-valid-domain-names=למארחים וירטואליים חייבים להיות שמות דומיין חוקיים.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=אין באפשרותך להחיל תבנית אתר כיוון ששינית את הגדרות התצוגה של אתר זה. השתמש בברירת המחדל של אפשרויות שפה להחיל תבניות אתר.
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_ja.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_ja.properties
index 23fb88f86fbe60..552a8713dbdf05 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_ja.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_ja.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=ゴミ箱内エントリーの最大保存日数
 trash-entries-max-age-help=ゴミ箱内のエントリは指定期間（分）保持されます。指定期間（分）以上ゴミ箱内に存在するエントリは自動的に削除されます。
 use-the-default-language-options=デフォルト言語オプションを使用します
 view-child-sites=サブサイトを閲覧
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=バーチャルホスト
 virtual-hosts-must-be-valid-domain-names=バーチャルホストには正しいドメイン名が必要です。
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=このサイトのディスプレイ設定を変更したため、サイトテンプレートは適用できません。サイトテンプレートを適用するにはデフォルトの言語オプションを使用してください。
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_kk.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_kk.properties
index 0e02116cd0c87a..e02e202f709081 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_kk.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_kk.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Trash Entries Max Age (Automatic Copy)
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted. (Automatic Copy)
 use-the-default-language-options=Use the default language options. (Automatic Copy)
 view-child-sites=View Child Sites (Automatic Copy)
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Virtual Hosts (Automatic Copy)
 virtual-hosts-must-be-valid-domain-names=Virtual hosts must be valid domain names. (Automatic Copy)
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=You cannot apply a site template because you modified the display settings of this site. Use the default language options to apply site templates. (Automatic Copy)
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_ko.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_ko.properties
index a4f9fb34b10716..d69330efac8cae 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_ko.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_ko.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=휴지통 항목 최대 나이 (Automatic Translation)
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=기본 언어 옵션을 사용 합니다. (Automatic Translation)
 view-child-sites=아이 페이지를 추가하십시요.
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=사실상 주인
 virtual-hosts-must-be-valid-domain-names=사실상 주인은 유효한 도메인 이름 이어야 한다.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=이 사이트의 디스플레이 설정을 수정한 때문에 사이트 서식 파일을 적용할 수 없습니다. 사이트 서식 파일을 적용 하려면 기본 언어 옵션을 사용 합니다. (Automatic Translation)
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_lo.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_lo.properties
index f17a79dc7af30b..2d5320bcf519e9 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_lo.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_lo.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Trash Entries Max Age (Automatic Copy)
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=Use the default language options. (Automatic Copy)
 view-child-sites=ເພີ່ມໜ້າຍ່ອຍ
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=ເວີຊ້ອນຮ໋ອດຕ່າງໆ
 virtual-hosts-must-be-valid-domain-names=ເວີຊ້ອນຮ໋ອດ ຕ້ອງເໝາະສົມກັບຊື່ໂດເມນຕ່າງໆ
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=You cannot apply a site template because you modified the display settings of this site. Use the default language options to apply site templates. (Automatic Copy)
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_lt.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_lt.properties
index 0d4809ffa85958..7be6a10c7a777a 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_lt.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_lt.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Krepšio įrašus Max metai (Automatic Translation)
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=Naudokite numatytąjį kalbos parinktys. (Automatic Translation)
 view-child-sites=Rodyti antrinės svetainės (Automatic Translation)
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Virtualusis serveris (Automatic Translation)
 virtual-hosts-must-be-valid-domain-names=Virtualusis serveris turi būti galiojanti domeno vardai. (Automatic Translation)
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=Svetainės šabloną negalima taikyti nes galite pakeisti ekrano parametrus iš šios svetainės. Naudoti numatytąjį kalbos parinktys svetainės šablonai. (Automatic Translation)
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_nb.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_nb.properties
index c306c610138ee5..60be6e97a9e3ca 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_nb.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_nb.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Maksimal alder til innlegg i papirkurven
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=Bruk forvalgte språkinnstillinger.
 view-child-sites=Vis underordnede sider
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Virtuelle verter
 virtual-hosts-must-be-valid-domain-names=Virtuelle verter må være gyldige domenenavn.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=Du kan ikke anvende malen fordi du har endret visningsinnstillingene til dette nettstedet. Bruk forhåndsvalgt språkinnstillinger for å anvende nettstedsmaler.
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_nl.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_nl.properties
index 9220c9ae9900ad..b0da9e927b19d2 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_nl.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_nl.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Maximale ouderdom van items in de prullenbak
 trash-entries-max-age-help=Het aantal minuten dat invoeren bewaard blijven in de prullenbak. Invoeren die langer dan deze tijd in de prullenbak blijven, worden verwijderd.
 use-the-default-language-options=De standaardtaalopties gebruiken.
 view-child-sites=Onderliggende sites bekijken
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Virtual hosts
 virtual-hosts-must-be-valid-domain-names=Virtual host moet een geldige domeinnaam zijn.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=U kunt geen sitesjabloon toepassen omdat de weergave-instellingen van deze site zijn aangepast. Gebruik de standaardtaalopties als u sitesjablonen wilt toepassen.
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_nl_BE.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_nl_BE.properties
index fb4a03695701ae..6fe05a7aca31e5 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_nl_BE.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_nl_BE.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Prullenbak posten Max leeftijd (Automatic Translation)
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=Gebruik de standaard taalopties. (Automatic Translation)
 view-child-sites=Kindpagina toevoegen
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Virtual hosts
 virtual-hosts-must-be-valid-domain-names=Virtual Host moet een geldige domeinnaam zijn.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=U kunt geen een sitesjabloon toepassen omdat u de weergave-instellingen van deze site gewijzigd. Gebruik de standaard taalopties toe te passen sitesjablonen. (Automatic Translation)
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_pl.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_pl.properties
index f0ab71c79516f6..2385b541227d52 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_pl.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_pl.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Maksymalny wiek elementów w koszu
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=Użyj opcji domyślnego języka.
 view-child-sites=Dodaj stronę podrzędną
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Wirtualne serwery
 virtual-hosts-must-be-valid-domain-names=Nazwy wirtualnych serwerów muszą być w formacie nazwy domenowej.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=Nie możesz wprowadzić szablonu witryny, ponieważ zmodyfikowałeś ustawienia wyglądu witryny. Użyj domyślnych opcji języka, aby wprowadzić szablony witryny.
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_pt_BR.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_pt_BR.properties
index 835e6c5cb7257f..5547c3f98878e5 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_pt_BR.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_pt_BR.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Tempo máximo para entradas na lixeira
 trash-entries-max-age-help=Número de minutos que as entradas são mantidas na Lixeira. Entradas que estiverem na Lixeira há mais que este tempo são automaticamente excluídos.
 use-the-default-language-options=Use as opções do idioma padrão.
 view-child-sites=Visualizar sites filhos
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Servidores virtuais
 virtual-hosts-must-be-valid-domain-names=Os servidores virtuais devem ter domínios válidos.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=Você não pode aplicar um modelo de site porque você modificou as configurações exibição deste site. Use as opções de idioma padrão para aplicar modelos de site.
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_pt_PT.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_pt_PT.properties
index 9b84d0d6dc518d..add45a04428c2c 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_pt_PT.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_pt_PT.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Tempo Máximo para Entradas no Reciclagem
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=Utilize as opções do idioma por omissão.
 view-child-sites=Ver Sites Filhos
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Servidores Virtuais
 virtual-hosts-must-be-valid-domain-names=Os servidores virtuais devem ter domínios válidos.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=Não pode aplicar um template de site porque modificou as configurações de apresentação deste site. Utilize as opções de idioma por omissão para aplicar templates de site.
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_ro.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_ro.properties
index 884b0fc1e27105..4084dc6ac38fe1 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_ro.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_ro.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Gunoi intrările Max vârsta (Automatic Translation)
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=Utilizaţi opţiunile de limbă implicit. (Automatic Translation)
 view-child-sites=Adaugă Pagină Copil
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Gazda Virtuala
 virtual-hosts-must-be-valid-domain-names=Gazde virtuale trebuie sa fie domenii valide.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=Nu se poate aplica un şablon de site pentru că aţi modificat setările de afișare ale acestui site. Utilizaţi opţiunile de limbă implicită pentru a aplica șabloanele de site. (Automatic Translation)
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_ru.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_ru.properties
index 1ab51fa6de33da..c66d65a7702121 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_ru.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_ru.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Максимальный возраст
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=Используйте опции языка по умолчанию.
 view-child-sites=Добавить подстраницу
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Виртуальные хосты
 virtual-hosts-must-be-valid-domain-names=Виртуальные хосты должны быть корректными доменными именами.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=Вы не можете применить изменения из шаблона сайта, потому что вы изменили настройки отображения этого сайта. Используйте опцию язык по умолчанию чтобы применить шаблоны сайта.
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_sk.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_sk.properties
index 740aed7ef921fa..44c0e26fb3af1c 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_sk.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_sk.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Maximálna životnosť položiek v odpadkovom koši
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=Použiť prenastavené jazykové voľby.
 view-child-sites=Zobraziť detské sídla
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Virtuálny hostitelia
 virtual-hosts-must-be-valid-domain-names=Virtuálny hostitelia musia mať platné doménové mená.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=Nemôžete aplikovať šablónu sídal, pretože ste zmodifikovali nastavenia zobrazenia tohoto sídla. Použite prednastavené voľby jazyka aby sa dala aplikovať šablóna sídla.
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_sl.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_sl.properties
index 536dbac5ed462e..dc461d4e97b434 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_sl.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_sl.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Smeti postavke Max starost (Automatic Translation)
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=Uporabite privzete jezikovne možnosti. (Automatic Translation)
 view-child-sites=Dodaj podstran
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Virtualni gostitelj.
 virtual-hosts-must-be-valid-domain-names=Virtualni gostitelji morajo biti veljavna imena domen.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=Predlogo mesta ni mogoče uporabiti, ker ste spremenili nastavitve zaslona za to mesto. Uporabite možnost privzeti jezik predloge mesta. (Automatic Translation)
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_sr_RS.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_sr_RS.properties
index 37b95ed9c9d7f8..a27eef58e66605 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_sr_RS.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_sr_RS.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Trash Entries Max Age (Automatic Copy)
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=Use the default language options. (Automatic Copy)
 view-child-sites=Додај Дете Странице
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Погледај Хостове
 virtual-hosts-must-be-valid-domain-names=Виртуелни хостови морају имати исправна имена домена.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=You cannot apply a site template because you modified the display settings of this site. Use the default language options to apply site templates. (Automatic Copy)
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_sr_RS_latin.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_sr_RS_latin.properties
index 9135d7498d8b89..0734c405dd75dd 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_sr_RS_latin.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_sr_RS_latin.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Trash Entries Max Age (Automatic Copy)
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted. (Automatic Copy)
 use-the-default-language-options=Use the default language options. (Automatic Copy)
 view-child-sites=View Child Sites (Automatic Copy)
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Pogledaj Hostove
 virtual-hosts-must-be-valid-domain-names=Virtuelni hostovi moraju imati ispravna imena domena.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=You cannot apply a site template because you modified the display settings of this site. Use the default language options to apply site templates. (Automatic Copy)
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_sv.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_sv.properties
index 140e532b205560..4c9982a587338b 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_sv.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_sv.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Maximal ålder för skräppost
 trash-entries-max-age-help=Antal minuter som poster stannar kvar i papperskorgen. Poster som varit i papperskorgen längre än den tiden tas bort automatiskt.
 use-the-default-language-options=Använd alternativ för standardspråk.
 view-child-sites=Lägg till undersida
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Virtuella värdar
 virtual-hosts-must-be-valid-domain-names=Virtuell värd måste vara en giltig domänadress.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=Du kan inte använda en webbplatsmall eftersom du har modifierat visningsinställningarna för den här webbplatsen. Använd alternativ för standardspråk för att tillämpa webbplatsmallar.
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_ta_IN.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_ta_IN.properties
index 2066451610d0e2..50ab72c9e59466 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_ta_IN.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_ta_IN.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Trash Entries Max Age
 trash-entries-max-age-help=Recycle Bin-ல் entries-களை வைத்திருக்கும் நிமிடங்களின் எண்ணிக்கை. இந்த நேரத்திற்குப் பிறகு Recycle Bin-ல் உள்ள பதிவுகள் தானாக நீக்கப்படும்.
 use-the-default-language-options=Default மொழி விருப்பங்களைப் பயன்படுத்துக.
 view-child-sites=துணைத் தளங்களைப் பார்க்க
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Virtual Hosts
 virtual-hosts-must-be-valid-domain-names=Virtual hosts-கள் சரியான டொமைன் பெயர்களாக இருக்க வேண்டும்.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=இந்த தளத்தின் காட்சி அமைப்புகளை நீங்கள் மாற்றிவிட்டதால் தள டெம்ப்ளேட்டை நீங்கள் பயன்படுத்த முடியாது. தள டெம்ப்ளேட்டை பயன்படுத்துவதற்கு default மொழி விருப்பங்களைப் பயன்படுத்துக.
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_th.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_th.properties
index cacc4357c9bbaa..eef0b5ffbc8027 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_th.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_th.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=ถังขยะอายุสูงสุดของ
 trash-entries-max-age-help=จำนวนนาทีที่รายการจะถูกเก็บไว้ในรีไซเคิล รายการที่ได้รับในการรีไซเคิลมากกว่าเวลานี้ จะถูกลบออกโดยอัตโนมัติ (Automatic Translation)
 use-the-default-language-options=ใช้ตัวเลือกภาษาเริ่มต้น (Automatic Translation)
 view-child-sites=ดูเด็กไซต์ (Automatic Translation)
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=โฮสต์เสมือน (Automatic Translation)
 virtual-hosts-must-be-valid-domain-names=โฮสต์เสมือนต้องเป็นชื่อโดเมนที่ถูกต้อง (Automatic Translation)
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=คุณไม่สามารถใช้แม่แบบไซต์ได้เนื่องจากที่คุณแก้ไขการตั้งค่าการแสดงผลของเว็บไซต์นี้ ใช้ตัวเลือกภาษาเริ่มต้นเพื่อใช้แม่แบบไซต์ (Automatic Translation)
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_tr.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_tr.properties
index 001b60bc4f3032..276547ec1c6473 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_tr.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_tr.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Çöp kutusu girişleri maksimum yaş (Automatic Translati
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=Varsayılan dil seçenekleri kullanın. (Automatic Translation)
 view-child-sites=Alt Sayfa Ekle
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Sanal konaklar (Automatic Translation)
 virtual-hosts-must-be-valid-domain-names=Virtual hostlar geçerli alan adları olmalıdır.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=Bu sitenin görüntü ayarlarını değiştirdiğiniz bir site şablonu uygulayamazsınız. Site şablonları uygulamak için varsayılan dil seçenekleri kullanın. (Automatic Translation)
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_uk.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_uk.properties
index a2ecce7d93e6b1..3fc8c0a6f19d59 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_uk.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_uk.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Сміття записи Макс віку (Automatic Tra
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=Параметри мови за замовчуванням. (Automatic Translation)
 view-child-sites=Добавити під-сторінку
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Віртуальний хост
 virtual-hosts-must-be-valid-domain-names=Віртуальні хости мають бути коректними доменними іменами.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=Не вдалося застосувати шаблон сайту, оскільки ви змінили настройки відображення цього сайту. Параметри за замовчуванням мова застосовувати шаблони сайтів. (Automatic Translation)
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_vi.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_vi.properties
index dccde215a44cf3..887e751902b315 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_vi.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_vi.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=Thời gian duy trì tối đa trong thùng rác
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=Sử dụng ngôn ngữ mặc định (đã chọn).
 view-child-sites=Thêm trang thành phần
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=Các ảo hóa
 virtual-hosts-must-be-valid-domain-names=Ảo hóa phải có tên miền hợp lệ.
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=Bạn không thể áp dụng Biểu mẫu trang TTĐT bởi vì bạn đã thay đổi thiết lập hiển thị của trang này. Bạn hãy sử dụng tùy chọn ngôn ngữ mặc định để áp dụng Biểu mẫu trang TTĐT.
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_zh_CN.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_zh_CN.properties
index 075e08760ba7dc..4664f5f121883d 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_zh_CN.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_zh_CN.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=回收站内条目最大时限
 trash-entries-max-age-help=在回收站中保留条目的分钟数。在回收站中存在超过此时间的条目将被自动删除。
 use-the-default-language-options=使用默认的语言选项
 view-child-sites=查看下级站点
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=虚拟主机
 virtual-hosts-must-be-valid-domain-names=虚拟主机必须为有效的域名。
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=您无法使用站点模板因为您更改了此站点的显示设置。使用默认语言选项来应用这些站点模板。
diff --git a/modules/apps/site/site-admin-web/src/main/resources/content/Language_zh_TW.properties b/modules/apps/site/site-admin-web/src/main/resources/content/Language_zh_TW.properties
index b485117696b949..8ae24971c9a33f 100644
--- a/modules/apps/site/site-admin-web/src/main/resources/content/Language_zh_TW.properties
+++ b/modules/apps/site/site-admin-web/src/main/resources/content/Language_zh_TW.properties
@@ -72,6 +72,7 @@ trash-entries-max-age=垃圾條目最大歷史
 trash-entries-max-age-help=Number of minutes that entries are kept in the Recycle Bin. Entries that have been in the Recycle Bin for more than this time are automatically deleted.
 use-the-default-language-options=使用預設語系選項。
 view-child-sites=檢視子站台
+virtual-host=Virtual Host (Automatic Copy)
 virtual-hosts=虛擬主機
 virtual-hosts-must-be-valid-domain-names=虛擬主機必須是合法的域名。
 you-cannot-apply-a-site-template-because-you-modified-the-display-settings-of-this-site=您不能套用站台版型因為您剛修改這站台的顯示設定。使用預設語系選項以套用站台版型。
diff --git a/modules/test/persistence-test/src/testIntegration/java/com/liferay/portal/service/persistence/test/LayoutPersistenceTest.java b/modules/test/persistence-test/src/testIntegration/java/com/liferay/portal/service/persistence/test/LayoutPersistenceTest.java
index 10e2b6229180b2..99ba6632c437d9 100644
--- a/modules/test/persistence-test/src/testIntegration/java/com/liferay/portal/service/persistence/test/LayoutPersistenceTest.java
+++ b/modules/test/persistence-test/src/testIntegration/java/com/liferay/portal/service/persistence/test/LayoutPersistenceTest.java
@@ -125,8 +125,6 @@ public void testUpdateExisting() throws Exception {
 
 		newLayout.setMvccVersion(RandomTestUtil.nextLong());
 
-		newLayout.setCtCollectionId(RandomTestUtil.nextLong());
-
 		newLayout.setUuid(RandomTestUtil.randomString());
 
 		newLayout.setGroupId(RandomTestUtil.nextLong());
@@ -200,8 +198,6 @@ public void testUpdateExisting() throws Exception {
 
 		Assert.assertEquals(
 			existingLayout.getMvccVersion(), newLayout.getMvccVersion());
-		Assert.assertEquals(
-			existingLayout.getCtCollectionId(), newLayout.getCtCollectionId());
 		Assert.assertEquals(existingLayout.getUuid(), newLayout.getUuid());
 		Assert.assertEquals(existingLayout.getPlid(), newLayout.getPlid());
 		Assert.assertEquals(
@@ -299,13 +295,6 @@ public void testCountByUuid_C() throws Exception {
 		_persistence.countByUuid_C((String)null, 0L);
 	}
 
-	@Test
-	public void testCountByCTCollectionId() throws Exception {
-		_persistence.countByCTCollectionId(RandomTestUtil.nextLong());
-
-		_persistence.countByCTCollectionId(0L);
-	}
-
 	@Test
 	public void testCountByGroupId() throws Exception {
 		_persistence.countByGroupId(RandomTestUtil.nextLong());
@@ -513,16 +502,15 @@ public void testFilterFindByGroupId() throws Exception {
 
 	protected OrderByComparator<Layout> getOrderByComparator() {
 		return OrderByComparatorFactoryUtil.create(
-			"Layout", "mvccVersion", true, "ctCollectionId", true, "uuid", true,
-			"plid", true, "groupId", true, "companyId", true, "userId", true,
-			"userName", true, "createDate", true, "modifiedDate", true,
-			"parentPlid", true, "privateLayout", true, "layoutId", true,
-			"parentLayoutId", true, "classNameId", true, "classPK", true,
-			"name", true, "title", true, "description", true, "keywords", true,
-			"robots", true, "type", true, "hidden", true, "system", true,
-			"friendlyURL", true, "iconImageId", true, "themeId", true,
-			"colorSchemeId", true, "priority", true, "layoutPrototypeUuid",
-			true, "layoutPrototypeLinkEnabled", true,
+			"Layout", "mvccVersion", true, "uuid", true, "plid", true,
+			"groupId", true, "companyId", true, "userId", true, "userName",
+			true, "createDate", true, "modifiedDate", true, "parentPlid", true,
+			"privateLayout", true, "layoutId", true, "parentLayoutId", true,
+			"classNameId", true, "classPK", true, "name", true, "title", true,
+			"description", true, "keywords", true, "robots", true, "type", true,
+			"hidden", true, "system", true, "friendlyURL", true, "iconImageId",
+			true, "themeId", true, "colorSchemeId", true, "priority", true,
+			"layoutPrototypeUuid", true, "layoutPrototypeLinkEnabled", true,
 			"sourcePrototypeLayoutUuid", true, "publishDate", true,
 			"lastPublishDate", true);
 	}
@@ -824,8 +812,6 @@ protected Layout addLayout() throws Exception {
 
 		layout.setMvccVersion(RandomTestUtil.nextLong());
 
-		layout.setCtCollectionId(RandomTestUtil.nextLong());
-
 		layout.setUuid(RandomTestUtil.randomString());
 
 		layout.setGroupId(RandomTestUtil.nextLong());
diff --git a/modules/test/persistence-test/src/testIntegration/java/com/liferay/portal/service/persistence/test/VirtualHostPersistenceTest.java b/modules/test/persistence-test/src/testIntegration/java/com/liferay/portal/service/persistence/test/VirtualHostPersistenceTest.java
index 0067122399a1b3..fe6fb591731a97 100644
--- a/modules/test/persistence-test/src/testIntegration/java/com/liferay/portal/service/persistence/test/VirtualHostPersistenceTest.java
+++ b/modules/test/persistence-test/src/testIntegration/java/com/liferay/portal/service/persistence/test/VirtualHostPersistenceTest.java
@@ -130,6 +130,10 @@ public void testUpdateExisting() throws Exception {
 
 		newVirtualHost.setHostname(RandomTestUtil.randomString());
 
+		newVirtualHost.setDefaultVirtualHost(RandomTestUtil.randomBoolean());
+
+		newVirtualHost.setLanguageId(RandomTestUtil.randomString());
+
 		_virtualHosts.add(_persistence.update(newVirtualHost));
 
 		VirtualHost existingVirtualHost = _persistence.findByPrimaryKey(
@@ -148,6 +152,12 @@ public void testUpdateExisting() throws Exception {
 			newVirtualHost.getLayoutSetId());
 		Assert.assertEquals(
 			existingVirtualHost.getHostname(), newVirtualHost.getHostname());
+		Assert.assertEquals(
+			existingVirtualHost.isDefaultVirtualHost(),
+			newVirtualHost.isDefaultVirtualHost());
+		Assert.assertEquals(
+			existingVirtualHost.getLanguageId(),
+			newVirtualHost.getLanguageId());
 	}
 
 	@Test
@@ -167,6 +177,15 @@ public void testCountByC_L() throws Exception {
 		_persistence.countByC_L(0L, 0L);
 	}
 
+	@Test
+	public void testCountByC_L_D() throws Exception {
+		_persistence.countByC_L_D(
+			RandomTestUtil.nextLong(), RandomTestUtil.nextLong(),
+			RandomTestUtil.randomBoolean());
+
+		_persistence.countByC_L_D(0L, 0L, RandomTestUtil.randomBoolean());
+	}
+
 	@Test
 	public void testFindByPrimaryKeyExisting() throws Exception {
 		VirtualHost newVirtualHost = addVirtualHost();
@@ -193,7 +212,8 @@ public void testFindAll() throws Exception {
 	protected OrderByComparator<VirtualHost> getOrderByComparator() {
 		return OrderByComparatorFactoryUtil.create(
 			"VirtualHost", "mvccVersion", true, "virtualHostId", true,
-			"companyId", true, "layoutSetId", true, "hostname", true);
+			"companyId", true, "layoutSetId", true, "hostname", true,
+			"defaultVirtualHost", true, "languageId", true);
 	}
 
 	@Test
@@ -430,6 +450,11 @@ public void testResetOriginalValues() throws Exception {
 			ReflectionTestUtil.<Long>invoke(
 				existingVirtualHost, "getOriginalLayoutSetId",
 				new Class<?>[0]));
+		Assert.assertEquals(
+			Boolean.valueOf(existingVirtualHost.getDefaultVirtualHost()),
+			ReflectionTestUtil.<Boolean>invoke(
+				existingVirtualHost, "getOriginalDefaultVirtualHost",
+				new Class<?>[0]));
 	}
 
 	protected VirtualHost addVirtualHost() throws Exception {
@@ -445,6 +470,10 @@ protected VirtualHost addVirtualHost() throws Exception {
 
 		virtualHost.setHostname(RandomTestUtil.randomString());
 
+		virtualHost.setDefaultVirtualHost(RandomTestUtil.randomBoolean());
+
+		virtualHost.setLanguageId(RandomTestUtil.randomString());
+
 		_virtualHosts.add(_persistence.update(virtualHost));
 
 		return virtualHost;
diff --git a/portal-impl/src/META-INF/portal-hbm.xml b/portal-impl/src/META-INF/portal-hbm.xml
index 86345e6859d819..762460d7e79d06 100644
--- a/portal-impl/src/META-INF/portal-hbm.xml
+++ b/portal-impl/src/META-INF/portal-hbm.xml
@@ -284,7 +284,6 @@
 			<generator class="assigned" />
 		</id>
 		<version access="com.liferay.portal.dao.orm.hibernate.PrivatePropertyAccessor" name="mvccVersion" type="long" />
-		<property access="com.liferay.portal.dao.orm.hibernate.LiferayPropertyAccessor" name="ctCollectionId" type="com.liferay.portal.dao.orm.hibernate.LongType" />
 		<property access="com.liferay.portal.dao.orm.hibernate.LiferayPropertyAccessor" column="uuid_" name="uuid" type="com.liferay.portal.dao.orm.hibernate.StringType" />
 		<property access="com.liferay.portal.dao.orm.hibernate.LiferayPropertyAccessor" name="groupId" type="com.liferay.portal.dao.orm.hibernate.LongType" />
 		<property access="com.liferay.portal.dao.orm.hibernate.LiferayPropertyAccessor" name="companyId" type="com.liferay.portal.dao.orm.hibernate.LongType" />
@@ -1023,6 +1022,8 @@
 		<property access="com.liferay.portal.dao.orm.hibernate.LiferayPropertyAccessor" name="companyId" type="com.liferay.portal.dao.orm.hibernate.LongType" />
 		<property access="com.liferay.portal.dao.orm.hibernate.LiferayPropertyAccessor" name="layoutSetId" type="com.liferay.portal.dao.orm.hibernate.LongType" />
 		<property access="com.liferay.portal.dao.orm.hibernate.LiferayPropertyAccessor" name="hostname" type="com.liferay.portal.dao.orm.hibernate.StringType" />
+		<property access="com.liferay.portal.dao.orm.hibernate.LiferayPropertyAccessor" name="defaultVirtualHost" type="com.liferay.portal.dao.orm.hibernate.BooleanType" />
+		<property access="com.liferay.portal.dao.orm.hibernate.LiferayPropertyAccessor" name="languageId" type="com.liferay.portal.dao.orm.hibernate.StringType" />
 	</class>
 	<class dynamic-update="true" name="com.liferay.portal.model.impl.WebDAVPropsImpl" table="WebDAVProps">
 		<id access="com.liferay.portal.dao.orm.hibernate.LiferayPropertyAccessor" name="webDavPropsId" type="long">
diff --git a/portal-impl/src/META-INF/portal-model-hints.xml b/portal-impl/src/META-INF/portal-model-hints.xml
index 57c769d276de8b..66aa06c6d05257 100644
--- a/portal-impl/src/META-INF/portal-model-hints.xml
+++ b/portal-impl/src/META-INF/portal-model-hints.xml
@@ -658,7 +658,6 @@
 	</model>
 	<model name="com.liferay.portal.kernel.model.Layout">
 		<field name="mvccVersion" type="long" />
-		<field name="ctCollectionId" type="long" />
 		<field name="uuid" type="String" />
 		<field name="plid" type="long" />
 		<field name="groupId" type="long" />
@@ -1524,6 +1523,8 @@
 			<hint-collection name="HOSTNAME" />
 			<validator name="required" />
 		</field>
+		<field name="defaultVirtualHost" type="boolean" />
+		<field name="languageId" type="String" />
 	</model>
 	<model name="com.liferay.portal.kernel.model.WebDAVProps">
 		<field name="mvccVersion" type="long" />
diff --git a/portal-impl/src/com/liferay/portal/model/impl/CompanyImpl.java b/portal-impl/src/com/liferay/portal/model/impl/CompanyImpl.java
index 752b3fb1379f3f..9694c09eba6e40 100644
--- a/portal-impl/src/com/liferay/portal/model/impl/CompanyImpl.java
+++ b/portal-impl/src/com/liferay/portal/model/impl/CompanyImpl.java
@@ -50,6 +50,7 @@
 
 import java.util.Locale;
 import java.util.TimeZone;
+import java.util.TreeMap;
 
 import javax.portlet.PortletPreferences;
 
@@ -196,18 +197,24 @@ public String getPortalURL(long groupId) throws PortalException {
 			LayoutSet layoutSet = LayoutSetLocalServiceUtil.getLayoutSet(
 				groupId, false);
 
-			if (Validator.isNotNull(layoutSet.getVirtualHostname())) {
+			TreeMap<String, String> virtualHostnames =
+				layoutSet.getVirtualHostnames();
+
+			if (!virtualHostnames.isEmpty()) {
 				portalURL = PortalUtil.getPortalURL(
-					layoutSet.getVirtualHostname(), portalPort, false);
+					virtualHostnames.firstKey(), portalPort, false);
 			}
 		}
 		else if (group.hasPrivateLayouts()) {
 			LayoutSet layoutSet = LayoutSetLocalServiceUtil.getLayoutSet(
 				groupId, true);
 
-			if (Validator.isNotNull(layoutSet.getVirtualHostname())) {
+			TreeMap<String, String> virtualHostnames =
+				layoutSet.getVirtualHostnames();
+
+			if (!virtualHostnames.isEmpty()) {
 				portalURL = PortalUtil.getPortalURL(
-					layoutSet.getVirtualHostname(), portalPort, false);
+					virtualHostnames.firstKey(), portalPort, false);
 			}
 		}
 
diff --git a/portal-impl/src/com/liferay/portal/model/impl/LayoutCacheModel.java b/portal-impl/src/com/liferay/portal/model/impl/LayoutCacheModel.java
index cf9b1fd0ff4520..3e5ee009759e93 100644
--- a/portal-impl/src/com/liferay/portal/model/impl/LayoutCacheModel.java
+++ b/portal-impl/src/com/liferay/portal/model/impl/LayoutCacheModel.java
@@ -76,12 +76,10 @@ public void setMvccVersion(long mvccVersion) {
 
 	@Override
 	public String toString() {
-		StringBundler sb = new StringBundler(73);
+		StringBundler sb = new StringBundler(71);
 
 		sb.append("{mvccVersion=");
 		sb.append(mvccVersion);
-		sb.append(", ctCollectionId=");
-		sb.append(ctCollectionId);
 		sb.append(", uuid=");
 		sb.append(uuid);
 		sb.append(", plid=");
@@ -160,7 +158,6 @@ public Layout toEntityModel() {
 		LayoutImpl layoutImpl = new LayoutImpl();
 
 		layoutImpl.setMvccVersion(mvccVersion);
-		layoutImpl.setCtCollectionId(ctCollectionId);
 
 		if (uuid == null) {
 			layoutImpl.setUuid("");
@@ -324,8 +321,6 @@ public Layout toEntityModel() {
 	@Override
 	public void readExternal(ObjectInput objectInput) throws IOException {
 		mvccVersion = objectInput.readLong();
-
-		ctCollectionId = objectInput.readLong();
 		uuid = objectInput.readUTF();
 
 		plid = objectInput.readLong();
@@ -381,8 +376,6 @@ public void readExternal(ObjectInput objectInput) throws IOException {
 	public void writeExternal(ObjectOutput objectOutput) throws IOException {
 		objectOutput.writeLong(mvccVersion);
 
-		objectOutput.writeLong(ctCollectionId);
-
 		if (uuid == null) {
 			objectOutput.writeUTF("");
 		}
@@ -526,7 +519,6 @@ public void writeExternal(ObjectOutput objectOutput) throws IOException {
 	}
 
 	public long mvccVersion;
-	public long ctCollectionId;
 	public String uuid;
 	public long plid;
 	public long groupId;
diff --git a/portal-impl/src/com/liferay/portal/model/impl/LayoutModelImpl.java b/portal-impl/src/com/liferay/portal/model/impl/LayoutModelImpl.java
index b60f291eaed094..a850cc0039fbff 100644
--- a/portal-impl/src/com/liferay/portal/model/impl/LayoutModelImpl.java
+++ b/portal-impl/src/com/liferay/portal/model/impl/LayoutModelImpl.java
@@ -81,22 +81,22 @@ public class LayoutModelImpl
 	public static final String TABLE_NAME = "Layout";
 
 	public static final Object[][] TABLE_COLUMNS = {
-		{"mvccVersion", Types.BIGINT}, {"ctCollectionId", Types.BIGINT},
-		{"uuid_", Types.VARCHAR}, {"plid", Types.BIGINT},
-		{"groupId", Types.BIGINT}, {"companyId", Types.BIGINT},
-		{"userId", Types.BIGINT}, {"userName", Types.VARCHAR},
-		{"createDate", Types.TIMESTAMP}, {"modifiedDate", Types.TIMESTAMP},
-		{"parentPlid", Types.BIGINT}, {"privateLayout", Types.BOOLEAN},
-		{"layoutId", Types.BIGINT}, {"parentLayoutId", Types.BIGINT},
-		{"classNameId", Types.BIGINT}, {"classPK", Types.BIGINT},
-		{"name", Types.VARCHAR}, {"title", Types.VARCHAR},
-		{"description", Types.VARCHAR}, {"keywords", Types.VARCHAR},
-		{"robots", Types.VARCHAR}, {"type_", Types.VARCHAR},
-		{"typeSettings", Types.CLOB}, {"hidden_", Types.BOOLEAN},
-		{"system_", Types.BOOLEAN}, {"friendlyURL", Types.VARCHAR},
-		{"iconImageId", Types.BIGINT}, {"themeId", Types.VARCHAR},
-		{"colorSchemeId", Types.VARCHAR}, {"css", Types.CLOB},
-		{"priority", Types.INTEGER}, {"layoutPrototypeUuid", Types.VARCHAR},
+		{"mvccVersion", Types.BIGINT}, {"uuid_", Types.VARCHAR},
+		{"plid", Types.BIGINT}, {"groupId", Types.BIGINT},
+		{"companyId", Types.BIGINT}, {"userId", Types.BIGINT},
+		{"userName", Types.VARCHAR}, {"createDate", Types.TIMESTAMP},
+		{"modifiedDate", Types.TIMESTAMP}, {"parentPlid", Types.BIGINT},
+		{"privateLayout", Types.BOOLEAN}, {"layoutId", Types.BIGINT},
+		{"parentLayoutId", Types.BIGINT}, {"classNameId", Types.BIGINT},
+		{"classPK", Types.BIGINT}, {"name", Types.VARCHAR},
+		{"title", Types.VARCHAR}, {"description", Types.VARCHAR},
+		{"keywords", Types.VARCHAR}, {"robots", Types.VARCHAR},
+		{"type_", Types.VARCHAR}, {"typeSettings", Types.CLOB},
+		{"hidden_", Types.BOOLEAN}, {"system_", Types.BOOLEAN},
+		{"friendlyURL", Types.VARCHAR}, {"iconImageId", Types.BIGINT},
+		{"themeId", Types.VARCHAR}, {"colorSchemeId", Types.VARCHAR},
+		{"css", Types.CLOB}, {"priority", Types.INTEGER},
+		{"layoutPrototypeUuid", Types.VARCHAR},
 		{"layoutPrototypeLinkEnabled", Types.BOOLEAN},
 		{"sourcePrototypeLayoutUuid", Types.VARCHAR},
 		{"publishDate", Types.TIMESTAMP}, {"lastPublishDate", Types.TIMESTAMP}
@@ -107,7 +107,6 @@ public class LayoutModelImpl
 
 	static {
 		TABLE_COLUMNS_MAP.put("mvccVersion", Types.BIGINT);
-		TABLE_COLUMNS_MAP.put("ctCollectionId", Types.BIGINT);
 		TABLE_COLUMNS_MAP.put("uuid_", Types.VARCHAR);
 		TABLE_COLUMNS_MAP.put("plid", Types.BIGINT);
 		TABLE_COLUMNS_MAP.put("groupId", Types.BIGINT);
@@ -145,7 +144,7 @@ public class LayoutModelImpl
 	}
 
 	public static final String TABLE_SQL_CREATE =
-		"create table Layout (mvccVersion LONG default 0 not null,ctCollectionId LONG default 0 not null,uuid_ VARCHAR(75) null,plid LONG not null,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,parentPlid LONG,privateLayout BOOLEAN,layoutId LONG,parentLayoutId LONG,classNameId LONG,classPK LONG,name STRING null,title STRING null,description STRING null,keywords STRING null,robots STRING null,type_ VARCHAR(75) null,typeSettings TEXT null,hidden_ BOOLEAN,system_ BOOLEAN,friendlyURL VARCHAR(255) null,iconImageId LONG,themeId VARCHAR(75) null,colorSchemeId VARCHAR(75) null,css TEXT null,priority INTEGER,layoutPrototypeUuid VARCHAR(75) null,layoutPrototypeLinkEnabled BOOLEAN,sourcePrototypeLayoutUuid VARCHAR(75) null,publishDate DATE null,lastPublishDate DATE null,primary key (plid, ctCollectionId))";
+		"create table Layout (mvccVersion LONG default 0 not null,uuid_ VARCHAR(75) null,plid LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,parentPlid LONG,privateLayout BOOLEAN,layoutId LONG,parentLayoutId LONG,classNameId LONG,classPK LONG,name STRING null,title STRING null,description STRING null,keywords STRING null,robots STRING null,type_ VARCHAR(75) null,typeSettings TEXT null,hidden_ BOOLEAN,system_ BOOLEAN,friendlyURL VARCHAR(255) null,iconImageId LONG,themeId VARCHAR(75) null,colorSchemeId VARCHAR(75) null,css TEXT null,priority INTEGER,layoutPrototypeUuid VARCHAR(75) null,layoutPrototypeLinkEnabled BOOLEAN,sourcePrototypeLayoutUuid VARCHAR(75) null,publishDate DATE null,lastPublishDate DATE null)";
 
 	public static final String TABLE_SQL_DROP = "drop table Layout";
 
@@ -182,33 +181,31 @@ public class LayoutModelImpl
 
 	public static final long COMPANYID_COLUMN_BITMASK = 4L;
 
-	public static final long CTCOLLECTIONID_COLUMN_BITMASK = 8L;
+	public static final long FRIENDLYURL_COLUMN_BITMASK = 8L;
 
-	public static final long FRIENDLYURL_COLUMN_BITMASK = 16L;
+	public static final long GROUPID_COLUMN_BITMASK = 16L;
 
-	public static final long GROUPID_COLUMN_BITMASK = 32L;
+	public static final long HIDDEN_COLUMN_BITMASK = 32L;
 
-	public static final long HIDDEN_COLUMN_BITMASK = 64L;
+	public static final long ICONIMAGEID_COLUMN_BITMASK = 64L;
 
-	public static final long ICONIMAGEID_COLUMN_BITMASK = 128L;
+	public static final long LAYOUTID_COLUMN_BITMASK = 128L;
 
-	public static final long LAYOUTID_COLUMN_BITMASK = 256L;
+	public static final long LAYOUTPROTOTYPEUUID_COLUMN_BITMASK = 256L;
 
-	public static final long LAYOUTPROTOTYPEUUID_COLUMN_BITMASK = 512L;
+	public static final long PARENTLAYOUTID_COLUMN_BITMASK = 512L;
 
-	public static final long PARENTLAYOUTID_COLUMN_BITMASK = 1024L;
+	public static final long PARENTPLID_COLUMN_BITMASK = 1024L;
 
-	public static final long PARENTPLID_COLUMN_BITMASK = 2048L;
+	public static final long PRIORITY_COLUMN_BITMASK = 2048L;
 
-	public static final long PRIORITY_COLUMN_BITMASK = 4096L;
+	public static final long PRIVATELAYOUT_COLUMN_BITMASK = 4096L;
 
-	public static final long PRIVATELAYOUT_COLUMN_BITMASK = 8192L;
+	public static final long SOURCEPROTOTYPELAYOUTUUID_COLUMN_BITMASK = 8192L;
 
-	public static final long SOURCEPROTOTYPELAYOUTUUID_COLUMN_BITMASK = 16384L;
+	public static final long TYPE_COLUMN_BITMASK = 16384L;
 
-	public static final long TYPE_COLUMN_BITMASK = 32768L;
-
-	public static final long UUID_COLUMN_BITMASK = 65536L;
+	public static final long UUID_COLUMN_BITMASK = 32768L;
 
 	/**
 	 * Converts the soap model instance into a normal model instance.
@@ -224,7 +221,6 @@ public static Layout toModel(LayoutSoap soapModel) {
 		Layout model = new LayoutImpl();
 
 		model.setMvccVersion(soapModel.getMvccVersion());
-		model.setCtCollectionId(soapModel.getCtCollectionId());
 		model.setUuid(soapModel.getUuid());
 		model.setPlid(soapModel.getPlid());
 		model.setGroupId(soapModel.getGroupId());
@@ -412,11 +408,6 @@ public Map<String, Function<Layout, Object>> getAttributeGetterFunctions() {
 		attributeGetterFunctions.put("mvccVersion", Layout::getMvccVersion);
 		attributeSetterBiConsumers.put(
 			"mvccVersion", (BiConsumer<Layout, Long>)Layout::setMvccVersion);
-		attributeGetterFunctions.put(
-			"ctCollectionId", Layout::getCtCollectionId);
-		attributeSetterBiConsumers.put(
-			"ctCollectionId",
-			(BiConsumer<Layout, Long>)Layout::setCtCollectionId);
 		attributeGetterFunctions.put("uuid", Layout::getUuid);
 		attributeSetterBiConsumers.put(
 			"uuid", (BiConsumer<Layout, String>)Layout::setUuid);
@@ -551,29 +542,6 @@ public void setMvccVersion(long mvccVersion) {
 		_mvccVersion = mvccVersion;
 	}
 
-	@JSON
-	@Override
-	public long getCtCollectionId() {
-		return _ctCollectionId;
-	}
-
-	@Override
-	public void setCtCollectionId(long ctCollectionId) {
-		_columnBitmask |= CTCOLLECTIONID_COLUMN_BITMASK;
-
-		if (!_setOriginalCtCollectionId) {
-			_setOriginalCtCollectionId = true;
-
-			_originalCtCollectionId = _ctCollectionId;
-		}
-
-		_ctCollectionId = ctCollectionId;
-	}
-
-	public long getOriginalCtCollectionId() {
-		return _originalCtCollectionId;
-	}
-
 	@JSON
 	@Override
 	public String getUuid() {
@@ -1916,7 +1884,6 @@ public Object clone() {
 		LayoutImpl layoutImpl = new LayoutImpl();
 
 		layoutImpl.setMvccVersion(getMvccVersion());
-		layoutImpl.setCtCollectionId(getCtCollectionId());
 		layoutImpl.setUuid(getUuid());
 		layoutImpl.setPlid(getPlid());
 		layoutImpl.setGroupId(getGroupId());
@@ -2034,11 +2001,6 @@ public boolean isFinderCacheEnabled() {
 	public void resetOriginalValues() {
 		LayoutModelImpl layoutModelImpl = this;
 
-		layoutModelImpl._originalCtCollectionId =
-			layoutModelImpl._ctCollectionId;
-
-		layoutModelImpl._setOriginalCtCollectionId = false;
-
 		layoutModelImpl._originalUuid = layoutModelImpl._uuid;
 
 		layoutModelImpl._originalGroupId = layoutModelImpl._groupId;
@@ -2107,8 +2069,6 @@ public CacheModel<Layout> toCacheModel() {
 
 		layoutCacheModel.mvccVersion = getMvccVersion();
 
-		layoutCacheModel.ctCollectionId = getCtCollectionId();
-
 		layoutCacheModel.uuid = getUuid();
 
 		String uuid = layoutCacheModel.uuid;
@@ -2374,9 +2334,6 @@ private static class EscapedModelProxyProviderFunctionHolder {
 	}
 
 	private long _mvccVersion;
-	private long _ctCollectionId;
-	private long _originalCtCollectionId;
-	private boolean _setOriginalCtCollectionId;
 	private String _uuid;
 	private String _originalUuid;
 	private long _plid;
diff --git a/portal-impl/src/com/liferay/portal/model/impl/LayoutSetCacheModel.java b/portal-impl/src/com/liferay/portal/model/impl/LayoutSetCacheModel.java
index d3d02fba49c875..4393dff2c51f60 100644
--- a/portal-impl/src/com/liferay/portal/model/impl/LayoutSetCacheModel.java
+++ b/portal-impl/src/com/liferay/portal/model/impl/LayoutSetCacheModel.java
@@ -180,7 +180,7 @@ public LayoutSet toEntityModel() {
 		layoutSetImpl.setCompanyFallbackVirtualHostname(
 			_companyFallbackVirtualHostname);
 
-		layoutSetImpl.setVirtualHostname(_virtualHostname);
+		layoutSetImpl.setVirtualHostnames(_virtualHostnames);
 
 		return layoutSetImpl;
 	}
@@ -211,7 +211,7 @@ public void readExternal(ObjectInput objectInput)
 		layoutSetPrototypeLinkEnabled = objectInput.readBoolean();
 
 		_companyFallbackVirtualHostname = (String)objectInput.readObject();
-		_virtualHostname = (String)objectInput.readObject();
+		_virtualHostnames = (java.util.TreeMap)objectInput.readObject();
 	}
 
 	@Override
@@ -268,7 +268,7 @@ public void writeExternal(ObjectOutput objectOutput) throws IOException {
 		objectOutput.writeBoolean(layoutSetPrototypeLinkEnabled);
 
 		objectOutput.writeObject(_companyFallbackVirtualHostname);
-		objectOutput.writeObject(_virtualHostname);
+		objectOutput.writeObject(_virtualHostnames);
 	}
 
 	public long mvccVersion;
@@ -286,6 +286,6 @@ public void writeExternal(ObjectOutput objectOutput) throws IOException {
 	public String layoutSetPrototypeUuid;
 	public boolean layoutSetPrototypeLinkEnabled;
 	public String _companyFallbackVirtualHostname;
-	public String _virtualHostname;
+	public java.util.TreeMap _virtualHostnames;
 
 }
\ No newline at end of file
diff --git a/portal-impl/src/com/liferay/portal/model/impl/LayoutSetImpl.java b/portal-impl/src/com/liferay/portal/model/impl/LayoutSetImpl.java
index a52c67e029e67d..40dff8fd85e1f3 100644
--- a/portal-impl/src/com/liferay/portal/model/impl/LayoutSetImpl.java
+++ b/portal-impl/src/com/liferay/portal/model/impl/LayoutSetImpl.java
@@ -40,6 +40,9 @@
 
 import java.io.IOException;
 
+import java.util.List;
+import java.util.TreeMap;
+
 /**
  * Represents a portal layout set, providing access to the layout set's color
  * schemes, groups, prototypes, themes, and more.
@@ -238,33 +241,73 @@ public String getThemeSetting(String key, String device) {
 	}
 
 	/**
-	 * Returns the name of the layout set's virtual host.
+	 * Returns the name of the layout set's default virtual host.
 	 *
 	 * <p>
 	 * When accessing a layout set that has a the virtual host, the URL elements
 	 * "/web/sitename" or "/group/sitename" can be omitted.
 	 * </p>
 	 *
-	 * @return the layout set's virtual host name, or an empty string if the
-	 *         layout set has no virtual host configured
+	 * @return the layout set's default virtual host name, or an empty string if
+	 *         the layout set has no virtual hosts configured
+	 *
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 *             #getVirtualHostnames()}
 	 */
+	@Deprecated
 	@Override
 	public String getVirtualHostname() {
-		if (_virtualHostname != null) {
-			return _virtualHostname;
+		TreeMap<String, String> virtualHostnames = getVirtualHostnames();
+
+		if (virtualHostnames.isEmpty()) {
+			return StringPool.BLANK;
+		}
+
+		return virtualHostnames.firstKey();
+	}
+
+	/**
+	 * Returns the names of the layout set's virtual hosts.
+	 *
+	 * <p>
+	 * When accessing a layout set that has a the virtual host, the URL elements
+	 * "/web/sitename" or "/group/sitename" can be omitted.
+	 * </p>
+	 *
+	 * @return the layout set's virtual host names, or an empty string if
+	 *         the layout set has no virtual hosts configured
+	 */
+	@Override
+	public TreeMap<String, String> getVirtualHostnames() {
+		if (_virtualHostnames != null) {
+			return _virtualHostnames;
 		}
 
-		VirtualHost virtualHost = VirtualHostLocalServiceUtil.fetchVirtualHost(
-			getCompanyId(), getLayoutSetId());
+		List<VirtualHost> virtualHosts = null;
 
-		if (virtualHost == null) {
-			_virtualHostname = StringPool.BLANK;
+		try {
+			virtualHosts = VirtualHostLocalServiceUtil.getVirtualHosts(
+				getCompanyId(), getLayoutSetId());
+		}
+		catch (PortalException pe) {
+			_log.error(pe, pe);
+		}
+
+		if ((virtualHosts == null) || virtualHosts.isEmpty()) {
+			_virtualHostnames = new TreeMap<>();
 		}
 		else {
-			_virtualHostname = virtualHost.getHostname();
+			TreeMap<String, String> virtualHostNames = new TreeMap<>();
+
+			for (VirtualHost virtualHost : virtualHosts) {
+				virtualHostNames.put(
+					virtualHost.getHostname(), virtualHost.getLanguageId());
+			}
+
+			_virtualHostnames = virtualHostNames;
 		}
 
-		return _virtualHostname;
+		return _virtualHostnames;
 	}
 
 	@Override
@@ -314,10 +357,30 @@ public void setSettingsProperties(UnicodeProperties settingsProperties) {
 	 *
 	 * @param virtualHostname the name of the layout set's virtual host
 	 * @see   #getVirtualHostname()
+	 *
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 *             #setVirtualHostnames(TreeMap)}
+	 */
+	@Deprecated
+	@Override
+	public void setVirtualHostname(final String virtualHostname) {
+		TreeMap<String, String> virtualHostnames = new TreeMap<>();
+
+		virtualHostnames.put(virtualHostname, StringPool.BLANK);
+
+		_virtualHostnames = virtualHostnames;
+	}
+
+	/**
+	 * Sets the names of the layout set's virtual host name and language IDs.
+	 *
+	 * @param virtualHostnames the map of the layout set's virtual host name and
+	 *        language IDs
+	 * @see   #getVirtualHostnames()
 	 */
 	@Override
-	public void setVirtualHostname(String virtualHostname) {
-		_virtualHostname = virtualHostname;
+	public void setVirtualHostnames(TreeMap virtualHostnames) {
+		_virtualHostnames = virtualHostnames;
 	}
 
 	protected Theme getTheme(String device) {
@@ -350,6 +413,6 @@ protected Theme getTheme(String device) {
 	private UnicodeProperties _settingsProperties;
 
 	@CacheField(propagateToInterface = true)
-	private String _virtualHostname;
+	private TreeMap<String, String> _virtualHostnames;
 
 }
\ No newline at end of file
diff --git a/portal-impl/src/com/liferay/portal/model/impl/LayoutSetModelImpl.java b/portal-impl/src/com/liferay/portal/model/impl/LayoutSetModelImpl.java
index 1d96d0004c945c..4c66337374d803 100644
--- a/portal-impl/src/com/liferay/portal/model/impl/LayoutSetModelImpl.java
+++ b/portal-impl/src/com/liferay/portal/model/impl/LayoutSetModelImpl.java
@@ -653,11 +653,11 @@ public void setCompanyFallbackVirtualHostname(
 		String companyFallbackVirtualHostname) {
 	}
 
-	public String getVirtualHostname() {
+	public java.util.TreeMap getVirtualHostnames() {
 		return null;
 	}
 
-	public void setVirtualHostname(String virtualHostname) {
+	public void setVirtualHostnames(java.util.TreeMap virtualHostnames) {
 	}
 
 	public long getColumnBitmask() {
@@ -797,7 +797,7 @@ public void resetOriginalValues() {
 
 		setCompanyFallbackVirtualHostname(null);
 
-		setVirtualHostname(null);
+		setVirtualHostnames(null);
 
 		layoutSetModelImpl._columnBitmask = 0;
 	}
@@ -886,7 +886,7 @@ public CacheModel<LayoutSet> toCacheModel() {
 		layoutSetCacheModel._companyFallbackVirtualHostname =
 			getCompanyFallbackVirtualHostname();
 
-		layoutSetCacheModel._virtualHostname = getVirtualHostname();
+		layoutSetCacheModel._virtualHostnames = getVirtualHostnames();
 
 		return layoutSetCacheModel;
 	}
diff --git a/portal-impl/src/com/liferay/portal/model/impl/VirtualHostCacheModel.java b/portal-impl/src/com/liferay/portal/model/impl/VirtualHostCacheModel.java
index 3da073adcb1bcf..a0b36e4e29fbd4 100644
--- a/portal-impl/src/com/liferay/portal/model/impl/VirtualHostCacheModel.java
+++ b/portal-impl/src/com/liferay/portal/model/impl/VirtualHostCacheModel.java
@@ -75,7 +75,7 @@ public void setMvccVersion(long mvccVersion) {
 
 	@Override
 	public String toString() {
-		StringBundler sb = new StringBundler(11);
+		StringBundler sb = new StringBundler(15);
 
 		sb.append("{mvccVersion=");
 		sb.append(mvccVersion);
@@ -87,6 +87,10 @@ public String toString() {
 		sb.append(layoutSetId);
 		sb.append(", hostname=");
 		sb.append(hostname);
+		sb.append(", defaultVirtualHost=");
+		sb.append(defaultVirtualHost);
+		sb.append(", languageId=");
+		sb.append(languageId);
 		sb.append("}");
 
 		return sb.toString();
@@ -108,6 +112,15 @@ public VirtualHost toEntityModel() {
 			virtualHostImpl.setHostname(hostname);
 		}
 
+		virtualHostImpl.setDefaultVirtualHost(defaultVirtualHost);
+
+		if (languageId == null) {
+			virtualHostImpl.setLanguageId("");
+		}
+		else {
+			virtualHostImpl.setLanguageId(languageId);
+		}
+
 		virtualHostImpl.resetOriginalValues();
 
 		return virtualHostImpl;
@@ -123,6 +136,9 @@ public void readExternal(ObjectInput objectInput) throws IOException {
 
 		layoutSetId = objectInput.readLong();
 		hostname = objectInput.readUTF();
+
+		defaultVirtualHost = objectInput.readBoolean();
+		languageId = objectInput.readUTF();
 	}
 
 	@Override
@@ -141,6 +157,15 @@ public void writeExternal(ObjectOutput objectOutput) throws IOException {
 		else {
 			objectOutput.writeUTF(hostname);
 		}
+
+		objectOutput.writeBoolean(defaultVirtualHost);
+
+		if (languageId == null) {
+			objectOutput.writeUTF("");
+		}
+		else {
+			objectOutput.writeUTF(languageId);
+		}
 	}
 
 	public long mvccVersion;
@@ -148,5 +173,7 @@ public void writeExternal(ObjectOutput objectOutput) throws IOException {
 	public long companyId;
 	public long layoutSetId;
 	public String hostname;
+	public boolean defaultVirtualHost;
+	public String languageId;
 
 }
\ No newline at end of file
diff --git a/portal-impl/src/com/liferay/portal/model/impl/VirtualHostModelImpl.java b/portal-impl/src/com/liferay/portal/model/impl/VirtualHostModelImpl.java
index daca486bc58bcf..5280d082a56139 100644
--- a/portal-impl/src/com/liferay/portal/model/impl/VirtualHostModelImpl.java
+++ b/portal-impl/src/com/liferay/portal/model/impl/VirtualHostModelImpl.java
@@ -65,7 +65,8 @@ public class VirtualHostModelImpl
 	public static final Object[][] TABLE_COLUMNS = {
 		{"mvccVersion", Types.BIGINT}, {"virtualHostId", Types.BIGINT},
 		{"companyId", Types.BIGINT}, {"layoutSetId", Types.BIGINT},
-		{"hostname", Types.VARCHAR}
+		{"hostname", Types.VARCHAR}, {"defaultVirtualHost", Types.BOOLEAN},
+		{"languageId", Types.VARCHAR}
 	};
 
 	public static final Map<String, Integer> TABLE_COLUMNS_MAP =
@@ -77,18 +78,20 @@ public class VirtualHostModelImpl
 		TABLE_COLUMNS_MAP.put("companyId", Types.BIGINT);
 		TABLE_COLUMNS_MAP.put("layoutSetId", Types.BIGINT);
 		TABLE_COLUMNS_MAP.put("hostname", Types.VARCHAR);
+		TABLE_COLUMNS_MAP.put("defaultVirtualHost", Types.BOOLEAN);
+		TABLE_COLUMNS_MAP.put("languageId", Types.VARCHAR);
 	}
 
 	public static final String TABLE_SQL_CREATE =
-		"create table VirtualHost (mvccVersion LONG default 0 not null,virtualHostId LONG not null primary key,companyId LONG,layoutSetId LONG,hostname VARCHAR(200) null)";
+		"create table VirtualHost (mvccVersion LONG default 0 not null,virtualHostId LONG not null primary key,companyId LONG,layoutSetId LONG,hostname VARCHAR(200) null,defaultVirtualHost BOOLEAN,languageId VARCHAR(75) null)";
 
 	public static final String TABLE_SQL_DROP = "drop table VirtualHost";
 
 	public static final String ORDER_BY_JPQL =
-		" ORDER BY virtualHost.virtualHostId ASC";
+		" ORDER BY virtualHost.virtualHostId DESC";
 
 	public static final String ORDER_BY_SQL =
-		" ORDER BY VirtualHost.virtualHostId ASC";
+		" ORDER BY VirtualHost.virtualHostId DESC";
 
 	public static final String DATA_SOURCE = "liferayDataSource";
 
@@ -113,11 +116,13 @@ public class VirtualHostModelImpl
 
 	public static final long COMPANYID_COLUMN_BITMASK = 1L;
 
-	public static final long HOSTNAME_COLUMN_BITMASK = 2L;
+	public static final long DEFAULTVIRTUALHOST_COLUMN_BITMASK = 2L;
 
-	public static final long LAYOUTSETID_COLUMN_BITMASK = 4L;
+	public static final long HOSTNAME_COLUMN_BITMASK = 4L;
 
-	public static final long VIRTUALHOSTID_COLUMN_BITMASK = 8L;
+	public static final long LAYOUTSETID_COLUMN_BITMASK = 8L;
+
+	public static final long VIRTUALHOSTID_COLUMN_BITMASK = 16L;
 
 	public static final long LOCK_EXPIRATION_TIME = GetterUtil.getLong(
 		com.liferay.portal.util.PropsUtil.get(
@@ -271,6 +276,16 @@ public void setModelAttributes(Map<String, Object> attributes) {
 		attributeSetterBiConsumers.put(
 			"hostname",
 			(BiConsumer<VirtualHost, String>)VirtualHost::setHostname);
+		attributeGetterFunctions.put(
+			"defaultVirtualHost", VirtualHost::getDefaultVirtualHost);
+		attributeSetterBiConsumers.put(
+			"defaultVirtualHost",
+			(BiConsumer<VirtualHost, Boolean>)
+				VirtualHost::setDefaultVirtualHost);
+		attributeGetterFunctions.put("languageId", VirtualHost::getLanguageId);
+		attributeSetterBiConsumers.put(
+			"languageId",
+			(BiConsumer<VirtualHost, String>)VirtualHost::setLanguageId);
 
 		_attributeGetterFunctions = Collections.unmodifiableMap(
 			attributeGetterFunctions);
@@ -295,6 +310,8 @@ public long getVirtualHostId() {
 
 	@Override
 	public void setVirtualHostId(long virtualHostId) {
+		_columnBitmask = -1L;
+
 		_virtualHostId = virtualHostId;
 	}
 
@@ -367,6 +384,48 @@ public String getOriginalHostname() {
 		return GetterUtil.getString(_originalHostname);
 	}
 
+	@Override
+	public boolean getDefaultVirtualHost() {
+		return _defaultVirtualHost;
+	}
+
+	@Override
+	public boolean isDefaultVirtualHost() {
+		return _defaultVirtualHost;
+	}
+
+	@Override
+	public void setDefaultVirtualHost(boolean defaultVirtualHost) {
+		_columnBitmask |= DEFAULTVIRTUALHOST_COLUMN_BITMASK;
+
+		if (!_setOriginalDefaultVirtualHost) {
+			_setOriginalDefaultVirtualHost = true;
+
+			_originalDefaultVirtualHost = _defaultVirtualHost;
+		}
+
+		_defaultVirtualHost = defaultVirtualHost;
+	}
+
+	public boolean getOriginalDefaultVirtualHost() {
+		return _originalDefaultVirtualHost;
+	}
+
+	@Override
+	public String getLanguageId() {
+		if (_languageId == null) {
+			return "";
+		}
+		else {
+			return _languageId;
+		}
+	}
+
+	@Override
+	public void setLanguageId(String languageId) {
+		_languageId = languageId;
+	}
+
 	public long getColumnBitmask() {
 		return _columnBitmask;
 	}
@@ -408,6 +467,8 @@ public Object clone() {
 		virtualHostImpl.setCompanyId(getCompanyId());
 		virtualHostImpl.setLayoutSetId(getLayoutSetId());
 		virtualHostImpl.setHostname(getHostname());
+		virtualHostImpl.setDefaultVirtualHost(isDefaultVirtualHost());
+		virtualHostImpl.setLanguageId(getLanguageId());
 
 		virtualHostImpl.resetOriginalValues();
 
@@ -416,17 +477,25 @@ public Object clone() {
 
 	@Override
 	public int compareTo(VirtualHost virtualHost) {
-		long primaryKey = virtualHost.getPrimaryKey();
+		int value = 0;
 
-		if (getPrimaryKey() < primaryKey) {
-			return -1;
+		if (getVirtualHostId() < virtualHost.getVirtualHostId()) {
+			value = -1;
 		}
-		else if (getPrimaryKey() > primaryKey) {
-			return 1;
+		else if (getVirtualHostId() > virtualHost.getVirtualHostId()) {
+			value = 1;
 		}
 		else {
-			return 0;
+			value = 0;
 		}
+
+		value = value * -1;
+
+		if (value != 0) {
+			return value;
+		}
+
+		return 0;
 	}
 
 	@Override
@@ -482,6 +551,11 @@ public void resetOriginalValues() {
 
 		virtualHostModelImpl._originalHostname = virtualHostModelImpl._hostname;
 
+		virtualHostModelImpl._originalDefaultVirtualHost =
+			virtualHostModelImpl._defaultVirtualHost;
+
+		virtualHostModelImpl._setOriginalDefaultVirtualHost = false;
+
 		virtualHostModelImpl._columnBitmask = 0;
 	}
 
@@ -506,6 +580,16 @@ public CacheModel<VirtualHost> toCacheModel() {
 			virtualHostCacheModel.hostname = null;
 		}
 
+		virtualHostCacheModel.defaultVirtualHost = isDefaultVirtualHost();
+
+		virtualHostCacheModel.languageId = getLanguageId();
+
+		String languageId = virtualHostCacheModel.languageId;
+
+		if ((languageId != null) && (languageId.length() == 0)) {
+			virtualHostCacheModel.languageId = null;
+		}
+
 		return virtualHostCacheModel;
 	}
 
@@ -589,6 +673,10 @@ private static class EscapedModelProxyProviderFunctionHolder {
 	private boolean _setOriginalLayoutSetId;
 	private String _hostname;
 	private String _originalHostname;
+	private boolean _defaultVirtualHost;
+	private boolean _originalDefaultVirtualHost;
+	private boolean _setOriginalDefaultVirtualHost;
+	private String _languageId;
 	private long _columnBitmask;
 	private VirtualHost _escapedModel;
 
diff --git a/portal-impl/src/com/liferay/portal/service.xml b/portal-impl/src/com/liferay/portal/service.xml
index 41abfa1700ad4c..92e6dccce8c483 100644
--- a/portal-impl/src/com/liferay/portal/service.xml
+++ b/portal-impl/src/com/liferay/portal/service.xml
@@ -3130,15 +3130,28 @@
 
 		<column name="layoutSetId" type="long" />
 		<column name="hostname" type="String" />
+		<column name="defaultVirtualHost" type="boolean" />
+		<column name="languageId" type="String" />
+
+		<!-- Order -->
+
+		<order by="desc">
+			<order-column name="virtualHostId" />
+		</order>
 
 		<!-- Finder methods -->
 
 		<finder name="Hostname" return-type="VirtualHost" unique="true">
 			<finder-column name="hostname" />
 		</finder>
-		<finder name="C_L" return-type="VirtualHost" unique="true">
+		<finder name="C_L" return-type="Collection">
+			<finder-column name="companyId" />
+			<finder-column name="layoutSetId" />
+		</finder>
+		<finder name="C_L_D" return-type="VirtualHost">
 			<finder-column name="companyId" />
 			<finder-column name="layoutSetId" />
+			<finder-column name="defaultVirtualHost" />
 		</finder>
 
 		<!-- References -->
@@ -3355,6 +3368,7 @@
 		<exception>AddressCity</exception>
 		<exception>AddressStreet</exception>
 		<exception>AddressZip</exception>
+		<exception>AvailableLocale</exception>
 		<exception>CompanyMaxUsers</exception>
 		<exception>CompanyMx</exception>
 		<exception>CompanyVirtualHost</exception>
diff --git a/portal-impl/src/com/liferay/portal/service/base/LayoutLocalServiceBaseImpl.java b/portal-impl/src/com/liferay/portal/service/base/LayoutLocalServiceBaseImpl.java
index 1261769aa20ca6..b5538188161843 100644
--- a/portal-impl/src/com/liferay/portal/service/base/LayoutLocalServiceBaseImpl.java
+++ b/portal-impl/src/com/liferay/portal/service/base/LayoutLocalServiceBaseImpl.java
@@ -24,7 +24,6 @@
 import com.liferay.exportimport.kernel.lar.StagedModelType;
 import com.liferay.exportimport.kernel.service.persistence.ExportImportConfigurationFinder;
 import com.liferay.exportimport.kernel.service.persistence.ExportImportConfigurationPersistence;
-import com.liferay.petra.function.UnsafeFunction;
 import com.liferay.portal.kernel.bean.BeanReference;
 import com.liferay.portal.kernel.dao.db.DB;
 import com.liferay.portal.kernel.dao.db.DBManagerUtil;
@@ -69,7 +68,6 @@
 import com.liferay.portal.kernel.service.persistence.UserGroupFinder;
 import com.liferay.portal.kernel.service.persistence.UserGroupPersistence;
 import com.liferay.portal.kernel.service.persistence.UserPersistence;
-import com.liferay.portal.kernel.service.persistence.change.tracking.CTPersistence;
 import com.liferay.portal.kernel.transaction.Transactional;
 import com.liferay.portal.kernel.util.OrderByComparator;
 import com.liferay.portal.kernel.util.PortalUtil;
@@ -1513,24 +1511,10 @@ public String getOSGiServiceIdentifier() {
 		return LayoutLocalService.class.getName();
 	}
 
-	@Override
-	public CTPersistence<Layout> getCTPersistence() {
-		return layoutPersistence;
-	}
-
-	@Override
-	public Class<Layout> getModelClass() {
+	protected Class<?> getModelClass() {
 		return Layout.class;
 	}
 
-	@Override
-	public <R, E extends Throwable> R updateWithUnsafeFunction(
-			UnsafeFunction<CTPersistence<Layout>, R, E> updateUnsafeFunction)
-		throws E {
-
-		return updateUnsafeFunction.apply(layoutPersistence);
-	}
-
 	protected String getModelClassName() {
 		return Layout.class.getName();
 	}
diff --git a/portal-impl/src/com/liferay/portal/service/http/LayoutSetServiceHttp.java b/portal-impl/src/com/liferay/portal/service/http/LayoutSetServiceHttp.java
index 811cff23e87c65..6f80f35b52b24d 100644
--- a/portal-impl/src/com/liferay/portal/service/http/LayoutSetServiceHttp.java
+++ b/portal-impl/src/com/liferay/portal/service/http/LayoutSetServiceHttp.java
@@ -348,6 +348,45 @@ public static com.liferay.portal.kernel.model.LayoutSet updateVirtualHost(
 		}
 	}
 
+	public static com.liferay.portal.kernel.model.LayoutSet updateVirtualHosts(
+			HttpPrincipal httpPrincipal, long groupId, boolean privateLayout,
+			java.util.TreeMap<String, String> virtualHostnames)
+		throws com.liferay.portal.kernel.exception.PortalException {
+
+		try {
+			MethodKey methodKey = new MethodKey(
+				LayoutSetServiceUtil.class, "updateVirtualHosts",
+				_updateVirtualHostsParameterTypes8);
+
+			MethodHandler methodHandler = new MethodHandler(
+				methodKey, groupId, privateLayout, virtualHostnames);
+
+			Object returnObj = null;
+
+			try {
+				returnObj = TunnelUtil.invoke(httpPrincipal, methodHandler);
+			}
+			catch (Exception e) {
+				if (e instanceof
+						com.liferay.portal.kernel.exception.PortalException) {
+
+					throw (com.liferay.portal.kernel.exception.PortalException)
+						e;
+				}
+
+				throw new com.liferay.portal.kernel.exception.SystemException(
+					e);
+			}
+
+			return (com.liferay.portal.kernel.model.LayoutSet)returnObj;
+		}
+		catch (com.liferay.portal.kernel.exception.SystemException se) {
+			_log.error(se, se);
+
+			throw se;
+		}
+	}
+
 	private static Log _log = LogFactoryUtil.getLog(LayoutSetServiceHttp.class);
 
 	private static final Class<?>[]
@@ -375,5 +414,7 @@ public static com.liferay.portal.kernel.model.LayoutSet updateVirtualHost(
 		new Class[] {long.class, boolean.class, String.class};
 	private static final Class<?>[] _updateVirtualHostParameterTypes7 =
 		new Class[] {long.class, boolean.class, String.class};
+	private static final Class<?>[] _updateVirtualHostsParameterTypes8 =
+		new Class[] {long.class, boolean.class, java.util.TreeMap.class};
 
 }
\ No newline at end of file
diff --git a/portal-impl/src/com/liferay/portal/service/http/LayoutSetServiceSoap.java b/portal-impl/src/com/liferay/portal/service/http/LayoutSetServiceSoap.java
index 61a40dc053e23a..c4868a5d261b8a 100644
--- a/portal-impl/src/com/liferay/portal/service/http/LayoutSetServiceSoap.java
+++ b/portal-impl/src/com/liferay/portal/service/http/LayoutSetServiceSoap.java
@@ -152,6 +152,11 @@ public static com.liferay.portal.kernel.model.LayoutSetSoap updateSettings(
 		}
 	}
 
+	/**
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 #updateVirtualHosts(long, boolean, TreeMap)}
+	 */
+	@Deprecated
 	public static com.liferay.portal.kernel.model.LayoutSetSoap
 			updateVirtualHost(
 				long groupId, boolean privateLayout, String virtualHost)
@@ -172,6 +177,27 @@ public static com.liferay.portal.kernel.model.LayoutSetSoap updateSettings(
 		}
 	}
 
+	public static com.liferay.portal.kernel.model.LayoutSetSoap
+			updateVirtualHosts(
+				long groupId, boolean privateLayout,
+				java.util.TreeMap<String, String> virtualHostnames)
+		throws RemoteException {
+
+		try {
+			com.liferay.portal.kernel.model.LayoutSet returnValue =
+				LayoutSetServiceUtil.updateVirtualHosts(
+					groupId, privateLayout, virtualHostnames);
+
+			return com.liferay.portal.kernel.model.LayoutSetSoap.toSoapModel(
+				returnValue);
+		}
+		catch (Exception e) {
+			_log.error(e, e);
+
+			throw new RemoteException(e.getMessage());
+		}
+	}
+
 	private static Log _log = LogFactoryUtil.getLog(LayoutSetServiceSoap.class);
 
 }
\ No newline at end of file
diff --git a/portal-impl/src/com/liferay/portal/service/impl/CompanyLocalServiceImpl.java b/portal-impl/src/com/liferay/portal/service/impl/CompanyLocalServiceImpl.java
index e7ecc492a99672..43b010e7c12229 100644
--- a/portal-impl/src/com/liferay/portal/service/impl/CompanyLocalServiceImpl.java
+++ b/portal-impl/src/com/liferay/portal/service/impl/CompanyLocalServiceImpl.java
@@ -111,6 +111,7 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.TimeZone;
+import java.util.TreeMap;
 import java.util.concurrent.Callable;
 
 import javax.portlet.PortletException;
@@ -1542,8 +1543,12 @@ protected Company updateVirtualHostname(
 				virtualHostname);
 
 			if (virtualHost == null) {
-				virtualHostLocalService.updateVirtualHost(
-					companyId, 0, virtualHostname);
+				TreeMap<String, String> virtualHostnames = new TreeMap<>();
+
+				virtualHostnames.put(virtualHostname, StringPool.BLANK);
+
+				virtualHostLocalService.updateVirtualHosts(
+					companyId, 0, virtualHostnames);
 			}
 			else {
 				if ((virtualHost.getCompanyId() != companyId) ||
@@ -1554,11 +1559,13 @@ protected Company updateVirtualHostname(
 			}
 		}
 		else {
-			VirtualHost virtualHost = virtualHostPersistence.fetchByC_L(
+			List<VirtualHost> virtualHosts = virtualHostPersistence.findByC_L(
 				companyId, 0);
 
-			if (virtualHost != null) {
-				virtualHostPersistence.remove(virtualHost);
+			if (!virtualHosts.isEmpty()) {
+				for (VirtualHost virtualHost : virtualHosts) {
+					virtualHostPersistence.remove(virtualHost);
+				}
 			}
 		}
 
diff --git a/portal-impl/src/com/liferay/portal/service/impl/LayoutSetLocalServiceImpl.java b/portal-impl/src/com/liferay/portal/service/impl/LayoutSetLocalServiceImpl.java
index bea53c742775ad..0d9b0112324a22 100755
--- a/portal-impl/src/com/liferay/portal/service/impl/LayoutSetLocalServiceImpl.java
+++ b/portal-impl/src/com/liferay/portal/service/impl/LayoutSetLocalServiceImpl.java
@@ -19,7 +19,6 @@
 import com.liferay.portal.kernel.dao.orm.EntityCacheUtil;
 import com.liferay.portal.kernel.exception.LayoutSetVirtualHostException;
 import com.liferay.portal.kernel.exception.NoSuchImageException;
-import com.liferay.portal.kernel.exception.NoSuchVirtualHostException;
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
 import com.liferay.portal.kernel.log.Log;
@@ -52,6 +51,7 @@
 
 import java.util.Date;
 import java.util.List;
+import java.util.TreeMap;
 import java.util.concurrent.Callable;
 
 /**
@@ -138,18 +138,8 @@ public void deleteLayoutSet(
 
 		// Virtual host
 
-		try {
-			virtualHostPersistence.removeByC_L(
-				layoutSet.getCompanyId(), layoutSet.getLayoutSetId());
-		}
-		catch (NoSuchVirtualHostException nsvhe) {
-
-			// LPS-52675
-
-			if (_log.isDebugEnabled()) {
-				_log.debug(nsvhe, nsvhe);
-			}
-		}
+		virtualHostPersistence.removeByC_L(
+			layoutSet.getCompanyId(), layoutSet.getLayoutSetId());
 	}
 
 	@Override
@@ -456,71 +446,63 @@ public LayoutSet updateSettings(
 		return layoutSet;
 	}
 
+	/**
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 *             #updateVirtualHosts(long, boolean, TreeMap)}
+	 */
+	@Deprecated
 	@Override
 	public LayoutSet updateVirtualHost(
 			long groupId, boolean privateLayout, String virtualHostname)
 		throws PortalException {
 
-		virtualHostname = StringUtil.toLowerCase(
-			StringUtil.trim(virtualHostname));
+		TreeMap<String, String> hostnameMap = new TreeMap<>();
+
+		hostnameMap.put(virtualHostname, StringPool.BLANK);
 
-		if (Validator.isNotNull(virtualHostname) &&
-			!Validator.isDomain(virtualHostname)) {
+		return updateVirtualHosts(groupId, privateLayout, hostnameMap);
+	}
 
-			throw new LayoutSetVirtualHostException();
+	@Override
+	public LayoutSet updateVirtualHosts(
+			long groupId, boolean privateLayout,
+			TreeMap<String, String> virtualHostnames)
+		throws PortalException {
+
+		for (String curVirtualHostname : virtualHostnames.keySet()) {
+			if (!Validator.isDomain(curVirtualHostname)) {
+				throw new LayoutSetVirtualHostException(
+					"Invalid host name {" + curVirtualHostname + "}");
+			}
 		}
 
 		LayoutSet layoutSet = layoutSetPersistence.findByG_P(
 			groupId, privateLayout);
 
-		if (Validator.isNotNull(virtualHostname)) {
-			VirtualHost virtualHost = virtualHostPersistence.fetchByHostname(
-				virtualHostname);
-
-			if (virtualHost == null) {
-				virtualHostLocalService.updateVirtualHost(
-					layoutSet.getCompanyId(), layoutSet.getLayoutSetId(),
-					virtualHostname);
-			}
-			else {
-				if ((virtualHost.getCompanyId() != layoutSet.getCompanyId()) ||
-					(virtualHost.getLayoutSetId() !=
-						layoutSet.getLayoutSetId())) {
-
-					throw new LayoutSetVirtualHostException();
-				}
-			}
+		if (!virtualHostnames.isEmpty()) {
+			virtualHostLocalService.updateVirtualHosts(
+				layoutSet.getCompanyId(), layoutSet.getLayoutSetId(),
+				virtualHostnames);
 		}
 		else {
-			try {
-				virtualHostPersistence.removeByC_L(
-					layoutSet.getCompanyId(), layoutSet.getLayoutSetId());
-
-				layoutSetPersistence.clearCache(layoutSet);
-
-				TransactionCommitCallbackUtil.registerCallback(
-					new Callable<Void>() {
+			virtualHostPersistence.removeByC_L(
+				layoutSet.getCompanyId(), layoutSet.getLayoutSetId());
 
-						@Override
-						public Void call() {
-							EntityCacheUtil.removeResult(
-								LayoutSetModelImpl.ENTITY_CACHE_ENABLED,
-								LayoutSetImpl.class,
-								layoutSet.getLayoutSetId());
+			layoutSetPersistence.clearCache(layoutSet);
 
-							return null;
-						}
+			TransactionCommitCallbackUtil.registerCallback(
+				new Callable<Void>() {
 
-					});
-			}
-			catch (NoSuchVirtualHostException nsvhe) {
+					@Override
+					public Void call() {
+						EntityCacheUtil.removeResult(
+							LayoutSetModelImpl.ENTITY_CACHE_ENABLED,
+							LayoutSetImpl.class, layoutSet.getLayoutSetId());
 
-				// LPS-52675
+						return null;
+					}
 
-				if (_log.isDebugEnabled()) {
-					_log.debug(nsvhe, nsvhe);
-				}
-			}
+				});
 		}
 
 		return layoutSet;
diff --git a/portal-impl/src/com/liferay/portal/service/impl/LayoutSetServiceImpl.java b/portal-impl/src/com/liferay/portal/service/impl/LayoutSetServiceImpl.java
index 7b3db3d57dbbcb..cca63a3758f02f 100644
--- a/portal-impl/src/com/liferay/portal/service/impl/LayoutSetServiceImpl.java
+++ b/portal-impl/src/com/liferay/portal/service/impl/LayoutSetServiceImpl.java
@@ -25,6 +25,8 @@
 import java.io.File;
 import java.io.InputStream;
 
+import java.util.TreeMap;
+
 /**
  * @author Brian Wing Shun Chan
  */
@@ -146,6 +148,11 @@ public LayoutSet updateSettings(
 			groupId, privateLayout, settings);
 	}
 
+	/**
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 *             #updateVirtualHosts(long, boolean, TreeMap)}
+	 */
+	@Deprecated
 	@Override
 	public LayoutSet updateVirtualHost(
 			long groupId, boolean privateLayout, String virtualHost)
@@ -158,4 +165,17 @@ public LayoutSet updateVirtualHost(
 			groupId, privateLayout, virtualHost);
 	}
 
+	@Override
+	public LayoutSet updateVirtualHosts(
+			long groupId, boolean privateLayout,
+			TreeMap<String, String> virtualHostnames)
+		throws PortalException {
+
+		GroupPermissionUtil.check(
+			getPermissionChecker(), groupId, ActionKeys.UPDATE);
+
+		return layoutSetLocalService.updateVirtualHosts(
+			groupId, privateLayout, virtualHostnames);
+	}
+
 }
\ No newline at end of file
diff --git a/portal-impl/src/com/liferay/portal/service/impl/VirtualHostLocalServiceImpl.java b/portal-impl/src/com/liferay/portal/service/impl/VirtualHostLocalServiceImpl.java
index 3209394fe97922..a8242c313110dc 100644
--- a/portal-impl/src/com/liferay/portal/service/impl/VirtualHostLocalServiceImpl.java
+++ b/portal-impl/src/com/liferay/portal/service/impl/VirtualHostLocalServiceImpl.java
@@ -14,30 +14,48 @@
 
 package com.liferay.portal.service.impl;
 
+import com.liferay.petra.reflect.ReflectionUtil;
+import com.liferay.petra.string.StringPool;
 import com.liferay.portal.kernel.dao.orm.EntityCacheUtil;
+import com.liferay.portal.kernel.exception.AvailableLocaleException;
 import com.liferay.portal.kernel.exception.PortalException;
+import com.liferay.portal.kernel.language.LanguageUtil;
 import com.liferay.portal.kernel.model.Company;
 import com.liferay.portal.kernel.model.Group;
 import com.liferay.portal.kernel.model.LayoutSet;
 import com.liferay.portal.kernel.model.VirtualHost;
 import com.liferay.portal.kernel.transaction.TransactionCommitCallbackUtil;
+import com.liferay.portal.kernel.util.LocaleUtil;
 import com.liferay.portal.kernel.util.Validator;
 import com.liferay.portal.model.impl.LayoutSetImpl;
 import com.liferay.portal.model.impl.LayoutSetModelImpl;
 import com.liferay.portal.service.base.VirtualHostLocalServiceBaseImpl;
 import com.liferay.portal.util.PropsValues;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+import java.util.TreeMap;
 import java.util.concurrent.Callable;
 
 /**
  * @author Alexander Chow
+ * @author Raymond Augé
  */
 public class VirtualHostLocalServiceImpl
 	extends VirtualHostLocalServiceBaseImpl {
 
+	/**
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 *             #getVirtualHosts(long, long)}
+	 */
+	@Deprecated
 	@Override
 	public VirtualHost fetchVirtualHost(long companyId, long layoutSetId) {
-		return virtualHostPersistence.fetchByC_L(companyId, layoutSetId);
+		return virtualHostPersistence.fetchByC_L_D(
+			companyId, layoutSetId, true);
 	}
 
 	@Override
@@ -45,11 +63,16 @@ public VirtualHost fetchVirtualHost(String hostname) {
 		return virtualHostPersistence.fetchByHostname(hostname);
 	}
 
+	/**
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 *             #getVirtualHosts(long, long)}
+	 */
+	@Deprecated
 	@Override
 	public VirtualHost getVirtualHost(long companyId, long layoutSetId)
 		throws PortalException {
 
-		return virtualHostPersistence.findByC_L(companyId, layoutSetId);
+		return virtualHostPersistence.findByC_L_D(companyId, layoutSetId, true);
 	}
 
 	@Override
@@ -57,25 +80,111 @@ public VirtualHost getVirtualHost(String hostname) throws PortalException {
 		return virtualHostPersistence.findByHostname(hostname);
 	}
 
+	@Override
+	public List<VirtualHost> getVirtualHosts(long companyId, long layoutSetId)
+		throws PortalException {
+
+		return virtualHostPersistence.findByC_L(companyId, layoutSetId);
+	}
+
+	/**
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 *             #updateVirtualHosts(long, long, TreeMap)}
+	 */
+	@Deprecated
 	@Override
 	public VirtualHost updateVirtualHost(
 		long companyId, final long layoutSetId, String hostname) {
 
-		VirtualHost virtualHost = virtualHostPersistence.fetchByC_L(
-			companyId, layoutSetId);
+		TreeMap<String, String> hostnameMap = new TreeMap<>();
+
+		hostnameMap.put(hostname, StringPool.BLANK);
+
+		List<VirtualHost> virtualHosts = updateVirtualHosts(
+			companyId, layoutSetId, hostnameMap);
+
+		if (virtualHosts.isEmpty()) {
+			return null;
+		}
+
+		return virtualHosts.get(0);
+	}
+
+	@Override
+	public List<VirtualHost> updateVirtualHosts(
+		long companyId, final long layoutSetId,
+		TreeMap<String, String> hostnameMap) {
+
+		LayoutSet layoutSet = layoutSetPersistence.fetchByPrimaryKey(
+			layoutSetId);
+
+		Set<Locale> availableLocales = LanguageUtil.getAvailableLocales();
+
+		if (layoutSet != null) {
+			availableLocales = LanguageUtil.getAvailableLocales(
+				layoutSet.getGroupId());
+		}
+
+		List<VirtualHost> virtualHosts = new ArrayList<>(
+			virtualHostPersistence.findByC_L(companyId, layoutSetId));
 
-		if (virtualHost == null) {
-			long virtualHostId = counterLocalService.increment();
+		List<String> hostnames = new ArrayList<>(hostnameMap.navigableKeySet());
 
-			virtualHost = virtualHostPersistence.create(virtualHostId);
+		boolean first = true;
 
-			virtualHost.setCompanyId(companyId);
-			virtualHost.setLayoutSetId(layoutSetId);
+		for (String curHostname : hostnames) {
+			VirtualHost virtualHost = null;
+
+			for (VirtualHost curVirtualHost : virtualHosts) {
+				if (curHostname.equals(curVirtualHost.getHostname())) {
+					virtualHost = curVirtualHost;
+
+					break;
+				}
+			}
+
+			if (virtualHost == null) {
+				long virtualHostId = counterLocalService.increment();
+
+				virtualHost = virtualHostPersistence.create(virtualHostId);
+
+				virtualHost.setCompanyId(companyId);
+				virtualHost.setLayoutSetId(layoutSetId);
+				virtualHost.setHostname(curHostname);
+
+				virtualHosts.add(virtualHost);
+			}
+
+			String languageId = hostnameMap.get(curHostname);
+
+			Locale locale = LocaleUtil.fromLanguageId(languageId);
+
+			if (!availableLocales.contains(locale)) {
+				ReflectionUtil.throwException(
+					new AvailableLocaleException(languageId));
+			}
+
+			virtualHost.setDefaultVirtualHost(first);
+			virtualHost.setLanguageId(languageId);
+
+			first = false;
+
+			virtualHostPersistence.update(virtualHost);
 		}
 
-		virtualHost.setHostname(hostname);
+		Iterator<VirtualHost> itr = virtualHosts.iterator();
 
-		virtualHostPersistence.update(virtualHost);
+		while (itr.hasNext()) {
+			VirtualHost virtualHost = itr.next();
+
+			if (!hostnames.contains(virtualHost.getHostname())) {
+				itr.remove();
+
+				virtualHostPersistence.remove(virtualHost);
+			}
+		}
+
+		virtualHostPersistence.cacheResult(virtualHosts);
 
 		final Company company = companyPersistence.fetchByPrimaryKey(companyId);
 
@@ -97,9 +206,6 @@ public Void call() throws Exception {
 			companyPersistence.clearCache(company);
 		}
 
-		LayoutSet layoutSet = layoutSetPersistence.fetchByPrimaryKey(
-			layoutSetId);
-
 		if ((layoutSet == null) &&
 			Validator.isNotNull(PropsValues.VIRTUAL_HOSTS_DEFAULT_SITE_NAME)) {
 
@@ -130,7 +236,7 @@ public Void call() {
 				});
 		}
 
-		return virtualHost;
+		return virtualHosts;
 	}
 
 }
\ No newline at end of file
diff --git a/portal-impl/src/com/liferay/portal/service/persistence/impl/LayoutPersistenceImpl.java b/portal-impl/src/com/liferay/portal/service/persistence/impl/LayoutPersistenceImpl.java
index e68edc50c41bdf..07ce5093d64134 100644
--- a/portal-impl/src/com/liferay/portal/service/persistence/impl/LayoutPersistenceImpl.java
+++ b/portal-impl/src/com/liferay/portal/service/persistence/impl/LayoutPersistenceImpl.java
@@ -33,7 +33,6 @@
 import com.liferay.portal.kernel.service.ServiceContext;
 import com.liferay.portal.kernel.service.ServiceContextThreadLocal;
 import com.liferay.portal.kernel.service.persistence.LayoutPersistence;
-import com.liferay.portal.kernel.service.persistence.change.tracking.helper.CTPersistenceHelperUtil;
 import com.liferay.portal.kernel.service.persistence.impl.BasePersistenceImpl;
 import com.liferay.portal.kernel.util.ArrayUtil;
 import com.liferay.portal.kernel.util.OrderByComparator;
@@ -53,7 +52,6 @@
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -167,27 +165,24 @@ public List<Layout> findByUuid(
 		FinderPath finderPath = null;
 		Object[] finderArgs = null;
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
 		if ((start == QueryUtil.ALL_POS) && (end == QueryUtil.ALL_POS) &&
 			(orderByComparator == null)) {
 
 			pagination = false;
 
-			if (useFinderCache && productionMode) {
+			if (useFinderCache) {
 				finderPath = _finderPathWithoutPaginationFindByUuid;
 				finderArgs = new Object[] {uuid};
 			}
 		}
-		else if (useFinderCache && productionMode) {
+		else if (useFinderCache) {
 			finderPath = _finderPathWithPaginationFindByUuid;
 			finderArgs = new Object[] {uuid, start, end, orderByComparator};
 		}
 
 		List<Layout> list = null;
 
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			list = (List<Layout>)FinderCacheUtil.getResult(
 				finderPath, finderArgs, this);
 
@@ -264,12 +259,12 @@ else if (pagination) {
 
 				cacheResult(list);
 
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.putResult(finderPath, finderArgs, list);
 				}
 			}
 			catch (Exception e) {
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.removeResult(finderPath, finderArgs);
 				}
 
@@ -578,22 +573,12 @@ public void removeByUuid(String uuid) {
 	public int countByUuid(String uuid) {
 		uuid = Objects.toString(uuid, "");
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
-		FinderPath finderPath = null;
-		Object[] finderArgs = null;
-
-		Long count = null;
-
-		if (productionMode) {
-			finderPath = _finderPathCountByUuid;
+		FinderPath finderPath = _finderPathCountByUuid;
 
-			finderArgs = new Object[] {uuid};
+		Object[] finderArgs = new Object[] {uuid};
 
-			count = (Long)FinderCacheUtil.getResult(
-				finderPath, finderArgs, this);
-		}
+		Long count = (Long)FinderCacheUtil.getResult(
+			finderPath, finderArgs, this);
 
 		if (count == null) {
 			StringBundler query = new StringBundler(2);
@@ -628,14 +613,10 @@ public int countByUuid(String uuid) {
 
 				count = (Long)q.uniqueResult();
 
-				if (productionMode) {
-					FinderCacheUtil.putResult(finderPath, finderArgs, count);
-				}
+				FinderCacheUtil.putResult(finderPath, finderArgs, count);
 			}
 			catch (Exception e) {
-				if (productionMode) {
-					FinderCacheUtil.removeResult(finderPath, finderArgs);
-				}
+				FinderCacheUtil.removeResult(finderPath, finderArgs);
 
 				throw processException(e);
 			}
@@ -730,16 +711,13 @@ public Layout fetchByUUID_G_P(
 
 		Object[] finderArgs = null;
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			finderArgs = new Object[] {uuid, groupId, privateLayout};
 		}
 
 		Object result = null;
 
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			result = FinderCacheUtil.getResult(
 				_finderPathFetchByUUID_G_P, finderArgs, this);
 		}
@@ -797,7 +775,7 @@ public Layout fetchByUUID_G_P(
 				List<Layout> list = q.list();
 
 				if (list.isEmpty()) {
-					if (useFinderCache && productionMode) {
+					if (useFinderCache) {
 						FinderCacheUtil.putResult(
 							_finderPathFetchByUUID_G_P, finderArgs, list);
 					}
@@ -811,7 +789,7 @@ public Layout fetchByUUID_G_P(
 				}
 			}
 			catch (Exception e) {
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.removeResult(
 						_finderPathFetchByUUID_G_P, finderArgs);
 				}
@@ -863,22 +841,12 @@ public int countByUUID_G_P(
 
 		uuid = Objects.toString(uuid, "");
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
-		FinderPath finderPath = null;
-		Object[] finderArgs = null;
-
-		Long count = null;
-
-		if (productionMode) {
-			finderPath = _finderPathCountByUUID_G_P;
+		FinderPath finderPath = _finderPathCountByUUID_G_P;
 
-			finderArgs = new Object[] {uuid, groupId, privateLayout};
+		Object[] finderArgs = new Object[] {uuid, groupId, privateLayout};
 
-			count = (Long)FinderCacheUtil.getResult(
-				finderPath, finderArgs, this);
-		}
+		Long count = (Long)FinderCacheUtil.getResult(
+			finderPath, finderArgs, this);
 
 		if (count == null) {
 			StringBundler query = new StringBundler(4);
@@ -921,14 +889,10 @@ public int countByUUID_G_P(
 
 				count = (Long)q.uniqueResult();
 
-				if (productionMode) {
-					FinderCacheUtil.putResult(finderPath, finderArgs, count);
-				}
+				FinderCacheUtil.putResult(finderPath, finderArgs, count);
 			}
 			catch (Exception e) {
-				if (productionMode) {
-					FinderCacheUtil.removeResult(finderPath, finderArgs);
-				}
+				FinderCacheUtil.removeResult(finderPath, finderArgs);
 
 				throw processException(e);
 			}
@@ -1038,20 +1002,17 @@ public List<Layout> findByUuid_C(
 		FinderPath finderPath = null;
 		Object[] finderArgs = null;
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
 		if ((start == QueryUtil.ALL_POS) && (end == QueryUtil.ALL_POS) &&
 			(orderByComparator == null)) {
 
 			pagination = false;
 
-			if (useFinderCache && productionMode) {
+			if (useFinderCache) {
 				finderPath = _finderPathWithoutPaginationFindByUuid_C;
 				finderArgs = new Object[] {uuid, companyId};
 			}
 		}
-		else if (useFinderCache && productionMode) {
+		else if (useFinderCache) {
 			finderPath = _finderPathWithPaginationFindByUuid_C;
 			finderArgs = new Object[] {
 				uuid, companyId, start, end, orderByComparator
@@ -1060,7 +1021,7 @@ else if (useFinderCache && productionMode) {
 
 		List<Layout> list = null;
 
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			list = (List<Layout>)FinderCacheUtil.getResult(
 				finderPath, finderArgs, this);
 
@@ -1143,12 +1104,12 @@ else if (pagination) {
 
 				cacheResult(list);
 
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.putResult(finderPath, finderArgs, list);
 				}
 			}
 			catch (Exception e) {
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.removeResult(finderPath, finderArgs);
 				}
 
@@ -1482,22 +1443,12 @@ public void removeByUuid_C(String uuid, long companyId) {
 	public int countByUuid_C(String uuid, long companyId) {
 		uuid = Objects.toString(uuid, "");
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
-		FinderPath finderPath = null;
-		Object[] finderArgs = null;
-
-		Long count = null;
-
-		if (productionMode) {
-			finderPath = _finderPathCountByUuid_C;
+		FinderPath finderPath = _finderPathCountByUuid_C;
 
-			finderArgs = new Object[] {uuid, companyId};
+		Object[] finderArgs = new Object[] {uuid, companyId};
 
-			count = (Long)FinderCacheUtil.getResult(
-				finderPath, finderArgs, this);
-		}
+		Long count = (Long)FinderCacheUtil.getResult(
+			finderPath, finderArgs, this);
 
 		if (count == null) {
 			StringBundler query = new StringBundler(3);
@@ -1536,14 +1487,10 @@ public int countByUuid_C(String uuid, long companyId) {
 
 				count = (Long)q.uniqueResult();
 
-				if (productionMode) {
-					FinderCacheUtil.putResult(finderPath, finderArgs, count);
-				}
+				FinderCacheUtil.putResult(finderPath, finderArgs, count);
 			}
 			catch (Exception e) {
-				if (productionMode) {
-					FinderCacheUtil.removeResult(finderPath, finderArgs);
-				}
+				FinderCacheUtil.removeResult(finderPath, finderArgs);
 
 				throw processException(e);
 			}
@@ -1564,526 +1511,6 @@ public int countByUuid_C(String uuid, long companyId) {
 	private static final String _FINDER_COLUMN_UUID_C_COMPANYID_2 =
 		"layout.companyId = ?";
 
-	private FinderPath _finderPathWithPaginationFindByCTCollectionId;
-	private FinderPath _finderPathWithoutPaginationFindByCTCollectionId;
-	private FinderPath _finderPathCountByCTCollectionId;
-
-	/**
-	 * Returns all the layouts where ctCollectionId = &#63;.
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 * @return the matching layouts
-	 */
-	@Override
-	public List<Layout> findByCTCollectionId(long ctCollectionId) {
-		return findByCTCollectionId(
-			ctCollectionId, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
-	}
-
-	/**
-	 * Returns a range of all the layouts where ctCollectionId = &#63;.
-	 *
-	 * <p>
-	 * Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to <code>QueryUtil#ALL_POS</code> will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not <code>QueryUtil#ALL_POS</code>), then the query will include the default ORDER BY logic from <code>LayoutModelImpl</code>. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
-	 * </p>
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 * @param start the lower bound of the range of layouts
-	 * @param end the upper bound of the range of layouts (not inclusive)
-	 * @return the range of matching layouts
-	 */
-	@Override
-	public List<Layout> findByCTCollectionId(
-		long ctCollectionId, int start, int end) {
-
-		return findByCTCollectionId(ctCollectionId, start, end, null);
-	}
-
-	/**
-	 * Returns an ordered range of all the layouts where ctCollectionId = &#63;.
-	 *
-	 * <p>
-	 * Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to <code>QueryUtil#ALL_POS</code> will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not <code>QueryUtil#ALL_POS</code>), then the query will include the default ORDER BY logic from <code>LayoutModelImpl</code>. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
-	 * </p>
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 * @param start the lower bound of the range of layouts
-	 * @param end the upper bound of the range of layouts (not inclusive)
-	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
-	 * @return the ordered range of matching layouts
-	 */
-	@Override
-	public List<Layout> findByCTCollectionId(
-		long ctCollectionId, int start, int end,
-		OrderByComparator<Layout> orderByComparator) {
-
-		return findByCTCollectionId(
-			ctCollectionId, start, end, orderByComparator, true);
-	}
-
-	/**
-	 * Returns an ordered range of all the layouts where ctCollectionId = &#63;.
-	 *
-	 * <p>
-	 * Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to <code>QueryUtil#ALL_POS</code> will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not <code>QueryUtil#ALL_POS</code>), then the query will include the default ORDER BY logic from <code>LayoutModelImpl</code>. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
-	 * </p>
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 * @param start the lower bound of the range of layouts
-	 * @param end the upper bound of the range of layouts (not inclusive)
-	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
-	 * @param useFinderCache whether to use the finder cache
-	 * @return the ordered range of matching layouts
-	 */
-	@Override
-	public List<Layout> findByCTCollectionId(
-		long ctCollectionId, int start, int end,
-		OrderByComparator<Layout> orderByComparator, boolean useFinderCache) {
-
-		boolean pagination = true;
-		FinderPath finderPath = null;
-		Object[] finderArgs = null;
-
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
-		if ((start == QueryUtil.ALL_POS) && (end == QueryUtil.ALL_POS) &&
-			(orderByComparator == null)) {
-
-			pagination = false;
-
-			if (useFinderCache && productionMode) {
-				finderPath = _finderPathWithoutPaginationFindByCTCollectionId;
-				finderArgs = new Object[] {ctCollectionId};
-			}
-		}
-		else if (useFinderCache && productionMode) {
-			finderPath = _finderPathWithPaginationFindByCTCollectionId;
-			finderArgs = new Object[] {
-				ctCollectionId, start, end, orderByComparator
-			};
-		}
-
-		List<Layout> list = null;
-
-		if (useFinderCache && productionMode) {
-			list = (List<Layout>)FinderCacheUtil.getResult(
-				finderPath, finderArgs, this);
-
-			if ((list != null) && !list.isEmpty()) {
-				for (Layout layout : list) {
-					if (ctCollectionId != layout.getCtCollectionId()) {
-						list = null;
-
-						break;
-					}
-				}
-			}
-		}
-
-		if (list == null) {
-			StringBundler query = null;
-
-			if (orderByComparator != null) {
-				query = new StringBundler(
-					3 + (orderByComparator.getOrderByFields().length * 2));
-			}
-			else {
-				query = new StringBundler(3);
-			}
-
-			query.append(_SQL_SELECT_LAYOUT_WHERE);
-
-			query.append(_FINDER_COLUMN_CTCOLLECTIONID_CTCOLLECTIONID_2);
-
-			if (orderByComparator != null) {
-				appendOrderByComparator(
-					query, _ORDER_BY_ENTITY_ALIAS, orderByComparator);
-			}
-			else if (pagination) {
-				query.append(LayoutModelImpl.ORDER_BY_JPQL);
-			}
-
-			String sql = query.toString();
-
-			Session session = null;
-
-			try {
-				session = openSession();
-
-				Query q = session.createQuery(sql);
-
-				QueryPos qPos = QueryPos.getInstance(q);
-
-				qPos.add(ctCollectionId);
-
-				if (!pagination) {
-					list = (List<Layout>)QueryUtil.list(
-						q, getDialect(), start, end, false);
-
-					Collections.sort(list);
-
-					list = Collections.unmodifiableList(list);
-				}
-				else {
-					list = (List<Layout>)QueryUtil.list(
-						q, getDialect(), start, end);
-				}
-
-				cacheResult(list);
-
-				if (useFinderCache && productionMode) {
-					FinderCacheUtil.putResult(finderPath, finderArgs, list);
-				}
-			}
-			catch (Exception e) {
-				if (useFinderCache && productionMode) {
-					FinderCacheUtil.removeResult(finderPath, finderArgs);
-				}
-
-				throw processException(e);
-			}
-			finally {
-				closeSession(session);
-			}
-		}
-
-		return list;
-	}
-
-	/**
-	 * Returns the first layout in the ordered set where ctCollectionId = &#63;.
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
-	 * @return the first matching layout
-	 * @throws NoSuchLayoutException if a matching layout could not be found
-	 */
-	@Override
-	public Layout findByCTCollectionId_First(
-			long ctCollectionId, OrderByComparator<Layout> orderByComparator)
-		throws NoSuchLayoutException {
-
-		Layout layout = fetchByCTCollectionId_First(
-			ctCollectionId, orderByComparator);
-
-		if (layout != null) {
-			return layout;
-		}
-
-		StringBundler msg = new StringBundler(4);
-
-		msg.append(_NO_SUCH_ENTITY_WITH_KEY);
-
-		msg.append("ctCollectionId=");
-		msg.append(ctCollectionId);
-
-		msg.append("}");
-
-		throw new NoSuchLayoutException(msg.toString());
-	}
-
-	/**
-	 * Returns the first layout in the ordered set where ctCollectionId = &#63;.
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
-	 * @return the first matching layout, or <code>null</code> if a matching layout could not be found
-	 */
-	@Override
-	public Layout fetchByCTCollectionId_First(
-		long ctCollectionId, OrderByComparator<Layout> orderByComparator) {
-
-		List<Layout> list = findByCTCollectionId(
-			ctCollectionId, 0, 1, orderByComparator);
-
-		if (!list.isEmpty()) {
-			return list.get(0);
-		}
-
-		return null;
-	}
-
-	/**
-	 * Returns the last layout in the ordered set where ctCollectionId = &#63;.
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
-	 * @return the last matching layout
-	 * @throws NoSuchLayoutException if a matching layout could not be found
-	 */
-	@Override
-	public Layout findByCTCollectionId_Last(
-			long ctCollectionId, OrderByComparator<Layout> orderByComparator)
-		throws NoSuchLayoutException {
-
-		Layout layout = fetchByCTCollectionId_Last(
-			ctCollectionId, orderByComparator);
-
-		if (layout != null) {
-			return layout;
-		}
-
-		StringBundler msg = new StringBundler(4);
-
-		msg.append(_NO_SUCH_ENTITY_WITH_KEY);
-
-		msg.append("ctCollectionId=");
-		msg.append(ctCollectionId);
-
-		msg.append("}");
-
-		throw new NoSuchLayoutException(msg.toString());
-	}
-
-	/**
-	 * Returns the last layout in the ordered set where ctCollectionId = &#63;.
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
-	 * @return the last matching layout, or <code>null</code> if a matching layout could not be found
-	 */
-	@Override
-	public Layout fetchByCTCollectionId_Last(
-		long ctCollectionId, OrderByComparator<Layout> orderByComparator) {
-
-		int count = countByCTCollectionId(ctCollectionId);
-
-		if (count == 0) {
-			return null;
-		}
-
-		List<Layout> list = findByCTCollectionId(
-			ctCollectionId, count - 1, count, orderByComparator);
-
-		if (!list.isEmpty()) {
-			return list.get(0);
-		}
-
-		return null;
-	}
-
-	/**
-	 * Returns the layouts before and after the current layout in the ordered set where ctCollectionId = &#63;.
-	 *
-	 * @param plid the primary key of the current layout
-	 * @param ctCollectionId the ct collection ID
-	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
-	 * @return the previous, current, and next layout
-	 * @throws NoSuchLayoutException if a layout with the primary key could not be found
-	 */
-	@Override
-	public Layout[] findByCTCollectionId_PrevAndNext(
-			long plid, long ctCollectionId,
-			OrderByComparator<Layout> orderByComparator)
-		throws NoSuchLayoutException {
-
-		Layout layout = findByPrimaryKey(plid);
-
-		Session session = null;
-
-		try {
-			session = openSession();
-
-			Layout[] array = new LayoutImpl[3];
-
-			array[0] = getByCTCollectionId_PrevAndNext(
-				session, layout, ctCollectionId, orderByComparator, true);
-
-			array[1] = layout;
-
-			array[2] = getByCTCollectionId_PrevAndNext(
-				session, layout, ctCollectionId, orderByComparator, false);
-
-			return array;
-		}
-		catch (Exception e) {
-			throw processException(e);
-		}
-		finally {
-			closeSession(session);
-		}
-	}
-
-	protected Layout getByCTCollectionId_PrevAndNext(
-		Session session, Layout layout, long ctCollectionId,
-		OrderByComparator<Layout> orderByComparator, boolean previous) {
-
-		StringBundler query = null;
-
-		if (orderByComparator != null) {
-			query = new StringBundler(
-				4 + (orderByComparator.getOrderByConditionFields().length * 3) +
-					(orderByComparator.getOrderByFields().length * 3));
-		}
-		else {
-			query = new StringBundler(3);
-		}
-
-		query.append(_SQL_SELECT_LAYOUT_WHERE);
-
-		query.append(_FINDER_COLUMN_CTCOLLECTIONID_CTCOLLECTIONID_2);
-
-		if (orderByComparator != null) {
-			String[] orderByConditionFields =
-				orderByComparator.getOrderByConditionFields();
-
-			if (orderByConditionFields.length > 0) {
-				query.append(WHERE_AND);
-			}
-
-			for (int i = 0; i < orderByConditionFields.length; i++) {
-				query.append(_ORDER_BY_ENTITY_ALIAS);
-				query.append(orderByConditionFields[i]);
-
-				if ((i + 1) < orderByConditionFields.length) {
-					if (orderByComparator.isAscending() ^ previous) {
-						query.append(WHERE_GREATER_THAN_HAS_NEXT);
-					}
-					else {
-						query.append(WHERE_LESSER_THAN_HAS_NEXT);
-					}
-				}
-				else {
-					if (orderByComparator.isAscending() ^ previous) {
-						query.append(WHERE_GREATER_THAN);
-					}
-					else {
-						query.append(WHERE_LESSER_THAN);
-					}
-				}
-			}
-
-			query.append(ORDER_BY_CLAUSE);
-
-			String[] orderByFields = orderByComparator.getOrderByFields();
-
-			for (int i = 0; i < orderByFields.length; i++) {
-				query.append(_ORDER_BY_ENTITY_ALIAS);
-				query.append(orderByFields[i]);
-
-				if ((i + 1) < orderByFields.length) {
-					if (orderByComparator.isAscending() ^ previous) {
-						query.append(ORDER_BY_ASC_HAS_NEXT);
-					}
-					else {
-						query.append(ORDER_BY_DESC_HAS_NEXT);
-					}
-				}
-				else {
-					if (orderByComparator.isAscending() ^ previous) {
-						query.append(ORDER_BY_ASC);
-					}
-					else {
-						query.append(ORDER_BY_DESC);
-					}
-				}
-			}
-		}
-		else {
-			query.append(LayoutModelImpl.ORDER_BY_JPQL);
-		}
-
-		String sql = query.toString();
-
-		Query q = session.createQuery(sql);
-
-		q.setFirstResult(0);
-		q.setMaxResults(2);
-
-		QueryPos qPos = QueryPos.getInstance(q);
-
-		qPos.add(ctCollectionId);
-
-		if (orderByComparator != null) {
-			for (Object orderByConditionValue :
-					orderByComparator.getOrderByConditionValues(layout)) {
-
-				qPos.add(orderByConditionValue);
-			}
-		}
-
-		List<Layout> list = q.list();
-
-		if (list.size() == 2) {
-			return list.get(1);
-		}
-		else {
-			return null;
-		}
-	}
-
-	/**
-	 * Removes all the layouts where ctCollectionId = &#63; from the database.
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 */
-	@Override
-	public void removeByCTCollectionId(long ctCollectionId) {
-		for (Layout layout :
-				findByCTCollectionId(
-					ctCollectionId, QueryUtil.ALL_POS, QueryUtil.ALL_POS,
-					null)) {
-
-			remove(layout);
-		}
-	}
-
-	/**
-	 * Returns the number of layouts where ctCollectionId = &#63;.
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 * @return the number of matching layouts
-	 */
-	@Override
-	public int countByCTCollectionId(long ctCollectionId) {
-		FinderPath finderPath = _finderPathCountByCTCollectionId;
-
-		Object[] finderArgs = new Object[] {ctCollectionId};
-
-		Long count = (Long)FinderCacheUtil.getResult(
-			finderPath, finderArgs, this);
-
-		if (count == null) {
-			StringBundler query = new StringBundler(2);
-
-			query.append(_SQL_COUNT_LAYOUT_WHERE);
-
-			query.append(_FINDER_COLUMN_CTCOLLECTIONID_CTCOLLECTIONID_2);
-
-			String sql = query.toString();
-
-			Session session = null;
-
-			try {
-				session = openSession();
-
-				Query q = session.createQuery(sql);
-
-				QueryPos qPos = QueryPos.getInstance(q);
-
-				qPos.add(ctCollectionId);
-
-				count = (Long)q.uniqueResult();
-
-				FinderCacheUtil.putResult(finderPath, finderArgs, count);
-			}
-			catch (Exception e) {
-				FinderCacheUtil.removeResult(finderPath, finderArgs);
-
-				throw processException(e);
-			}
-			finally {
-				closeSession(session);
-			}
-		}
-
-		return count.intValue();
-	}
-
-	private static final String _FINDER_COLUMN_CTCOLLECTIONID_CTCOLLECTIONID_2 =
-		"layout.ctCollectionId = ?";
-
 	private FinderPath _finderPathWithPaginationFindByGroupId;
 	private FinderPath _finderPathWithoutPaginationFindByGroupId;
 	private FinderPath _finderPathCountByGroupId;
@@ -2161,27 +1588,24 @@ public List<Layout> findByGroupId(
 		FinderPath finderPath = null;
 		Object[] finderArgs = null;
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
 		if ((start == QueryUtil.ALL_POS) && (end == QueryUtil.ALL_POS) &&
 			(orderByComparator == null)) {
 
 			pagination = false;
 
-			if (useFinderCache && productionMode) {
+			if (useFinderCache) {
 				finderPath = _finderPathWithoutPaginationFindByGroupId;
 				finderArgs = new Object[] {groupId};
 			}
 		}
-		else if (useFinderCache && productionMode) {
+		else if (useFinderCache) {
 			finderPath = _finderPathWithPaginationFindByGroupId;
 			finderArgs = new Object[] {groupId, start, end, orderByComparator};
 		}
 
 		List<Layout> list = null;
 
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			list = (List<Layout>)FinderCacheUtil.getResult(
 				finderPath, finderArgs, this);
 
@@ -2247,12 +1671,12 @@ else if (pagination) {
 
 				cacheResult(list);
 
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.putResult(finderPath, finderArgs, list);
 				}
 			}
 			catch (Exception e) {
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.removeResult(finderPath, finderArgs);
 				}
 
@@ -2863,27 +2287,17 @@ public void removeByGroupId(long groupId) {
 	/**
 	 * Returns the number of layouts where groupId = &#63;.
 	 *
-	 * @param groupId the group ID
-	 * @return the number of matching layouts
-	 */
-	@Override
-	public int countByGroupId(long groupId) {
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
-		FinderPath finderPath = null;
-		Object[] finderArgs = null;
-
-		Long count = null;
-
-		if (productionMode) {
-			finderPath = _finderPathCountByGroupId;
+	 * @param groupId the group ID
+	 * @return the number of matching layouts
+	 */
+	@Override
+	public int countByGroupId(long groupId) {
+		FinderPath finderPath = _finderPathCountByGroupId;
 
-			finderArgs = new Object[] {groupId};
+		Object[] finderArgs = new Object[] {groupId};
 
-			count = (Long)FinderCacheUtil.getResult(
-				finderPath, finderArgs, this);
-		}
+		Long count = (Long)FinderCacheUtil.getResult(
+			finderPath, finderArgs, this);
 
 		if (count == null) {
 			StringBundler query = new StringBundler(2);
@@ -2907,14 +2321,10 @@ public int countByGroupId(long groupId) {
 
 				count = (Long)q.uniqueResult();
 
-				if (productionMode) {
-					FinderCacheUtil.putResult(finderPath, finderArgs, count);
-				}
+				FinderCacheUtil.putResult(finderPath, finderArgs, count);
 			}
 			catch (Exception e) {
-				if (productionMode) {
-					FinderCacheUtil.removeResult(finderPath, finderArgs);
-				}
+				FinderCacheUtil.removeResult(finderPath, finderArgs);
 
 				throw processException(e);
 			}
@@ -3057,20 +2467,17 @@ public List<Layout> findByCompanyId(
 		FinderPath finderPath = null;
 		Object[] finderArgs = null;
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
 		if ((start == QueryUtil.ALL_POS) && (end == QueryUtil.ALL_POS) &&
 			(orderByComparator == null)) {
 
 			pagination = false;
 
-			if (useFinderCache && productionMode) {
+			if (useFinderCache) {
 				finderPath = _finderPathWithoutPaginationFindByCompanyId;
 				finderArgs = new Object[] {companyId};
 			}
 		}
-		else if (useFinderCache && productionMode) {
+		else if (useFinderCache) {
 			finderPath = _finderPathWithPaginationFindByCompanyId;
 			finderArgs = new Object[] {
 				companyId, start, end, orderByComparator
@@ -3079,7 +2486,7 @@ else if (useFinderCache && productionMode) {
 
 		List<Layout> list = null;
 
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			list = (List<Layout>)FinderCacheUtil.getResult(
 				finderPath, finderArgs, this);
 
@@ -3145,12 +2552,12 @@ else if (pagination) {
 
 				cacheResult(list);
 
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.putResult(finderPath, finderArgs, list);
 				}
 			}
 			catch (Exception e) {
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.removeResult(finderPath, finderArgs);
 				}
 
@@ -3446,22 +2853,12 @@ public void removeByCompanyId(long companyId) {
 	 */
 	@Override
 	public int countByCompanyId(long companyId) {
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
-		FinderPath finderPath = null;
-		Object[] finderArgs = null;
-
-		Long count = null;
+		FinderPath finderPath = _finderPathCountByCompanyId;
 
-		if (productionMode) {
-			finderPath = _finderPathCountByCompanyId;
+		Object[] finderArgs = new Object[] {companyId};
 
-			finderArgs = new Object[] {companyId};
-
-			count = (Long)FinderCacheUtil.getResult(
-				finderPath, finderArgs, this);
-		}
+		Long count = (Long)FinderCacheUtil.getResult(
+			finderPath, finderArgs, this);
 
 		if (count == null) {
 			StringBundler query = new StringBundler(2);
@@ -3485,14 +2882,10 @@ public int countByCompanyId(long companyId) {
 
 				count = (Long)q.uniqueResult();
 
-				if (productionMode) {
-					FinderCacheUtil.putResult(finderPath, finderArgs, count);
-				}
+				FinderCacheUtil.putResult(finderPath, finderArgs, count);
 			}
 			catch (Exception e) {
-				if (productionMode) {
-					FinderCacheUtil.removeResult(finderPath, finderArgs);
-				}
+				FinderCacheUtil.removeResult(finderPath, finderArgs);
 
 				throw processException(e);
 			}
@@ -3585,20 +2978,17 @@ public List<Layout> findByParentPlid(
 		FinderPath finderPath = null;
 		Object[] finderArgs = null;
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
 		if ((start == QueryUtil.ALL_POS) && (end == QueryUtil.ALL_POS) &&
 			(orderByComparator == null)) {
 
 			pagination = false;
 
-			if (useFinderCache && productionMode) {
+			if (useFinderCache) {
 				finderPath = _finderPathWithoutPaginationFindByParentPlid;
 				finderArgs = new Object[] {parentPlid};
 			}
 		}
-		else if (useFinderCache && productionMode) {
+		else if (useFinderCache) {
 			finderPath = _finderPathWithPaginationFindByParentPlid;
 			finderArgs = new Object[] {
 				parentPlid, start, end, orderByComparator
@@ -3607,7 +2997,7 @@ else if (useFinderCache && productionMode) {
 
 		List<Layout> list = null;
 
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			list = (List<Layout>)FinderCacheUtil.getResult(
 				finderPath, finderArgs, this);
 
@@ -3673,12 +3063,12 @@ else if (pagination) {
 
 				cacheResult(list);
 
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.putResult(finderPath, finderArgs, list);
 				}
 			}
 			catch (Exception e) {
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.removeResult(finderPath, finderArgs);
 				}
 
@@ -3975,22 +3365,12 @@ public void removeByParentPlid(long parentPlid) {
 	 */
 	@Override
 	public int countByParentPlid(long parentPlid) {
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
-		FinderPath finderPath = null;
-		Object[] finderArgs = null;
-
-		Long count = null;
+		FinderPath finderPath = _finderPathCountByParentPlid;
 
-		if (productionMode) {
-			finderPath = _finderPathCountByParentPlid;
+		Object[] finderArgs = new Object[] {parentPlid};
 
-			finderArgs = new Object[] {parentPlid};
-
-			count = (Long)FinderCacheUtil.getResult(
-				finderPath, finderArgs, this);
-		}
+		Long count = (Long)FinderCacheUtil.getResult(
+			finderPath, finderArgs, this);
 
 		if (count == null) {
 			StringBundler query = new StringBundler(2);
@@ -4014,14 +3394,10 @@ public int countByParentPlid(long parentPlid) {
 
 				count = (Long)q.uniqueResult();
 
-				if (productionMode) {
-					FinderCacheUtil.putResult(finderPath, finderArgs, count);
-				}
+				FinderCacheUtil.putResult(finderPath, finderArgs, count);
 			}
 			catch (Exception e) {
-				if (productionMode) {
-					FinderCacheUtil.removeResult(finderPath, finderArgs);
-				}
+				FinderCacheUtil.removeResult(finderPath, finderArgs);
 
 				throw processException(e);
 			}
@@ -4094,16 +3470,13 @@ public Layout fetchByIconImageId(long iconImageId) {
 	public Layout fetchByIconImageId(long iconImageId, boolean useFinderCache) {
 		Object[] finderArgs = null;
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			finderArgs = new Object[] {iconImageId};
 		}
 
 		Object result = null;
 
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			result = FinderCacheUtil.getResult(
 				_finderPathFetchByIconImageId, finderArgs, this);
 		}
@@ -4139,7 +3512,7 @@ public Layout fetchByIconImageId(long iconImageId, boolean useFinderCache) {
 				List<Layout> list = q.list();
 
 				if (list.isEmpty()) {
-					if (useFinderCache && productionMode) {
+					if (useFinderCache) {
 						FinderCacheUtil.putResult(
 							_finderPathFetchByIconImageId, finderArgs, list);
 					}
@@ -4149,7 +3522,7 @@ public Layout fetchByIconImageId(long iconImageId, boolean useFinderCache) {
 						Collections.sort(list, Collections.reverseOrder());
 
 						if (_log.isWarnEnabled()) {
-							if (!useFinderCache || !productionMode) {
+							if (!useFinderCache) {
 								finderArgs = new Object[] {iconImageId};
 							}
 
@@ -4168,7 +3541,7 @@ public Layout fetchByIconImageId(long iconImageId, boolean useFinderCache) {
 				}
 			}
 			catch (Exception e) {
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.removeResult(
 						_finderPathFetchByIconImageId, finderArgs);
 				}
@@ -4211,22 +3584,12 @@ public Layout removeByIconImageId(long iconImageId)
 	 */
 	@Override
 	public int countByIconImageId(long iconImageId) {
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
-		FinderPath finderPath = null;
-		Object[] finderArgs = null;
-
-		Long count = null;
+		FinderPath finderPath = _finderPathCountByIconImageId;
 
-		if (productionMode) {
-			finderPath = _finderPathCountByIconImageId;
+		Object[] finderArgs = new Object[] {iconImageId};
 
-			finderArgs = new Object[] {iconImageId};
-
-			count = (Long)FinderCacheUtil.getResult(
-				finderPath, finderArgs, this);
-		}
+		Long count = (Long)FinderCacheUtil.getResult(
+			finderPath, finderArgs, this);
 
 		if (count == null) {
 			StringBundler query = new StringBundler(2);
@@ -4250,14 +3613,10 @@ public int countByIconImageId(long iconImageId) {
 
 				count = (Long)q.uniqueResult();
 
-				if (productionMode) {
-					FinderCacheUtil.putResult(finderPath, finderArgs, count);
-				}
+				FinderCacheUtil.putResult(finderPath, finderArgs, count);
 			}
 			catch (Exception e) {
-				if (productionMode) {
-					FinderCacheUtil.removeResult(finderPath, finderArgs);
-				}
+				FinderCacheUtil.removeResult(finderPath, finderArgs);
 
 				throw processException(e);
 			}
@@ -4354,21 +3713,18 @@ public List<Layout> findByLayoutPrototypeUuid(
 		FinderPath finderPath = null;
 		Object[] finderArgs = null;
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
 		if ((start == QueryUtil.ALL_POS) && (end == QueryUtil.ALL_POS) &&
 			(orderByComparator == null)) {
 
 			pagination = false;
 
-			if (useFinderCache && productionMode) {
+			if (useFinderCache) {
 				finderPath =
 					_finderPathWithoutPaginationFindByLayoutPrototypeUuid;
 				finderArgs = new Object[] {layoutPrototypeUuid};
 			}
 		}
-		else if (useFinderCache && productionMode) {
+		else if (useFinderCache) {
 			finderPath = _finderPathWithPaginationFindByLayoutPrototypeUuid;
 			finderArgs = new Object[] {
 				layoutPrototypeUuid, start, end, orderByComparator
@@ -4377,7 +3733,7 @@ else if (useFinderCache && productionMode) {
 
 		List<Layout> list = null;
 
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			list = (List<Layout>)FinderCacheUtil.getResult(
 				finderPath, finderArgs, this);
 
@@ -4458,12 +3814,12 @@ else if (pagination) {
 
 				cacheResult(list);
 
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.putResult(finderPath, finderArgs, list);
 				}
 			}
 			catch (Exception e) {
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.removeResult(finderPath, finderArgs);
 				}
 
@@ -4784,22 +4140,12 @@ public void removeByLayoutPrototypeUuid(String layoutPrototypeUuid) {
 	public int countByLayoutPrototypeUuid(String layoutPrototypeUuid) {
 		layoutPrototypeUuid = Objects.toString(layoutPrototypeUuid, "");
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
+		FinderPath finderPath = _finderPathCountByLayoutPrototypeUuid;
 
-		FinderPath finderPath = null;
-		Object[] finderArgs = null;
-
-		Long count = null;
+		Object[] finderArgs = new Object[] {layoutPrototypeUuid};
 
-		if (productionMode) {
-			finderPath = _finderPathCountByLayoutPrototypeUuid;
-
-			finderArgs = new Object[] {layoutPrototypeUuid};
-
-			count = (Long)FinderCacheUtil.getResult(
-				finderPath, finderArgs, this);
-		}
+		Long count = (Long)FinderCacheUtil.getResult(
+			finderPath, finderArgs, this);
 
 		if (count == null) {
 			StringBundler query = new StringBundler(2);
@@ -4836,14 +4182,10 @@ public int countByLayoutPrototypeUuid(String layoutPrototypeUuid) {
 
 				count = (Long)q.uniqueResult();
 
-				if (productionMode) {
-					FinderCacheUtil.putResult(finderPath, finderArgs, count);
-				}
+				FinderCacheUtil.putResult(finderPath, finderArgs, count);
 			}
 			catch (Exception e) {
-				if (productionMode) {
-					FinderCacheUtil.removeResult(finderPath, finderArgs);
-				}
+				FinderCacheUtil.removeResult(finderPath, finderArgs);
 
 				throw processException(e);
 			}
@@ -4951,21 +4293,18 @@ public List<Layout> findBySourcePrototypeLayoutUuid(
 		FinderPath finderPath = null;
 		Object[] finderArgs = null;
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
 		if ((start == QueryUtil.ALL_POS) && (end == QueryUtil.ALL_POS) &&
 			(orderByComparator == null)) {
 
 			pagination = false;
 
-			if (useFinderCache && productionMode) {
+			if (useFinderCache) {
 				finderPath =
 					_finderPathWithoutPaginationFindBySourcePrototypeLayoutUuid;
 				finderArgs = new Object[] {sourcePrototypeLayoutUuid};
 			}
 		}
-		else if (useFinderCache && productionMode) {
+		else if (useFinderCache) {
 			finderPath =
 				_finderPathWithPaginationFindBySourcePrototypeLayoutUuid;
 			finderArgs = new Object[] {
@@ -4975,7 +4314,7 @@ else if (useFinderCache && productionMode) {
 
 		List<Layout> list = null;
 
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			list = (List<Layout>)FinderCacheUtil.getResult(
 				finderPath, finderArgs, this);
 
@@ -5056,12 +4395,12 @@ else if (pagination) {
 
 				cacheResult(list);
 
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.putResult(finderPath, finderArgs, list);
 				}
 			}
 			catch (Exception e) {
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.removeResult(finderPath, finderArgs);
 				}
 
@@ -5390,22 +4729,12 @@ public int countBySourcePrototypeLayoutUuid(
 		sourcePrototypeLayoutUuid = Objects.toString(
 			sourcePrototypeLayoutUuid, "");
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
+		FinderPath finderPath = _finderPathCountBySourcePrototypeLayoutUuid;
 
-		FinderPath finderPath = null;
-		Object[] finderArgs = null;
-
-		Long count = null;
+		Object[] finderArgs = new Object[] {sourcePrototypeLayoutUuid};
 
-		if (productionMode) {
-			finderPath = _finderPathCountBySourcePrototypeLayoutUuid;
-
-			finderArgs = new Object[] {sourcePrototypeLayoutUuid};
-
-			count = (Long)FinderCacheUtil.getResult(
-				finderPath, finderArgs, this);
-		}
+		Long count = (Long)FinderCacheUtil.getResult(
+			finderPath, finderArgs, this);
 
 		if (count == null) {
 			StringBundler query = new StringBundler(2);
@@ -5442,14 +4771,10 @@ public int countBySourcePrototypeLayoutUuid(
 
 				count = (Long)q.uniqueResult();
 
-				if (productionMode) {
-					FinderCacheUtil.putResult(finderPath, finderArgs, count);
-				}
+				FinderCacheUtil.putResult(finderPath, finderArgs, count);
 			}
 			catch (Exception e) {
-				if (productionMode) {
-					FinderCacheUtil.removeResult(finderPath, finderArgs);
-				}
+				FinderCacheUtil.removeResult(finderPath, finderArgs);
 
 				throw processException(e);
 			}
@@ -5553,20 +4878,17 @@ public List<Layout> findByG_P(
 		FinderPath finderPath = null;
 		Object[] finderArgs = null;
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
 		if ((start == QueryUtil.ALL_POS) && (end == QueryUtil.ALL_POS) &&
 			(orderByComparator == null)) {
 
 			pagination = false;
 
-			if (useFinderCache && productionMode) {
+			if (useFinderCache) {
 				finderPath = _finderPathWithoutPaginationFindByG_P;
 				finderArgs = new Object[] {groupId, privateLayout};
 			}
 		}
-		else if (useFinderCache && productionMode) {
+		else if (useFinderCache) {
 			finderPath = _finderPathWithPaginationFindByG_P;
 			finderArgs = new Object[] {
 				groupId, privateLayout, start, end, orderByComparator
@@ -5575,7 +4897,7 @@ else if (useFinderCache && productionMode) {
 
 		List<Layout> list = null;
 
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			list = (List<Layout>)FinderCacheUtil.getResult(
 				finderPath, finderArgs, this);
 
@@ -5647,12 +4969,12 @@ else if (pagination) {
 
 				cacheResult(list);
 
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.putResult(finderPath, finderArgs, list);
 				}
 			}
 			catch (Exception e) {
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.removeResult(finderPath, finderArgs);
 				}
 
@@ -6313,22 +5635,12 @@ public void removeByG_P(long groupId, boolean privateLayout) {
 	 */
 	@Override
 	public int countByG_P(long groupId, boolean privateLayout) {
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
+		FinderPath finderPath = _finderPathCountByG_P;
 
-		FinderPath finderPath = null;
-		Object[] finderArgs = null;
-
-		Long count = null;
+		Object[] finderArgs = new Object[] {groupId, privateLayout};
 
-		if (productionMode) {
-			finderPath = _finderPathCountByG_P;
-
-			finderArgs = new Object[] {groupId, privateLayout};
-
-			count = (Long)FinderCacheUtil.getResult(
-				finderPath, finderArgs, this);
-		}
+		Long count = (Long)FinderCacheUtil.getResult(
+			finderPath, finderArgs, this);
 
 		if (count == null) {
 			StringBundler query = new StringBundler(3);
@@ -6356,14 +5668,10 @@ public int countByG_P(long groupId, boolean privateLayout) {
 
 				count = (Long)q.uniqueResult();
 
-				if (productionMode) {
-					FinderCacheUtil.putResult(finderPath, finderArgs, count);
-				}
+				FinderCacheUtil.putResult(finderPath, finderArgs, count);
 			}
 			catch (Exception e) {
-				if (productionMode) {
-					FinderCacheUtil.removeResult(finderPath, finderArgs);
-				}
+				FinderCacheUtil.removeResult(finderPath, finderArgs);
 
 				throw processException(e);
 			}
@@ -6525,20 +5833,17 @@ public List<Layout> findByG_T(
 		FinderPath finderPath = null;
 		Object[] finderArgs = null;
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
 		if ((start == QueryUtil.ALL_POS) && (end == QueryUtil.ALL_POS) &&
 			(orderByComparator == null)) {
 
 			pagination = false;
 
-			if (useFinderCache && productionMode) {
+			if (useFinderCache) {
 				finderPath = _finderPathWithoutPaginationFindByG_T;
 				finderArgs = new Object[] {groupId, type};
 			}
 		}
-		else if (useFinderCache && productionMode) {
+		else if (useFinderCache) {
 			finderPath = _finderPathWithPaginationFindByG_T;
 			finderArgs = new Object[] {
 				groupId, type, start, end, orderByComparator
@@ -6547,7 +5852,7 @@ else if (useFinderCache && productionMode) {
 
 		List<Layout> list = null;
 
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			list = (List<Layout>)FinderCacheUtil.getResult(
 				finderPath, finderArgs, this);
 
@@ -6630,12 +5935,12 @@ else if (pagination) {
 
 				cacheResult(list);
 
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.putResult(finderPath, finderArgs, list);
 				}
 			}
 			catch (Exception e) {
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.removeResult(finderPath, finderArgs);
 				}
 
@@ -7329,22 +6634,12 @@ public void removeByG_T(long groupId, String type) {
 	public int countByG_T(long groupId, String type) {
 		type = Objects.toString(type, "");
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
+		FinderPath finderPath = _finderPathCountByG_T;
 
-		FinderPath finderPath = null;
-		Object[] finderArgs = null;
-
-		Long count = null;
+		Object[] finderArgs = new Object[] {groupId, type};
 
-		if (productionMode) {
-			finderPath = _finderPathCountByG_T;
-
-			finderArgs = new Object[] {groupId, type};
-
-			count = (Long)FinderCacheUtil.getResult(
-				finderPath, finderArgs, this);
-		}
+		Long count = (Long)FinderCacheUtil.getResult(
+			finderPath, finderArgs, this);
 
 		if (count == null) {
 			StringBundler query = new StringBundler(3);
@@ -7383,14 +6678,10 @@ public int countByG_T(long groupId, String type) {
 
 				count = (Long)q.uniqueResult();
 
-				if (productionMode) {
-					FinderCacheUtil.putResult(finderPath, finderArgs, count);
-				}
+				FinderCacheUtil.putResult(finderPath, finderArgs, count);
 			}
 			catch (Exception e) {
-				if (productionMode) {
-					FinderCacheUtil.removeResult(finderPath, finderArgs);
-				}
+				FinderCacheUtil.removeResult(finderPath, finderArgs);
 
 				throw processException(e);
 			}
@@ -7574,20 +6865,17 @@ public List<Layout> findByC_L(
 		FinderPath finderPath = null;
 		Object[] finderArgs = null;
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
 		if ((start == QueryUtil.ALL_POS) && (end == QueryUtil.ALL_POS) &&
 			(orderByComparator == null)) {
 
 			pagination = false;
 
-			if (useFinderCache && productionMode) {
+			if (useFinderCache) {
 				finderPath = _finderPathWithoutPaginationFindByC_L;
 				finderArgs = new Object[] {companyId, layoutPrototypeUuid};
 			}
 		}
-		else if (useFinderCache && productionMode) {
+		else if (useFinderCache) {
 			finderPath = _finderPathWithPaginationFindByC_L;
 			finderArgs = new Object[] {
 				companyId, layoutPrototypeUuid, start, end, orderByComparator
@@ -7596,7 +6884,7 @@ else if (useFinderCache && productionMode) {
 
 		List<Layout> list = null;
 
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			list = (List<Layout>)FinderCacheUtil.getResult(
 				finderPath, finderArgs, this);
 
@@ -7680,12 +6968,12 @@ else if (pagination) {
 
 				cacheResult(list);
 
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.putResult(finderPath, finderArgs, list);
 				}
 			}
 			catch (Exception e) {
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.removeResult(finderPath, finderArgs);
 				}
 
@@ -8025,22 +7313,12 @@ public void removeByC_L(long companyId, String layoutPrototypeUuid) {
 	public int countByC_L(long companyId, String layoutPrototypeUuid) {
 		layoutPrototypeUuid = Objects.toString(layoutPrototypeUuid, "");
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
+		FinderPath finderPath = _finderPathCountByC_L;
 
-		FinderPath finderPath = null;
-		Object[] finderArgs = null;
-
-		Long count = null;
+		Object[] finderArgs = new Object[] {companyId, layoutPrototypeUuid};
 
-		if (productionMode) {
-			finderPath = _finderPathCountByC_L;
-
-			finderArgs = new Object[] {companyId, layoutPrototypeUuid};
-
-			count = (Long)FinderCacheUtil.getResult(
-				finderPath, finderArgs, this);
-		}
+		Long count = (Long)FinderCacheUtil.getResult(
+			finderPath, finderArgs, this);
 
 		if (count == null) {
 			StringBundler query = new StringBundler(3);
@@ -8079,14 +7357,10 @@ public int countByC_L(long companyId, String layoutPrototypeUuid) {
 
 				count = (Long)q.uniqueResult();
 
-				if (productionMode) {
-					FinderCacheUtil.putResult(finderPath, finderArgs, count);
-				}
+				FinderCacheUtil.putResult(finderPath, finderArgs, count);
 			}
 			catch (Exception e) {
-				if (productionMode) {
-					FinderCacheUtil.removeResult(finderPath, finderArgs);
-				}
+				FinderCacheUtil.removeResult(finderPath, finderArgs);
 
 				throw processException(e);
 			}
@@ -8173,16 +7447,13 @@ public Layout fetchByP_I(
 
 		Object[] finderArgs = null;
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			finderArgs = new Object[] {privateLayout, iconImageId};
 		}
 
 		Object result = null;
 
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			result = FinderCacheUtil.getResult(
 				_finderPathFetchByP_I, finderArgs, this);
 		}
@@ -8224,7 +7495,7 @@ public Layout fetchByP_I(
 				List<Layout> list = q.list();
 
 				if (list.isEmpty()) {
-					if (useFinderCache && productionMode) {
+					if (useFinderCache) {
 						FinderCacheUtil.putResult(
 							_finderPathFetchByP_I, finderArgs, list);
 					}
@@ -8234,7 +7505,7 @@ public Layout fetchByP_I(
 						Collections.sort(list, Collections.reverseOrder());
 
 						if (_log.isWarnEnabled()) {
-							if (!useFinderCache || !productionMode) {
+							if (!useFinderCache) {
 								finderArgs = new Object[] {
 									privateLayout, iconImageId
 								};
@@ -8255,7 +7526,7 @@ public Layout fetchByP_I(
 				}
 			}
 			catch (Exception e) {
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.removeResult(
 						_finderPathFetchByP_I, finderArgs);
 				}
@@ -8300,22 +7571,12 @@ public Layout removeByP_I(boolean privateLayout, long iconImageId)
 	 */
 	@Override
 	public int countByP_I(boolean privateLayout, long iconImageId) {
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
+		FinderPath finderPath = _finderPathCountByP_I;
 
-		FinderPath finderPath = null;
-		Object[] finderArgs = null;
-
-		Long count = null;
+		Object[] finderArgs = new Object[] {privateLayout, iconImageId};
 
-		if (productionMode) {
-			finderPath = _finderPathCountByP_I;
-
-			finderArgs = new Object[] {privateLayout, iconImageId};
-
-			count = (Long)FinderCacheUtil.getResult(
-				finderPath, finderArgs, this);
-		}
+		Long count = (Long)FinderCacheUtil.getResult(
+			finderPath, finderArgs, this);
 
 		if (count == null) {
 			StringBundler query = new StringBundler(3);
@@ -8343,14 +7604,10 @@ public int countByP_I(boolean privateLayout, long iconImageId) {
 
 				count = (Long)q.uniqueResult();
 
-				if (productionMode) {
-					FinderCacheUtil.putResult(finderPath, finderArgs, count);
-				}
+				FinderCacheUtil.putResult(finderPath, finderArgs, count);
 			}
 			catch (Exception e) {
-				if (productionMode) {
-					FinderCacheUtil.removeResult(finderPath, finderArgs);
-				}
+				FinderCacheUtil.removeResult(finderPath, finderArgs);
 
 				throw processException(e);
 			}
@@ -8434,16 +7691,13 @@ public Layout fetchByC_C(
 
 		Object[] finderArgs = null;
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			finderArgs = new Object[] {classNameId, classPK};
 		}
 
 		Object result = null;
 
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			result = FinderCacheUtil.getResult(
 				_finderPathFetchByC_C, finderArgs, this);
 		}
@@ -8485,7 +7739,7 @@ public Layout fetchByC_C(
 				List<Layout> list = q.list();
 
 				if (list.isEmpty()) {
-					if (useFinderCache && productionMode) {
+					if (useFinderCache) {
 						FinderCacheUtil.putResult(
 							_finderPathFetchByC_C, finderArgs, list);
 					}
@@ -8495,7 +7749,7 @@ public Layout fetchByC_C(
 						Collections.sort(list, Collections.reverseOrder());
 
 						if (_log.isWarnEnabled()) {
-							if (!useFinderCache || !productionMode) {
+							if (!useFinderCache) {
 								finderArgs = new Object[] {
 									classNameId, classPK
 								};
@@ -8516,7 +7770,7 @@ public Layout fetchByC_C(
 				}
 			}
 			catch (Exception e) {
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.removeResult(
 						_finderPathFetchByC_C, finderArgs);
 				}
@@ -8561,22 +7815,12 @@ public Layout removeByC_C(long classNameId, long classPK)
 	 */
 	@Override
 	public int countByC_C(long classNameId, long classPK) {
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
-		FinderPath finderPath = null;
-		Object[] finderArgs = null;
+		FinderPath finderPath = _finderPathCountByC_C;
 
-		Long count = null;
-
-		if (productionMode) {
-			finderPath = _finderPathCountByC_C;
-
-			finderArgs = new Object[] {classNameId, classPK};
+		Object[] finderArgs = new Object[] {classNameId, classPK};
 
-			count = (Long)FinderCacheUtil.getResult(
-				finderPath, finderArgs, this);
-		}
+		Long count = (Long)FinderCacheUtil.getResult(
+			finderPath, finderArgs, this);
 
 		if (count == null) {
 			StringBundler query = new StringBundler(3);
@@ -8604,14 +7848,10 @@ public int countByC_C(long classNameId, long classPK) {
 
 				count = (Long)q.uniqueResult();
 
-				if (productionMode) {
-					FinderCacheUtil.putResult(finderPath, finderArgs, count);
-				}
+				FinderCacheUtil.putResult(finderPath, finderArgs, count);
 			}
 			catch (Exception e) {
-				if (productionMode) {
-					FinderCacheUtil.removeResult(finderPath, finderArgs);
-				}
+				FinderCacheUtil.removeResult(finderPath, finderArgs);
 
 				throw processException(e);
 			}
@@ -8705,16 +7945,13 @@ public Layout fetchByG_P_L(
 
 		Object[] finderArgs = null;
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			finderArgs = new Object[] {groupId, privateLayout, layoutId};
 		}
 
 		Object result = null;
 
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			result = FinderCacheUtil.getResult(
 				_finderPathFetchByG_P_L, finderArgs, this);
 		}
@@ -8761,7 +7998,7 @@ public Layout fetchByG_P_L(
 				List<Layout> list = q.list();
 
 				if (list.isEmpty()) {
-					if (useFinderCache && productionMode) {
+					if (useFinderCache) {
 						FinderCacheUtil.putResult(
 							_finderPathFetchByG_P_L, finderArgs, list);
 					}
@@ -8775,7 +8012,7 @@ public Layout fetchByG_P_L(
 				}
 			}
 			catch (Exception e) {
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.removeResult(
 						_finderPathFetchByG_P_L, finderArgs);
 				}
@@ -8825,22 +8062,12 @@ public Layout removeByG_P_L(
 	public int countByG_P_L(
 		long groupId, boolean privateLayout, long layoutId) {
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
-		FinderPath finderPath = null;
-		Object[] finderArgs = null;
-
-		Long count = null;
-
-		if (productionMode) {
-			finderPath = _finderPathCountByG_P_L;
+		FinderPath finderPath = _finderPathCountByG_P_L;
 
-			finderArgs = new Object[] {groupId, privateLayout, layoutId};
+		Object[] finderArgs = new Object[] {groupId, privateLayout, layoutId};
 
-			count = (Long)FinderCacheUtil.getResult(
-				finderPath, finderArgs, this);
-		}
+		Long count = (Long)FinderCacheUtil.getResult(
+			finderPath, finderArgs, this);
 
 		if (count == null) {
 			StringBundler query = new StringBundler(4);
@@ -8872,14 +8099,10 @@ public int countByG_P_L(
 
 				count = (Long)q.uniqueResult();
 
-				if (productionMode) {
-					FinderCacheUtil.putResult(finderPath, finderArgs, count);
-				}
+				FinderCacheUtil.putResult(finderPath, finderArgs, count);
 			}
 			catch (Exception e) {
-				if (productionMode) {
-					FinderCacheUtil.removeResult(finderPath, finderArgs);
-				}
+				FinderCacheUtil.removeResult(finderPath, finderArgs);
 
 				throw processException(e);
 			}
@@ -8996,22 +8219,19 @@ public List<Layout> findByG_P_P(
 		FinderPath finderPath = null;
 		Object[] finderArgs = null;
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
 		if ((start == QueryUtil.ALL_POS) && (end == QueryUtil.ALL_POS) &&
 			(orderByComparator == null)) {
 
 			pagination = false;
 
-			if (useFinderCache && productionMode) {
+			if (useFinderCache) {
 				finderPath = _finderPathWithoutPaginationFindByG_P_P;
 				finderArgs = new Object[] {
 					groupId, privateLayout, parentLayoutId
 				};
 			}
 		}
-		else if (useFinderCache && productionMode) {
+		else if (useFinderCache) {
 			finderPath = _finderPathWithPaginationFindByG_P_P;
 			finderArgs = new Object[] {
 				groupId, privateLayout, parentLayoutId, start, end,
@@ -9021,7 +8241,7 @@ else if (useFinderCache && productionMode) {
 
 		List<Layout> list = null;
 
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			list = (List<Layout>)FinderCacheUtil.getResult(
 				finderPath, finderArgs, this);
 
@@ -9098,12 +8318,12 @@ else if (pagination) {
 
 				cacheResult(list);
 
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.putResult(finderPath, finderArgs, list);
 				}
 			}
 			catch (Exception e) {
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.removeResult(finderPath, finderArgs);
 				}
 
@@ -10043,21 +9263,18 @@ else if (parentLayoutIds.length > 1) {
 		boolean pagination = true;
 		Object[] finderArgs = null;
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
 		if ((start == QueryUtil.ALL_POS) && (end == QueryUtil.ALL_POS) &&
 			(orderByComparator == null)) {
 
 			pagination = false;
 
-			if (useFinderCache && productionMode) {
+			if (useFinderCache) {
 				finderArgs = new Object[] {
 					groupId, privateLayout, StringUtil.merge(parentLayoutIds)
 				};
 			}
 		}
-		else if (useFinderCache && productionMode) {
+		else if (useFinderCache) {
 			finderArgs = new Object[] {
 				groupId, privateLayout, StringUtil.merge(parentLayoutIds),
 				start, end, orderByComparator
@@ -10066,7 +9283,7 @@ else if (useFinderCache && productionMode) {
 
 		List<Layout> list = null;
 
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			list = (List<Layout>)FinderCacheUtil.getResult(
 				_finderPathWithPaginationFindByG_P_P, finderArgs, this);
 
@@ -10116,13 +9333,13 @@ else if (useFinderCache && productionMode) {
 
 				cacheResult(list);
 
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.putResult(
 						_finderPathWithPaginationFindByG_P_P, finderArgs, list);
 				}
 			}
 			catch (Exception e) {
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.removeResult(
 						_finderPathWithPaginationFindByG_P_P, finderArgs);
 				}
@@ -10245,22 +9462,14 @@ public void removeByG_P_P(
 	public int countByG_P_P(
 		long groupId, boolean privateLayout, long parentLayoutId) {
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
-		FinderPath finderPath = null;
-		Object[] finderArgs = null;
-
-		Long count = null;
-
-		if (productionMode) {
-			finderPath = _finderPathCountByG_P_P;
+		FinderPath finderPath = _finderPathCountByG_P_P;
 
-			finderArgs = new Object[] {groupId, privateLayout, parentLayoutId};
+		Object[] finderArgs = new Object[] {
+			groupId, privateLayout, parentLayoutId
+		};
 
-			count = (Long)FinderCacheUtil.getResult(
-				finderPath, finderArgs, this);
-		}
+		Long count = (Long)FinderCacheUtil.getResult(
+			finderPath, finderArgs, this);
 
 		if (count == null) {
 			StringBundler query = new StringBundler(4);
@@ -10292,14 +9501,10 @@ public int countByG_P_P(
 
 				count = (Long)q.uniqueResult();
 
-				if (productionMode) {
-					FinderCacheUtil.putResult(finderPath, finderArgs, count);
-				}
+				FinderCacheUtil.putResult(finderPath, finderArgs, count);
 			}
 			catch (Exception e) {
-				if (productionMode) {
-					FinderCacheUtil.removeResult(finderPath, finderArgs);
-				}
+				FinderCacheUtil.removeResult(finderPath, finderArgs);
 
 				throw processException(e);
 			}
@@ -10330,21 +9535,12 @@ else if (parentLayoutIds.length > 1) {
 			parentLayoutIds = ArrayUtil.sortedUnique(parentLayoutIds);
 		}
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
-		Object[] finderArgs = null;
-
-		Long count = null;
-
-		if (productionMode) {
-			finderArgs = new Object[] {
-				groupId, privateLayout, StringUtil.merge(parentLayoutIds)
-			};
+		Object[] finderArgs = new Object[] {
+			groupId, privateLayout, StringUtil.merge(parentLayoutIds)
+		};
 
-			count = (Long)FinderCacheUtil.getResult(
-				_finderPathWithPaginationCountByG_P_P, finderArgs, this);
-		}
+		Long count = (Long)FinderCacheUtil.getResult(
+			_finderPathWithPaginationCountByG_P_P, finderArgs, this);
 
 		if (count == null) {
 			try {
@@ -10367,17 +9563,12 @@ else if (parentLayoutIds.length > 1) {
 						_countByG_P_P(groupId, privateLayout, parentLayoutIds));
 				}
 
-				if (productionMode) {
-					FinderCacheUtil.putResult(
-						_finderPathWithPaginationCountByG_P_P, finderArgs,
-						count);
-				}
+				FinderCacheUtil.putResult(
+					_finderPathWithPaginationCountByG_P_P, finderArgs, count);
 			}
 			catch (Exception e) {
-				if (productionMode) {
-					FinderCacheUtil.removeResult(
-						_finderPathWithPaginationCountByG_P_P, finderArgs);
-				}
+				FinderCacheUtil.removeResult(
+					_finderPathWithPaginationCountByG_P_P, finderArgs);
 
 				throw processException(e);
 			}
@@ -10702,20 +9893,17 @@ public List<Layout> findByG_P_T(
 		FinderPath finderPath = null;
 		Object[] finderArgs = null;
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
 		if ((start == QueryUtil.ALL_POS) && (end == QueryUtil.ALL_POS) &&
 			(orderByComparator == null)) {
 
 			pagination = false;
 
-			if (useFinderCache && productionMode) {
+			if (useFinderCache) {
 				finderPath = _finderPathWithoutPaginationFindByG_P_T;
 				finderArgs = new Object[] {groupId, privateLayout, type};
 			}
 		}
-		else if (useFinderCache && productionMode) {
+		else if (useFinderCache) {
 			finderPath = _finderPathWithPaginationFindByG_P_T;
 			finderArgs = new Object[] {
 				groupId, privateLayout, type, start, end, orderByComparator
@@ -10724,7 +9912,7 @@ else if (useFinderCache && productionMode) {
 
 		List<Layout> list = null;
 
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			list = (List<Layout>)FinderCacheUtil.getResult(
 				finderPath, finderArgs, this);
 
@@ -10812,12 +10000,12 @@ else if (pagination) {
 
 				cacheResult(list);
 
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.putResult(finderPath, finderArgs, list);
 				}
 			}
 			catch (Exception e) {
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.removeResult(finderPath, finderArgs);
 				}
 
@@ -11556,22 +10744,12 @@ public void removeByG_P_T(
 	public int countByG_P_T(long groupId, boolean privateLayout, String type) {
 		type = Objects.toString(type, "");
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
-		FinderPath finderPath = null;
-		Object[] finderArgs = null;
-
-		Long count = null;
-
-		if (productionMode) {
-			finderPath = _finderPathCountByG_P_T;
+		FinderPath finderPath = _finderPathCountByG_P_T;
 
-			finderArgs = new Object[] {groupId, privateLayout, type};
+		Object[] finderArgs = new Object[] {groupId, privateLayout, type};
 
-			count = (Long)FinderCacheUtil.getResult(
-				finderPath, finderArgs, this);
-		}
+		Long count = (Long)FinderCacheUtil.getResult(
+			finderPath, finderArgs, this);
 
 		if (count == null) {
 			StringBundler query = new StringBundler(4);
@@ -11614,14 +10792,10 @@ public int countByG_P_T(long groupId, boolean privateLayout, String type) {
 
 				count = (Long)q.uniqueResult();
 
-				if (productionMode) {
-					FinderCacheUtil.putResult(finderPath, finderArgs, count);
-				}
+				FinderCacheUtil.putResult(finderPath, finderArgs, count);
 			}
 			catch (Exception e) {
-				if (productionMode) {
-					FinderCacheUtil.removeResult(finderPath, finderArgs);
-				}
+				FinderCacheUtil.removeResult(finderPath, finderArgs);
 
 				throw processException(e);
 			}
@@ -11808,16 +10982,13 @@ public Layout fetchByG_P_F(
 
 		Object[] finderArgs = null;
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			finderArgs = new Object[] {groupId, privateLayout, friendlyURL};
 		}
 
 		Object result = null;
 
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			result = FinderCacheUtil.getResult(
 				_finderPathFetchByG_P_F, finderArgs, this);
 		}
@@ -11875,7 +11046,7 @@ public Layout fetchByG_P_F(
 				List<Layout> list = q.list();
 
 				if (list.isEmpty()) {
-					if (useFinderCache && productionMode) {
+					if (useFinderCache) {
 						FinderCacheUtil.putResult(
 							_finderPathFetchByG_P_F, finderArgs, list);
 					}
@@ -11889,7 +11060,7 @@ public Layout fetchByG_P_F(
 				}
 			}
 			catch (Exception e) {
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.removeResult(
 						_finderPathFetchByG_P_F, finderArgs);
 				}
@@ -11941,22 +11112,14 @@ public int countByG_P_F(
 
 		friendlyURL = Objects.toString(friendlyURL, "");
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
-		FinderPath finderPath = null;
-		Object[] finderArgs = null;
-
-		Long count = null;
-
-		if (productionMode) {
-			finderPath = _finderPathCountByG_P_F;
+		FinderPath finderPath = _finderPathCountByG_P_F;
 
-			finderArgs = new Object[] {groupId, privateLayout, friendlyURL};
+		Object[] finderArgs = new Object[] {
+			groupId, privateLayout, friendlyURL
+		};
 
-			count = (Long)FinderCacheUtil.getResult(
-				finderPath, finderArgs, this);
-		}
+		Long count = (Long)FinderCacheUtil.getResult(
+			finderPath, finderArgs, this);
 
 		if (count == null) {
 			StringBundler query = new StringBundler(4);
@@ -11999,14 +11162,10 @@ public int countByG_P_F(
 
 				count = (Long)q.uniqueResult();
 
-				if (productionMode) {
-					FinderCacheUtil.putResult(finderPath, finderArgs, count);
-				}
+				FinderCacheUtil.putResult(finderPath, finderArgs, count);
 			}
 			catch (Exception e) {
-				if (productionMode) {
-					FinderCacheUtil.removeResult(finderPath, finderArgs);
-				}
+				FinderCacheUtil.removeResult(finderPath, finderArgs);
 
 				throw processException(e);
 			}
@@ -12112,10 +11271,7 @@ public Layout fetchByG_P_SPLU(
 
 		Object[] finderArgs = null;
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			finderArgs = new Object[] {
 				groupId, privateLayout, sourcePrototypeLayoutUuid
 			};
@@ -12123,7 +11279,7 @@ public Layout fetchByG_P_SPLU(
 
 		Object result = null;
 
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			result = FinderCacheUtil.getResult(
 				_finderPathFetchByG_P_SPLU, finderArgs, this);
 		}
@@ -12185,7 +11341,7 @@ public Layout fetchByG_P_SPLU(
 				List<Layout> list = q.list();
 
 				if (list.isEmpty()) {
-					if (useFinderCache && productionMode) {
+					if (useFinderCache) {
 						FinderCacheUtil.putResult(
 							_finderPathFetchByG_P_SPLU, finderArgs, list);
 					}
@@ -12195,7 +11351,7 @@ public Layout fetchByG_P_SPLU(
 						Collections.sort(list, Collections.reverseOrder());
 
 						if (_log.isWarnEnabled()) {
-							if (!useFinderCache || !productionMode) {
+							if (!useFinderCache) {
 								finderArgs = new Object[] {
 									groupId, privateLayout,
 									sourcePrototypeLayoutUuid
@@ -12217,7 +11373,7 @@ public Layout fetchByG_P_SPLU(
 				}
 			}
 			catch (Exception e) {
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.removeResult(
 						_finderPathFetchByG_P_SPLU, finderArgs);
 				}
@@ -12272,24 +11428,14 @@ public int countByG_P_SPLU(
 		sourcePrototypeLayoutUuid = Objects.toString(
 			sourcePrototypeLayoutUuid, "");
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
-		FinderPath finderPath = null;
-		Object[] finderArgs = null;
-
-		Long count = null;
-
-		if (productionMode) {
-			finderPath = _finderPathCountByG_P_SPLU;
+		FinderPath finderPath = _finderPathCountByG_P_SPLU;
 
-			finderArgs = new Object[] {
-				groupId, privateLayout, sourcePrototypeLayoutUuid
-			};
+		Object[] finderArgs = new Object[] {
+			groupId, privateLayout, sourcePrototypeLayoutUuid
+		};
 
-			count = (Long)FinderCacheUtil.getResult(
-				finderPath, finderArgs, this);
-		}
+		Long count = (Long)FinderCacheUtil.getResult(
+			finderPath, finderArgs, this);
 
 		if (count == null) {
 			StringBundler query = new StringBundler(4);
@@ -12334,14 +11480,10 @@ public int countByG_P_SPLU(
 
 				count = (Long)q.uniqueResult();
 
-				if (productionMode) {
-					FinderCacheUtil.putResult(finderPath, finderArgs, count);
-				}
+				FinderCacheUtil.putResult(finderPath, finderArgs, count);
 			}
 			catch (Exception e) {
-				if (productionMode) {
-					FinderCacheUtil.removeResult(finderPath, finderArgs);
-				}
+				FinderCacheUtil.removeResult(finderPath, finderArgs);
 
 				throw processException(e);
 			}
@@ -12469,22 +11611,19 @@ public List<Layout> findByG_P_P_H(
 		FinderPath finderPath = null;
 		Object[] finderArgs = null;
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
 		if ((start == QueryUtil.ALL_POS) && (end == QueryUtil.ALL_POS) &&
 			(orderByComparator == null)) {
 
 			pagination = false;
 
-			if (useFinderCache && productionMode) {
+			if (useFinderCache) {
 				finderPath = _finderPathWithoutPaginationFindByG_P_P_H;
 				finderArgs = new Object[] {
 					groupId, privateLayout, parentLayoutId, hidden
 				};
 			}
 		}
-		else if (useFinderCache && productionMode) {
+		else if (useFinderCache) {
 			finderPath = _finderPathWithPaginationFindByG_P_P_H;
 			finderArgs = new Object[] {
 				groupId, privateLayout, parentLayoutId, hidden, start, end,
@@ -12494,7 +11633,7 @@ else if (useFinderCache && productionMode) {
 
 		List<Layout> list = null;
 
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			list = (List<Layout>)FinderCacheUtil.getResult(
 				finderPath, finderArgs, this);
 
@@ -12576,12 +11715,12 @@ else if (pagination) {
 
 				cacheResult(list);
 
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.putResult(finderPath, finderArgs, list);
 				}
 			}
 			catch (Exception e) {
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.removeResult(finderPath, finderArgs);
 				}
 
@@ -13569,22 +12708,19 @@ else if (parentLayoutIds.length > 1) {
 		boolean pagination = true;
 		Object[] finderArgs = null;
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
 		if ((start == QueryUtil.ALL_POS) && (end == QueryUtil.ALL_POS) &&
 			(orderByComparator == null)) {
 
 			pagination = false;
 
-			if (useFinderCache && productionMode) {
+			if (useFinderCache) {
 				finderArgs = new Object[] {
 					groupId, privateLayout, StringUtil.merge(parentLayoutIds),
 					hidden
 				};
 			}
 		}
-		else if (useFinderCache && productionMode) {
+		else if (useFinderCache) {
 			finderArgs = new Object[] {
 				groupId, privateLayout, StringUtil.merge(parentLayoutIds),
 				hidden, start, end, orderByComparator
@@ -13593,7 +12729,7 @@ else if (useFinderCache && productionMode) {
 
 		List<Layout> list = null;
 
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			list = (List<Layout>)FinderCacheUtil.getResult(
 				_finderPathWithPaginationFindByG_P_P_H, finderArgs, this);
 
@@ -13645,14 +12781,14 @@ else if (useFinderCache && productionMode) {
 
 				cacheResult(list);
 
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.putResult(
 						_finderPathWithPaginationFindByG_P_P_H, finderArgs,
 						list);
 				}
 			}
 			catch (Exception e) {
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.removeResult(
 						_finderPathWithPaginationFindByG_P_P_H, finderArgs);
 				}
@@ -13785,24 +12921,14 @@ public int countByG_P_P_H(
 		long groupId, boolean privateLayout, long parentLayoutId,
 		boolean hidden) {
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
-		FinderPath finderPath = null;
-		Object[] finderArgs = null;
-
-		Long count = null;
-
-		if (productionMode) {
-			finderPath = _finderPathCountByG_P_P_H;
+		FinderPath finderPath = _finderPathCountByG_P_P_H;
 
-			finderArgs = new Object[] {
-				groupId, privateLayout, parentLayoutId, hidden
-			};
+		Object[] finderArgs = new Object[] {
+			groupId, privateLayout, parentLayoutId, hidden
+		};
 
-			count = (Long)FinderCacheUtil.getResult(
-				finderPath, finderArgs, this);
-		}
+		Long count = (Long)FinderCacheUtil.getResult(
+			finderPath, finderArgs, this);
 
 		if (count == null) {
 			StringBundler query = new StringBundler(5);
@@ -13838,14 +12964,10 @@ public int countByG_P_P_H(
 
 				count = (Long)q.uniqueResult();
 
-				if (productionMode) {
-					FinderCacheUtil.putResult(finderPath, finderArgs, count);
-				}
+				FinderCacheUtil.putResult(finderPath, finderArgs, count);
 			}
 			catch (Exception e) {
-				if (productionMode) {
-					FinderCacheUtil.removeResult(finderPath, finderArgs);
-				}
+				FinderCacheUtil.removeResult(finderPath, finderArgs);
 
 				throw processException(e);
 			}
@@ -13878,22 +13000,12 @@ else if (parentLayoutIds.length > 1) {
 			parentLayoutIds = ArrayUtil.sortedUnique(parentLayoutIds);
 		}
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
-		Object[] finderArgs = null;
-
-		Long count = null;
-
-		if (productionMode) {
-			finderArgs = new Object[] {
-				groupId, privateLayout, StringUtil.merge(parentLayoutIds),
-				hidden
-			};
+		Object[] finderArgs = new Object[] {
+			groupId, privateLayout, StringUtil.merge(parentLayoutIds), hidden
+		};
 
-			count = (Long)FinderCacheUtil.getResult(
-				_finderPathWithPaginationCountByG_P_P_H, finderArgs, this);
-		}
+		Long count = (Long)FinderCacheUtil.getResult(
+			_finderPathWithPaginationCountByG_P_P_H, finderArgs, this);
 
 		if (count == null) {
 			try {
@@ -13918,17 +13030,12 @@ else if (parentLayoutIds.length > 1) {
 							groupId, privateLayout, parentLayoutIds, hidden));
 				}
 
-				if (productionMode) {
-					FinderCacheUtil.putResult(
-						_finderPathWithPaginationCountByG_P_P_H, finderArgs,
-						count);
-				}
+				FinderCacheUtil.putResult(
+					_finderPathWithPaginationCountByG_P_P_H, finderArgs, count);
 			}
 			catch (Exception e) {
-				if (productionMode) {
-					FinderCacheUtil.removeResult(
-						_finderPathWithPaginationCountByG_P_P_H, finderArgs);
-				}
+				FinderCacheUtil.removeResult(
+					_finderPathWithPaginationCountByG_P_P_H, finderArgs);
 
 				throw processException(e);
 			}
@@ -14288,9 +13395,6 @@ public List<Layout> findByG_P_P_LtP(
 		FinderPath finderPath = null;
 		Object[] finderArgs = null;
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
 		finderPath = _finderPathWithPaginationFindByG_P_P_LtP;
 		finderArgs = new Object[] {
 			groupId, privateLayout, parentLayoutId, priority, start, end,
@@ -14299,7 +13403,7 @@ public List<Layout> findByG_P_P_LtP(
 
 		List<Layout> list = null;
 
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			list = (List<Layout>)FinderCacheUtil.getResult(
 				finderPath, finderArgs, this);
 
@@ -14381,12 +13485,12 @@ else if (pagination) {
 
 				cacheResult(list);
 
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.putResult(finderPath, finderArgs, list);
 				}
 			}
 			catch (Exception e) {
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.removeResult(finderPath, finderArgs);
 				}
 
@@ -15126,24 +14230,14 @@ public int countByG_P_P_LtP(
 		long groupId, boolean privateLayout, long parentLayoutId,
 		int priority) {
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
-		FinderPath finderPath = null;
-		Object[] finderArgs = null;
-
-		Long count = null;
-
-		if (productionMode) {
-			finderPath = _finderPathWithPaginationCountByG_P_P_LtP;
+		FinderPath finderPath = _finderPathWithPaginationCountByG_P_P_LtP;
 
-			finderArgs = new Object[] {
-				groupId, privateLayout, parentLayoutId, priority
-			};
+		Object[] finderArgs = new Object[] {
+			groupId, privateLayout, parentLayoutId, priority
+		};
 
-			count = (Long)FinderCacheUtil.getResult(
-				finderPath, finderArgs, this);
-		}
+		Long count = (Long)FinderCacheUtil.getResult(
+			finderPath, finderArgs, this);
 
 		if (count == null) {
 			StringBundler query = new StringBundler(5);
@@ -15179,14 +14273,10 @@ public int countByG_P_P_LtP(
 
 				count = (Long)q.uniqueResult();
 
-				if (productionMode) {
-					FinderCacheUtil.putResult(finderPath, finderArgs, count);
-				}
+				FinderCacheUtil.putResult(finderPath, finderArgs, count);
 			}
 			catch (Exception e) {
-				if (productionMode) {
-					FinderCacheUtil.removeResult(finderPath, finderArgs);
-				}
+				FinderCacheUtil.removeResult(finderPath, finderArgs);
 
 				throw processException(e);
 			}
@@ -15313,12 +14403,6 @@ public LayoutPersistenceImpl() {
 	 */
 	@Override
 	public void cacheResult(Layout layout) {
-		if (layout.getCtCollectionId() != 0) {
-			layout.resetOriginalValues();
-
-			return;
-		}
-
 		EntityCacheUtil.putResult(
 			LayoutModelImpl.ENTITY_CACHE_ENABLED, LayoutImpl.class,
 			layout.getPrimaryKey(), layout);
@@ -15379,12 +14463,6 @@ public void cacheResult(Layout layout) {
 	@Override
 	public void cacheResult(List<Layout> layouts) {
 		for (Layout layout : layouts) {
-			if (layout.getCtCollectionId() != 0) {
-				layout.resetOriginalValues();
-
-				continue;
-			}
-
 			if (EntityCacheUtil.getResult(
 					LayoutModelImpl.ENTITY_CACHE_ENABLED, LayoutImpl.class,
 					layout.getPrimaryKey()) == null) {
@@ -15742,49 +14820,8 @@ public Layout remove(Serializable primaryKey) throws NoSuchLayoutException {
 		}
 	}
 
-	@Override
-	public List<String[]> getUniqueIndexColumnNames() {
-		return _uniqueIndexColumnNames;
-	}
-
-	@Override
-	public Layout removeCTModel(Layout layout, boolean quiet) {
-		if (quiet) {
-			return removeImpl(layout);
-		}
-
-		return remove(layout);
-	}
-
-	@Override
-	public Layout updateCTModel(Layout layout, boolean quiet) {
-		if (quiet) {
-			return updateImpl(layout);
-		}
-
-		return update(layout);
-	}
-
-	private static final List<String[]> _uniqueIndexColumnNames =
-		new ArrayList<String[]>();
-
-	static {
-		_uniqueIndexColumnNames.add(
-			new String[] {"uuid_", "groupId", "privateLayout"});
-
-		_uniqueIndexColumnNames.add(
-			new String[] {"groupId", "privateLayout", "layoutId"});
-
-		_uniqueIndexColumnNames.add(
-			new String[] {"groupId", "privateLayout", "friendlyURL"});
-	}
-
 	@Override
 	protected Layout removeImpl(Layout layout) {
-		if (!CTPersistenceHelperUtil.isRemove(layout)) {
-			return layout;
-		}
-
 		Session session = null;
 
 		try {
@@ -15869,16 +14906,7 @@ public Layout updateImpl(Layout layout) {
 		try {
 			session = openSession();
 
-			if (CTPersistenceHelperUtil.isInsert(layout)) {
-				if (!isNew) {
-					Layout oldLayout = (Layout)session.get(
-						LayoutImpl.class, layout.getPrimaryKeyObj());
-
-					if (oldLayout != null) {
-						session.evict(oldLayout);
-					}
-				}
-
+			if (layout.isNew()) {
 				session.save(layout);
 
 				layout.setNew(false);
@@ -15894,47 +14922,6 @@ public Layout updateImpl(Layout layout) {
 			closeSession(session);
 		}
 
-		if (layout.getCtCollectionId() != 0) {
-			if (!LayoutModelImpl.COLUMN_BITMASK_ENABLED) {
-				FinderCacheUtil.clearCache(
-					FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
-			}
-			else if (isNew) {
-				Object[] args = new Object[] {
-					layoutModelImpl.getCtCollectionId()
-				};
-
-				FinderCacheUtil.removeResult(
-					_finderPathCountByCTCollectionId, args);
-				FinderCacheUtil.removeResult(
-					_finderPathWithoutPaginationFindByCTCollectionId, args);
-			}
-			else if ((layoutModelImpl.getColumnBitmask() &
-					  _finderPathWithoutPaginationFindByCTCollectionId.
-						  getColumnBitmask()) != 0) {
-
-				Object[] args = new Object[] {
-					layoutModelImpl.getOriginalCtCollectionId()
-				};
-
-				FinderCacheUtil.removeResult(
-					_finderPathCountByCTCollectionId, args);
-				FinderCacheUtil.removeResult(
-					_finderPathWithoutPaginationFindByCTCollectionId, args);
-
-				args = new Object[] {layoutModelImpl.getCtCollectionId()};
-
-				FinderCacheUtil.removeResult(
-					_finderPathCountByCTCollectionId, args);
-				FinderCacheUtil.removeResult(
-					_finderPathWithoutPaginationFindByCTCollectionId, args);
-			}
-
-			layout.resetOriginalValues();
-
-			return layout;
-		}
-
 		FinderCacheUtil.clearCache(FINDER_CLASS_NAME_LIST_WITH_PAGINATION);
 
 		if (!LayoutModelImpl.COLUMN_BITMASK_ENABLED) {
@@ -15956,13 +14943,6 @@ else if (isNew) {
 			FinderCacheUtil.removeResult(
 				_finderPathWithoutPaginationFindByUuid_C, args);
 
-			args = new Object[] {layoutModelImpl.getCtCollectionId()};
-
-			FinderCacheUtil.removeResult(
-				_finderPathCountByCTCollectionId, args);
-			FinderCacheUtil.removeResult(
-				_finderPathWithoutPaginationFindByCTCollectionId, args);
-
 			args = new Object[] {layoutModelImpl.getGroupId()};
 
 			FinderCacheUtil.removeResult(_finderPathCountByGroupId, args);
@@ -16097,27 +15077,6 @@ else if (isNew) {
 					_finderPathWithoutPaginationFindByUuid_C, args);
 			}
 
-			if ((layoutModelImpl.getColumnBitmask() &
-				 _finderPathWithoutPaginationFindByCTCollectionId.
-					 getColumnBitmask()) != 0) {
-
-				Object[] args = new Object[] {
-					layoutModelImpl.getOriginalCtCollectionId()
-				};
-
-				FinderCacheUtil.removeResult(
-					_finderPathCountByCTCollectionId, args);
-				FinderCacheUtil.removeResult(
-					_finderPathWithoutPaginationFindByCTCollectionId, args);
-
-				args = new Object[] {layoutModelImpl.getCtCollectionId()};
-
-				FinderCacheUtil.removeResult(
-					_finderPathCountByCTCollectionId, args);
-				FinderCacheUtil.removeResult(
-					_finderPathWithoutPaginationFindByCTCollectionId, args);
-			}
-
 			if ((layoutModelImpl.getColumnBitmask() &
 				 _finderPathWithoutPaginationFindByGroupId.
 					 getColumnBitmask()) != 0) {
@@ -16419,41 +15378,6 @@ public Layout findByPrimaryKey(long plid) throws NoSuchLayoutException {
 		return findByPrimaryKey((Serializable)plid);
 	}
 
-	/**
-	 * Returns the layout with the primary key or returns <code>null</code> if it could not be found.
-	 *
-	 * @param primaryKey the primary key of the layout
-	 * @return the layout, or <code>null</code> if a layout with the primary key could not be found
-	 */
-	@Override
-	public Layout fetchByPrimaryKey(Serializable primaryKey) {
-		if (CTPersistenceHelperUtil.isProductionMode(Layout.class)) {
-			return super.fetchByPrimaryKey(primaryKey);
-		}
-
-		Layout layout = null;
-
-		Session session = null;
-
-		try {
-			session = openSession();
-
-			layout = (Layout)session.get(LayoutImpl.class, primaryKey);
-
-			if (layout != null) {
-				cacheResult(layout);
-			}
-		}
-		catch (Exception e) {
-			throw processException(e);
-		}
-		finally {
-			closeSession(session);
-		}
-
-		return layout;
-	}
-
 	/**
 	 * Returns the layout with the primary key or returns <code>null</code> if it could not be found.
 	 *
@@ -16465,76 +15389,6 @@ public Layout fetchByPrimaryKey(long plid) {
 		return fetchByPrimaryKey((Serializable)plid);
 	}
 
-	@Override
-	public Map<Serializable, Layout> fetchByPrimaryKeys(
-		Set<Serializable> primaryKeys) {
-
-		if (CTPersistenceHelperUtil.isProductionMode(Layout.class)) {
-			return super.fetchByPrimaryKeys(primaryKeys);
-		}
-
-		if (primaryKeys.isEmpty()) {
-			return Collections.emptyMap();
-		}
-
-		Map<Serializable, Layout> map = new HashMap<Serializable, Layout>();
-
-		if (primaryKeys.size() == 1) {
-			Iterator<Serializable> iterator = primaryKeys.iterator();
-
-			Serializable primaryKey = iterator.next();
-
-			Layout layout = fetchByPrimaryKey(primaryKey);
-
-			if (layout != null) {
-				map.put(primaryKey, layout);
-			}
-
-			return map;
-		}
-
-		StringBundler query = new StringBundler(primaryKeys.size() * 2 + 1);
-
-		query.append(getSelectSQL());
-		query.append(" WHERE ");
-		query.append(getPKDBName());
-		query.append(" IN (");
-
-		for (Serializable primaryKey : primaryKeys) {
-			query.append((long)primaryKey);
-
-			query.append(",");
-		}
-
-		query.setIndex(query.index() - 1);
-
-		query.append(")");
-
-		String sql = query.toString();
-
-		Session session = null;
-
-		try {
-			session = openSession();
-
-			Query q = session.createQuery(sql);
-
-			for (Layout layout : (List<Layout>)q.list()) {
-				map.put(layout.getPrimaryKeyObj(), layout);
-
-				cacheResult(layout);
-			}
-		}
-		catch (Exception e) {
-			throw processException(e);
-		}
-		finally {
-			closeSession(session);
-		}
-
-		return map;
-	}
-
 	/**
 	 * Returns all the layouts.
 	 *
@@ -16602,27 +15456,24 @@ public List<Layout> findAll(
 		FinderPath finderPath = null;
 		Object[] finderArgs = null;
 
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
 		if ((start == QueryUtil.ALL_POS) && (end == QueryUtil.ALL_POS) &&
 			(orderByComparator == null)) {
 
 			pagination = false;
 
-			if (useFinderCache && productionMode) {
+			if (useFinderCache) {
 				finderPath = _finderPathWithoutPaginationFindAll;
 				finderArgs = FINDER_ARGS_EMPTY;
 			}
 		}
-		else if (useFinderCache && productionMode) {
+		else if (useFinderCache) {
 			finderPath = _finderPathWithPaginationFindAll;
 			finderArgs = new Object[] {start, end, orderByComparator};
 		}
 
 		List<Layout> list = null;
 
-		if (useFinderCache && productionMode) {
+		if (useFinderCache) {
 			list = (List<Layout>)FinderCacheUtil.getResult(
 				finderPath, finderArgs, this);
 		}
@@ -16672,12 +15523,12 @@ else if (useFinderCache && productionMode) {
 
 				cacheResult(list);
 
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.putResult(finderPath, finderArgs, list);
 				}
 			}
 			catch (Exception e) {
-				if (useFinderCache && productionMode) {
+				if (useFinderCache) {
 					FinderCacheUtil.removeResult(finderPath, finderArgs);
 				}
 
@@ -16709,15 +15560,8 @@ public void removeAll() {
 	 */
 	@Override
 	public int countAll() {
-		boolean productionMode = CTPersistenceHelperUtil.isProductionMode(
-			Layout.class);
-
-		Long count = null;
-
-		if (productionMode) {
-			count = (Long)FinderCacheUtil.getResult(
-				_finderPathCountAll, FINDER_ARGS_EMPTY, this);
-		}
+		Long count = (Long)FinderCacheUtil.getResult(
+			_finderPathCountAll, FINDER_ARGS_EMPTY, this);
 
 		if (count == null) {
 			Session session = null;
@@ -16729,16 +15573,12 @@ public int countAll() {
 
 				count = (Long)q.uniqueResult();
 
-				if (productionMode) {
-					FinderCacheUtil.putResult(
-						_finderPathCountAll, FINDER_ARGS_EMPTY, count);
-				}
+				FinderCacheUtil.putResult(
+					_finderPathCountAll, FINDER_ARGS_EMPTY, count);
 			}
 			catch (Exception e) {
-				if (productionMode) {
-					FinderCacheUtil.removeResult(
-						_finderPathCountAll, FINDER_ARGS_EMPTY);
-				}
+				FinderCacheUtil.removeResult(
+					_finderPathCountAll, FINDER_ARGS_EMPTY);
 
 				throw processException(e);
 			}
@@ -16867,30 +15707,6 @@ public void afterPropertiesSet() {
 			FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION, "countByUuid_C",
 			new String[] {String.class.getName(), Long.class.getName()});
 
-		_finderPathWithPaginationFindByCTCollectionId = new FinderPath(
-			LayoutModelImpl.ENTITY_CACHE_ENABLED,
-			LayoutModelImpl.FINDER_CACHE_ENABLED, LayoutImpl.class,
-			FINDER_CLASS_NAME_LIST_WITH_PAGINATION, "findByCTCollectionId",
-			new String[] {
-				Long.class.getName(), Integer.class.getName(),
-				Integer.class.getName(), OrderByComparator.class.getName()
-			});
-
-		_finderPathWithoutPaginationFindByCTCollectionId = new FinderPath(
-			LayoutModelImpl.ENTITY_CACHE_ENABLED,
-			LayoutModelImpl.FINDER_CACHE_ENABLED, LayoutImpl.class,
-			FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION, "findByCTCollectionId",
-			new String[] {Long.class.getName()},
-			LayoutModelImpl.CTCOLLECTIONID_COLUMN_BITMASK |
-			LayoutModelImpl.PARENTLAYOUTID_COLUMN_BITMASK |
-			LayoutModelImpl.PRIORITY_COLUMN_BITMASK);
-
-		_finderPathCountByCTCollectionId = new FinderPath(
-			LayoutModelImpl.ENTITY_CACHE_ENABLED,
-			LayoutModelImpl.FINDER_CACHE_ENABLED, Long.class,
-			FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION, "countByCTCollectionId",
-			new String[] {Long.class.getName()});
-
 		_finderPathWithPaginationFindByGroupId = new FinderPath(
 			LayoutModelImpl.ENTITY_CACHE_ENABLED,
 			LayoutModelImpl.FINDER_CACHE_ENABLED, LayoutImpl.class,
diff --git a/portal-impl/src/com/liferay/portal/service/persistence/impl/VirtualHostPersistenceImpl.java b/portal-impl/src/com/liferay/portal/service/persistence/impl/VirtualHostPersistenceImpl.java
index 5d6c927561aae8..249e3459bb4fdc 100644
--- a/portal-impl/src/com/liferay/portal/service/persistence/impl/VirtualHostPersistenceImpl.java
+++ b/portal-impl/src/com/liferay/portal/service/persistence/impl/VirtualHostPersistenceImpl.java
@@ -32,6 +32,7 @@
 import com.liferay.portal.kernel.service.persistence.impl.BasePersistenceImpl;
 import com.liferay.portal.kernel.util.OrderByComparator;
 import com.liferay.portal.kernel.util.ProxyUtil;
+import com.liferay.portal.kernel.util.StringUtil;
 import com.liferay.portal.model.impl.VirtualHostImpl;
 import com.liferay.portal.model.impl.VirtualHostModelImpl;
 
@@ -309,25 +310,587 @@ public int countByHostname(String hostname) {
 	private static final String _FINDER_COLUMN_HOSTNAME_HOSTNAME_3 =
 		"(virtualHost.hostname IS NULL OR virtualHost.hostname = '')";
 
-	private FinderPath _finderPathFetchByC_L;
+	private FinderPath _finderPathWithPaginationFindByC_L;
+	private FinderPath _finderPathWithoutPaginationFindByC_L;
 	private FinderPath _finderPathCountByC_L;
 
 	/**
-	 * Returns the virtual host where companyId = &#63; and layoutSetId = &#63; or throws a <code>NoSuchVirtualHostException</code> if it could not be found.
+	 * Returns all the virtual hosts where companyId = &#63; and layoutSetId = &#63;.
 	 *
 	 * @param companyId the company ID
 	 * @param layoutSetId the layout set ID
+	 * @return the matching virtual hosts
+	 */
+	@Override
+	public List<VirtualHost> findByC_L(long companyId, long layoutSetId) {
+		return findByC_L(
+			companyId, layoutSetId, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null);
+	}
+
+	/**
+	 * Returns a range of all the virtual hosts where companyId = &#63; and layoutSetId = &#63;.
+	 *
+	 * <p>
+	 * Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to <code>QueryUtil#ALL_POS</code> will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not <code>QueryUtil#ALL_POS</code>), then the query will include the default ORDER BY logic from <code>VirtualHostModelImpl</code>. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	 * </p>
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @param start the lower bound of the range of virtual hosts
+	 * @param end the upper bound of the range of virtual hosts (not inclusive)
+	 * @return the range of matching virtual hosts
+	 */
+	@Override
+	public List<VirtualHost> findByC_L(
+		long companyId, long layoutSetId, int start, int end) {
+
+		return findByC_L(companyId, layoutSetId, start, end, null);
+	}
+
+	/**
+	 * Returns an ordered range of all the virtual hosts where companyId = &#63; and layoutSetId = &#63;.
+	 *
+	 * <p>
+	 * Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to <code>QueryUtil#ALL_POS</code> will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not <code>QueryUtil#ALL_POS</code>), then the query will include the default ORDER BY logic from <code>VirtualHostModelImpl</code>. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	 * </p>
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @param start the lower bound of the range of virtual hosts
+	 * @param end the upper bound of the range of virtual hosts (not inclusive)
+	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
+	 * @return the ordered range of matching virtual hosts
+	 */
+	@Override
+	public List<VirtualHost> findByC_L(
+		long companyId, long layoutSetId, int start, int end,
+		OrderByComparator<VirtualHost> orderByComparator) {
+
+		return findByC_L(
+			companyId, layoutSetId, start, end, orderByComparator, true);
+	}
+
+	/**
+	 * Returns an ordered range of all the virtual hosts where companyId = &#63; and layoutSetId = &#63;.
+	 *
+	 * <p>
+	 * Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to <code>QueryUtil#ALL_POS</code> will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not <code>QueryUtil#ALL_POS</code>), then the query will include the default ORDER BY logic from <code>VirtualHostModelImpl</code>. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	 * </p>
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @param start the lower bound of the range of virtual hosts
+	 * @param end the upper bound of the range of virtual hosts (not inclusive)
+	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
+	 * @param useFinderCache whether to use the finder cache
+	 * @return the ordered range of matching virtual hosts
+	 */
+	@Override
+	public List<VirtualHost> findByC_L(
+		long companyId, long layoutSetId, int start, int end,
+		OrderByComparator<VirtualHost> orderByComparator,
+		boolean useFinderCache) {
+
+		boolean pagination = true;
+		FinderPath finderPath = null;
+		Object[] finderArgs = null;
+
+		if ((start == QueryUtil.ALL_POS) && (end == QueryUtil.ALL_POS) &&
+			(orderByComparator == null)) {
+
+			pagination = false;
+
+			if (useFinderCache) {
+				finderPath = _finderPathWithoutPaginationFindByC_L;
+				finderArgs = new Object[] {companyId, layoutSetId};
+			}
+		}
+		else if (useFinderCache) {
+			finderPath = _finderPathWithPaginationFindByC_L;
+			finderArgs = new Object[] {
+				companyId, layoutSetId, start, end, orderByComparator
+			};
+		}
+
+		List<VirtualHost> list = null;
+
+		if (useFinderCache) {
+			list = (List<VirtualHost>)FinderCacheUtil.getResult(
+				finderPath, finderArgs, this);
+
+			if ((list != null) && !list.isEmpty()) {
+				for (VirtualHost virtualHost : list) {
+					if ((companyId != virtualHost.getCompanyId()) ||
+						(layoutSetId != virtualHost.getLayoutSetId())) {
+
+						list = null;
+
+						break;
+					}
+				}
+			}
+		}
+
+		if (list == null) {
+			StringBundler query = null;
+
+			if (orderByComparator != null) {
+				query = new StringBundler(
+					4 + (orderByComparator.getOrderByFields().length * 2));
+			}
+			else {
+				query = new StringBundler(4);
+			}
+
+			query.append(_SQL_SELECT_VIRTUALHOST_WHERE);
+
+			query.append(_FINDER_COLUMN_C_L_COMPANYID_2);
+
+			query.append(_FINDER_COLUMN_C_L_LAYOUTSETID_2);
+
+			if (orderByComparator != null) {
+				appendOrderByComparator(
+					query, _ORDER_BY_ENTITY_ALIAS, orderByComparator);
+			}
+			else if (pagination) {
+				query.append(VirtualHostModelImpl.ORDER_BY_JPQL);
+			}
+
+			String sql = query.toString();
+
+			Session session = null;
+
+			try {
+				session = openSession();
+
+				Query q = session.createQuery(sql);
+
+				QueryPos qPos = QueryPos.getInstance(q);
+
+				qPos.add(companyId);
+
+				qPos.add(layoutSetId);
+
+				if (!pagination) {
+					list = (List<VirtualHost>)QueryUtil.list(
+						q, getDialect(), start, end, false);
+
+					Collections.sort(list);
+
+					list = Collections.unmodifiableList(list);
+				}
+				else {
+					list = (List<VirtualHost>)QueryUtil.list(
+						q, getDialect(), start, end);
+				}
+
+				cacheResult(list);
+
+				if (useFinderCache) {
+					FinderCacheUtil.putResult(finderPath, finderArgs, list);
+				}
+			}
+			catch (Exception e) {
+				if (useFinderCache) {
+					FinderCacheUtil.removeResult(finderPath, finderArgs);
+				}
+
+				throw processException(e);
+			}
+			finally {
+				closeSession(session);
+			}
+		}
+
+		return list;
+	}
+
+	/**
+	 * Returns the first virtual host in the ordered set where companyId = &#63; and layoutSetId = &#63;.
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	 * @return the first matching virtual host
+	 * @throws NoSuchVirtualHostException if a matching virtual host could not be found
+	 */
+	@Override
+	public VirtualHost findByC_L_First(
+			long companyId, long layoutSetId,
+			OrderByComparator<VirtualHost> orderByComparator)
+		throws NoSuchVirtualHostException {
+
+		VirtualHost virtualHost = fetchByC_L_First(
+			companyId, layoutSetId, orderByComparator);
+
+		if (virtualHost != null) {
+			return virtualHost;
+		}
+
+		StringBundler msg = new StringBundler(6);
+
+		msg.append(_NO_SUCH_ENTITY_WITH_KEY);
+
+		msg.append("companyId=");
+		msg.append(companyId);
+
+		msg.append(", layoutSetId=");
+		msg.append(layoutSetId);
+
+		msg.append("}");
+
+		throw new NoSuchVirtualHostException(msg.toString());
+	}
+
+	/**
+	 * Returns the first virtual host in the ordered set where companyId = &#63; and layoutSetId = &#63;.
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	 * @return the first matching virtual host, or <code>null</code> if a matching virtual host could not be found
+	 */
+	@Override
+	public VirtualHost fetchByC_L_First(
+		long companyId, long layoutSetId,
+		OrderByComparator<VirtualHost> orderByComparator) {
+
+		List<VirtualHost> list = findByC_L(
+			companyId, layoutSetId, 0, 1, orderByComparator);
+
+		if (!list.isEmpty()) {
+			return list.get(0);
+		}
+
+		return null;
+	}
+
+	/**
+	 * Returns the last virtual host in the ordered set where companyId = &#63; and layoutSetId = &#63;.
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	 * @return the last matching virtual host
+	 * @throws NoSuchVirtualHostException if a matching virtual host could not be found
+	 */
+	@Override
+	public VirtualHost findByC_L_Last(
+			long companyId, long layoutSetId,
+			OrderByComparator<VirtualHost> orderByComparator)
+		throws NoSuchVirtualHostException {
+
+		VirtualHost virtualHost = fetchByC_L_Last(
+			companyId, layoutSetId, orderByComparator);
+
+		if (virtualHost != null) {
+			return virtualHost;
+		}
+
+		StringBundler msg = new StringBundler(6);
+
+		msg.append(_NO_SUCH_ENTITY_WITH_KEY);
+
+		msg.append("companyId=");
+		msg.append(companyId);
+
+		msg.append(", layoutSetId=");
+		msg.append(layoutSetId);
+
+		msg.append("}");
+
+		throw new NoSuchVirtualHostException(msg.toString());
+	}
+
+	/**
+	 * Returns the last virtual host in the ordered set where companyId = &#63; and layoutSetId = &#63;.
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	 * @return the last matching virtual host, or <code>null</code> if a matching virtual host could not be found
+	 */
+	@Override
+	public VirtualHost fetchByC_L_Last(
+		long companyId, long layoutSetId,
+		OrderByComparator<VirtualHost> orderByComparator) {
+
+		int count = countByC_L(companyId, layoutSetId);
+
+		if (count == 0) {
+			return null;
+		}
+
+		List<VirtualHost> list = findByC_L(
+			companyId, layoutSetId, count - 1, count, orderByComparator);
+
+		if (!list.isEmpty()) {
+			return list.get(0);
+		}
+
+		return null;
+	}
+
+	/**
+	 * Returns the virtual hosts before and after the current virtual host in the ordered set where companyId = &#63; and layoutSetId = &#63;.
+	 *
+	 * @param virtualHostId the primary key of the current virtual host
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	 * @return the previous, current, and next virtual host
+	 * @throws NoSuchVirtualHostException if a virtual host with the primary key could not be found
+	 */
+	@Override
+	public VirtualHost[] findByC_L_PrevAndNext(
+			long virtualHostId, long companyId, long layoutSetId,
+			OrderByComparator<VirtualHost> orderByComparator)
+		throws NoSuchVirtualHostException {
+
+		VirtualHost virtualHost = findByPrimaryKey(virtualHostId);
+
+		Session session = null;
+
+		try {
+			session = openSession();
+
+			VirtualHost[] array = new VirtualHostImpl[3];
+
+			array[0] = getByC_L_PrevAndNext(
+				session, virtualHost, companyId, layoutSetId, orderByComparator,
+				true);
+
+			array[1] = virtualHost;
+
+			array[2] = getByC_L_PrevAndNext(
+				session, virtualHost, companyId, layoutSetId, orderByComparator,
+				false);
+
+			return array;
+		}
+		catch (Exception e) {
+			throw processException(e);
+		}
+		finally {
+			closeSession(session);
+		}
+	}
+
+	protected VirtualHost getByC_L_PrevAndNext(
+		Session session, VirtualHost virtualHost, long companyId,
+		long layoutSetId, OrderByComparator<VirtualHost> orderByComparator,
+		boolean previous) {
+
+		StringBundler query = null;
+
+		if (orderByComparator != null) {
+			query = new StringBundler(
+				5 + (orderByComparator.getOrderByConditionFields().length * 3) +
+					(orderByComparator.getOrderByFields().length * 3));
+		}
+		else {
+			query = new StringBundler(4);
+		}
+
+		query.append(_SQL_SELECT_VIRTUALHOST_WHERE);
+
+		query.append(_FINDER_COLUMN_C_L_COMPANYID_2);
+
+		query.append(_FINDER_COLUMN_C_L_LAYOUTSETID_2);
+
+		if (orderByComparator != null) {
+			String[] orderByConditionFields =
+				orderByComparator.getOrderByConditionFields();
+
+			if (orderByConditionFields.length > 0) {
+				query.append(WHERE_AND);
+			}
+
+			for (int i = 0; i < orderByConditionFields.length; i++) {
+				query.append(_ORDER_BY_ENTITY_ALIAS);
+				query.append(orderByConditionFields[i]);
+
+				if ((i + 1) < orderByConditionFields.length) {
+					if (orderByComparator.isAscending() ^ previous) {
+						query.append(WHERE_GREATER_THAN_HAS_NEXT);
+					}
+					else {
+						query.append(WHERE_LESSER_THAN_HAS_NEXT);
+					}
+				}
+				else {
+					if (orderByComparator.isAscending() ^ previous) {
+						query.append(WHERE_GREATER_THAN);
+					}
+					else {
+						query.append(WHERE_LESSER_THAN);
+					}
+				}
+			}
+
+			query.append(ORDER_BY_CLAUSE);
+
+			String[] orderByFields = orderByComparator.getOrderByFields();
+
+			for (int i = 0; i < orderByFields.length; i++) {
+				query.append(_ORDER_BY_ENTITY_ALIAS);
+				query.append(orderByFields[i]);
+
+				if ((i + 1) < orderByFields.length) {
+					if (orderByComparator.isAscending() ^ previous) {
+						query.append(ORDER_BY_ASC_HAS_NEXT);
+					}
+					else {
+						query.append(ORDER_BY_DESC_HAS_NEXT);
+					}
+				}
+				else {
+					if (orderByComparator.isAscending() ^ previous) {
+						query.append(ORDER_BY_ASC);
+					}
+					else {
+						query.append(ORDER_BY_DESC);
+					}
+				}
+			}
+		}
+		else {
+			query.append(VirtualHostModelImpl.ORDER_BY_JPQL);
+		}
+
+		String sql = query.toString();
+
+		Query q = session.createQuery(sql);
+
+		q.setFirstResult(0);
+		q.setMaxResults(2);
+
+		QueryPos qPos = QueryPos.getInstance(q);
+
+		qPos.add(companyId);
+
+		qPos.add(layoutSetId);
+
+		if (orderByComparator != null) {
+			for (Object orderByConditionValue :
+					orderByComparator.getOrderByConditionValues(virtualHost)) {
+
+				qPos.add(orderByConditionValue);
+			}
+		}
+
+		List<VirtualHost> list = q.list();
+
+		if (list.size() == 2) {
+			return list.get(1);
+		}
+		else {
+			return null;
+		}
+	}
+
+	/**
+	 * Removes all the virtual hosts where companyId = &#63; and layoutSetId = &#63; from the database.
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 */
+	@Override
+	public void removeByC_L(long companyId, long layoutSetId) {
+		for (VirtualHost virtualHost :
+				findByC_L(
+					companyId, layoutSetId, QueryUtil.ALL_POS,
+					QueryUtil.ALL_POS, null)) {
+
+			remove(virtualHost);
+		}
+	}
+
+	/**
+	 * Returns the number of virtual hosts where companyId = &#63; and layoutSetId = &#63;.
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @return the number of matching virtual hosts
+	 */
+	@Override
+	public int countByC_L(long companyId, long layoutSetId) {
+		FinderPath finderPath = _finderPathCountByC_L;
+
+		Object[] finderArgs = new Object[] {companyId, layoutSetId};
+
+		Long count = (Long)FinderCacheUtil.getResult(
+			finderPath, finderArgs, this);
+
+		if (count == null) {
+			StringBundler query = new StringBundler(3);
+
+			query.append(_SQL_COUNT_VIRTUALHOST_WHERE);
+
+			query.append(_FINDER_COLUMN_C_L_COMPANYID_2);
+
+			query.append(_FINDER_COLUMN_C_L_LAYOUTSETID_2);
+
+			String sql = query.toString();
+
+			Session session = null;
+
+			try {
+				session = openSession();
+
+				Query q = session.createQuery(sql);
+
+				QueryPos qPos = QueryPos.getInstance(q);
+
+				qPos.add(companyId);
+
+				qPos.add(layoutSetId);
+
+				count = (Long)q.uniqueResult();
+
+				FinderCacheUtil.putResult(finderPath, finderArgs, count);
+			}
+			catch (Exception e) {
+				FinderCacheUtil.removeResult(finderPath, finderArgs);
+
+				throw processException(e);
+			}
+			finally {
+				closeSession(session);
+			}
+		}
+
+		return count.intValue();
+	}
+
+	private static final String _FINDER_COLUMN_C_L_COMPANYID_2 =
+		"virtualHost.companyId = ? AND ";
+
+	private static final String _FINDER_COLUMN_C_L_LAYOUTSETID_2 =
+		"virtualHost.layoutSetId = ?";
+
+	private FinderPath _finderPathFetchByC_L_D;
+	private FinderPath _finderPathCountByC_L_D;
+
+	/**
+	 * Returns the virtual host where companyId = &#63; and layoutSetId = &#63; and defaultVirtualHost = &#63; or throws a <code>NoSuchVirtualHostException</code> if it could not be found.
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @param defaultVirtualHost the default virtual host
 	 * @return the matching virtual host
 	 * @throws NoSuchVirtualHostException if a matching virtual host could not be found
 	 */
 	@Override
-	public VirtualHost findByC_L(long companyId, long layoutSetId)
+	public VirtualHost findByC_L_D(
+			long companyId, long layoutSetId, boolean defaultVirtualHost)
 		throws NoSuchVirtualHostException {
 
-		VirtualHost virtualHost = fetchByC_L(companyId, layoutSetId);
+		VirtualHost virtualHost = fetchByC_L_D(
+			companyId, layoutSetId, defaultVirtualHost);
 
 		if (virtualHost == null) {
-			StringBundler msg = new StringBundler(6);
+			StringBundler msg = new StringBundler(8);
 
 			msg.append(_NO_SUCH_ENTITY_WITH_KEY);
 
@@ -337,6 +900,9 @@ public VirtualHost findByC_L(long companyId, long layoutSetId)
 			msg.append(", layoutSetId=");
 			msg.append(layoutSetId);
 
+			msg.append(", defaultVirtualHost=");
+			msg.append(defaultVirtualHost);
+
 			msg.append("}");
 
 			if (_log.isDebugEnabled()) {
@@ -350,60 +916,70 @@ public VirtualHost findByC_L(long companyId, long layoutSetId)
 	}
 
 	/**
-	 * Returns the virtual host where companyId = &#63; and layoutSetId = &#63; or returns <code>null</code> if it could not be found. Uses the finder cache.
+	 * Returns the virtual host where companyId = &#63; and layoutSetId = &#63; and defaultVirtualHost = &#63; or returns <code>null</code> if it could not be found. Uses the finder cache.
 	 *
 	 * @param companyId the company ID
 	 * @param layoutSetId the layout set ID
+	 * @param defaultVirtualHost the default virtual host
 	 * @return the matching virtual host, or <code>null</code> if a matching virtual host could not be found
 	 */
 	@Override
-	public VirtualHost fetchByC_L(long companyId, long layoutSetId) {
-		return fetchByC_L(companyId, layoutSetId, true);
+	public VirtualHost fetchByC_L_D(
+		long companyId, long layoutSetId, boolean defaultVirtualHost) {
+
+		return fetchByC_L_D(companyId, layoutSetId, defaultVirtualHost, true);
 	}
 
 	/**
-	 * Returns the virtual host where companyId = &#63; and layoutSetId = &#63; or returns <code>null</code> if it could not be found, optionally using the finder cache.
+	 * Returns the virtual host where companyId = &#63; and layoutSetId = &#63; and defaultVirtualHost = &#63; or returns <code>null</code> if it could not be found, optionally using the finder cache.
 	 *
 	 * @param companyId the company ID
 	 * @param layoutSetId the layout set ID
+	 * @param defaultVirtualHost the default virtual host
 	 * @param useFinderCache whether to use the finder cache
 	 * @return the matching virtual host, or <code>null</code> if a matching virtual host could not be found
 	 */
 	@Override
-	public VirtualHost fetchByC_L(
-		long companyId, long layoutSetId, boolean useFinderCache) {
+	public VirtualHost fetchByC_L_D(
+		long companyId, long layoutSetId, boolean defaultVirtualHost,
+		boolean useFinderCache) {
 
 		Object[] finderArgs = null;
 
 		if (useFinderCache) {
-			finderArgs = new Object[] {companyId, layoutSetId};
+			finderArgs = new Object[] {
+				companyId, layoutSetId, defaultVirtualHost
+			};
 		}
 
 		Object result = null;
 
 		if (useFinderCache) {
 			result = FinderCacheUtil.getResult(
-				_finderPathFetchByC_L, finderArgs, this);
+				_finderPathFetchByC_L_D, finderArgs, this);
 		}
 
 		if (result instanceof VirtualHost) {
 			VirtualHost virtualHost = (VirtualHost)result;
 
 			if ((companyId != virtualHost.getCompanyId()) ||
-				(layoutSetId != virtualHost.getLayoutSetId())) {
+				(layoutSetId != virtualHost.getLayoutSetId()) ||
+				(defaultVirtualHost != virtualHost.isDefaultVirtualHost())) {
 
 				result = null;
 			}
 		}
 
 		if (result == null) {
-			StringBundler query = new StringBundler(4);
+			StringBundler query = new StringBundler(5);
 
 			query.append(_SQL_SELECT_VIRTUALHOST_WHERE);
 
-			query.append(_FINDER_COLUMN_C_L_COMPANYID_2);
+			query.append(_FINDER_COLUMN_C_L_D_COMPANYID_2);
 
-			query.append(_FINDER_COLUMN_C_L_LAYOUTSETID_2);
+			query.append(_FINDER_COLUMN_C_L_D_LAYOUTSETID_2);
+
+			query.append(_FINDER_COLUMN_C_L_D_DEFAULTVIRTUALHOST_2);
 
 			String sql = query.toString();
 
@@ -420,15 +996,34 @@ public VirtualHost fetchByC_L(
 
 				qPos.add(layoutSetId);
 
+				qPos.add(defaultVirtualHost);
+
 				List<VirtualHost> list = q.list();
 
 				if (list.isEmpty()) {
 					if (useFinderCache) {
 						FinderCacheUtil.putResult(
-							_finderPathFetchByC_L, finderArgs, list);
+							_finderPathFetchByC_L_D, finderArgs, list);
 					}
 				}
 				else {
+					if (list.size() > 1) {
+						Collections.sort(list, Collections.reverseOrder());
+
+						if (_log.isWarnEnabled()) {
+							if (!useFinderCache) {
+								finderArgs = new Object[] {
+									companyId, layoutSetId, defaultVirtualHost
+								};
+							}
+
+							_log.warn(
+								"VirtualHostPersistenceImpl.fetchByC_L_D(long, long, boolean, boolean) with parameters (" +
+									StringUtil.merge(finderArgs) +
+										") yields a result set with more than 1 result. This violates the logical unique restriction. There is no order guarantee on which result is returned by this finder.");
+						}
+					}
+
 					VirtualHost virtualHost = list.get(0);
 
 					result = virtualHost;
@@ -439,7 +1034,7 @@ public VirtualHost fetchByC_L(
 			catch (Exception e) {
 				if (useFinderCache) {
 					FinderCacheUtil.removeResult(
-						_finderPathFetchByC_L, finderArgs);
+						_finderPathFetchByC_L_D, finderArgs);
 				}
 
 				throw processException(e);
@@ -458,45 +1053,55 @@ public VirtualHost fetchByC_L(
 	}
 
 	/**
-	 * Removes the virtual host where companyId = &#63; and layoutSetId = &#63; from the database.
+	 * Removes the virtual host where companyId = &#63; and layoutSetId = &#63; and defaultVirtualHost = &#63; from the database.
 	 *
 	 * @param companyId the company ID
 	 * @param layoutSetId the layout set ID
+	 * @param defaultVirtualHost the default virtual host
 	 * @return the virtual host that was removed
 	 */
 	@Override
-	public VirtualHost removeByC_L(long companyId, long layoutSetId)
+	public VirtualHost removeByC_L_D(
+			long companyId, long layoutSetId, boolean defaultVirtualHost)
 		throws NoSuchVirtualHostException {
 
-		VirtualHost virtualHost = findByC_L(companyId, layoutSetId);
+		VirtualHost virtualHost = findByC_L_D(
+			companyId, layoutSetId, defaultVirtualHost);
 
 		return remove(virtualHost);
 	}
 
 	/**
-	 * Returns the number of virtual hosts where companyId = &#63; and layoutSetId = &#63;.
+	 * Returns the number of virtual hosts where companyId = &#63; and layoutSetId = &#63; and defaultVirtualHost = &#63;.
 	 *
 	 * @param companyId the company ID
 	 * @param layoutSetId the layout set ID
+	 * @param defaultVirtualHost the default virtual host
 	 * @return the number of matching virtual hosts
 	 */
 	@Override
-	public int countByC_L(long companyId, long layoutSetId) {
-		FinderPath finderPath = _finderPathCountByC_L;
+	public int countByC_L_D(
+		long companyId, long layoutSetId, boolean defaultVirtualHost) {
 
-		Object[] finderArgs = new Object[] {companyId, layoutSetId};
+		FinderPath finderPath = _finderPathCountByC_L_D;
+
+		Object[] finderArgs = new Object[] {
+			companyId, layoutSetId, defaultVirtualHost
+		};
 
 		Long count = (Long)FinderCacheUtil.getResult(
 			finderPath, finderArgs, this);
 
 		if (count == null) {
-			StringBundler query = new StringBundler(3);
+			StringBundler query = new StringBundler(4);
 
 			query.append(_SQL_COUNT_VIRTUALHOST_WHERE);
 
-			query.append(_FINDER_COLUMN_C_L_COMPANYID_2);
+			query.append(_FINDER_COLUMN_C_L_D_COMPANYID_2);
 
-			query.append(_FINDER_COLUMN_C_L_LAYOUTSETID_2);
+			query.append(_FINDER_COLUMN_C_L_D_LAYOUTSETID_2);
+
+			query.append(_FINDER_COLUMN_C_L_D_DEFAULTVIRTUALHOST_2);
 
 			String sql = query.toString();
 
@@ -513,6 +1118,8 @@ public int countByC_L(long companyId, long layoutSetId) {
 
 				qPos.add(layoutSetId);
 
+				qPos.add(defaultVirtualHost);
+
 				count = (Long)q.uniqueResult();
 
 				FinderCacheUtil.putResult(finderPath, finderArgs, count);
@@ -530,11 +1137,14 @@ public int countByC_L(long companyId, long layoutSetId) {
 		return count.intValue();
 	}
 
-	private static final String _FINDER_COLUMN_C_L_COMPANYID_2 =
+	private static final String _FINDER_COLUMN_C_L_D_COMPANYID_2 =
 		"virtualHost.companyId = ? AND ";
 
-	private static final String _FINDER_COLUMN_C_L_LAYOUTSETID_2 =
-		"virtualHost.layoutSetId = ?";
+	private static final String _FINDER_COLUMN_C_L_D_LAYOUTSETID_2 =
+		"virtualHost.layoutSetId = ? AND ";
+
+	private static final String _FINDER_COLUMN_C_L_D_DEFAULTVIRTUALHOST_2 =
+		"virtualHost.defaultVirtualHost = ?";
 
 	public VirtualHostPersistenceImpl() {
 		setModelClass(VirtualHost.class);
@@ -560,9 +1170,10 @@ public void cacheResult(VirtualHost virtualHost) {
 			new Object[] {virtualHost.getHostname()}, virtualHost);
 
 		FinderCacheUtil.putResult(
-			_finderPathFetchByC_L,
+			_finderPathFetchByC_L_D,
 			new Object[] {
-				virtualHost.getCompanyId(), virtualHost.getLayoutSetId()
+				virtualHost.getCompanyId(), virtualHost.getLayoutSetId(),
+				virtualHost.isDefaultVirtualHost()
 			},
 			virtualHost);
 
@@ -651,13 +1262,14 @@ protected void cacheUniqueFindersCache(
 
 		args = new Object[] {
 			virtualHostModelImpl.getCompanyId(),
-			virtualHostModelImpl.getLayoutSetId()
+			virtualHostModelImpl.getLayoutSetId(),
+			virtualHostModelImpl.isDefaultVirtualHost()
 		};
 
 		FinderCacheUtil.putResult(
-			_finderPathCountByC_L, args, Long.valueOf(1), false);
+			_finderPathCountByC_L_D, args, Long.valueOf(1), false);
 		FinderCacheUtil.putResult(
-			_finderPathFetchByC_L, args, virtualHostModelImpl, false);
+			_finderPathFetchByC_L_D, args, virtualHostModelImpl, false);
 	}
 
 	protected void clearUniqueFindersCache(
@@ -684,23 +1296,25 @@ protected void clearUniqueFindersCache(
 		if (clearCurrent) {
 			Object[] args = new Object[] {
 				virtualHostModelImpl.getCompanyId(),
-				virtualHostModelImpl.getLayoutSetId()
+				virtualHostModelImpl.getLayoutSetId(),
+				virtualHostModelImpl.isDefaultVirtualHost()
 			};
 
-			FinderCacheUtil.removeResult(_finderPathCountByC_L, args);
-			FinderCacheUtil.removeResult(_finderPathFetchByC_L, args);
+			FinderCacheUtil.removeResult(_finderPathCountByC_L_D, args);
+			FinderCacheUtil.removeResult(_finderPathFetchByC_L_D, args);
 		}
 
 		if ((virtualHostModelImpl.getColumnBitmask() &
-			 _finderPathFetchByC_L.getColumnBitmask()) != 0) {
+			 _finderPathFetchByC_L_D.getColumnBitmask()) != 0) {
 
 			Object[] args = new Object[] {
 				virtualHostModelImpl.getOriginalCompanyId(),
-				virtualHostModelImpl.getOriginalLayoutSetId()
+				virtualHostModelImpl.getOriginalLayoutSetId(),
+				virtualHostModelImpl.getOriginalDefaultVirtualHost()
 			};
 
-			FinderCacheUtil.removeResult(_finderPathCountByC_L, args);
-			FinderCacheUtil.removeResult(_finderPathFetchByC_L, args);
+			FinderCacheUtil.removeResult(_finderPathCountByC_L_D, args);
+			FinderCacheUtil.removeResult(_finderPathFetchByC_L_D, args);
 		}
 	}
 
@@ -858,11 +1472,44 @@ public VirtualHost updateImpl(VirtualHost virtualHost) {
 				FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION);
 		}
 		else if (isNew) {
+			Object[] args = new Object[] {
+				virtualHostModelImpl.getCompanyId(),
+				virtualHostModelImpl.getLayoutSetId()
+			};
+
+			FinderCacheUtil.removeResult(_finderPathCountByC_L, args);
+			FinderCacheUtil.removeResult(
+				_finderPathWithoutPaginationFindByC_L, args);
+
 			FinderCacheUtil.removeResult(
 				_finderPathCountAll, FINDER_ARGS_EMPTY);
 			FinderCacheUtil.removeResult(
 				_finderPathWithoutPaginationFindAll, FINDER_ARGS_EMPTY);
 		}
+		else {
+			if ((virtualHostModelImpl.getColumnBitmask() &
+				 _finderPathWithoutPaginationFindByC_L.getColumnBitmask()) !=
+					 0) {
+
+				Object[] args = new Object[] {
+					virtualHostModelImpl.getOriginalCompanyId(),
+					virtualHostModelImpl.getOriginalLayoutSetId()
+				};
+
+				FinderCacheUtil.removeResult(_finderPathCountByC_L, args);
+				FinderCacheUtil.removeResult(
+					_finderPathWithoutPaginationFindByC_L, args);
+
+				args = new Object[] {
+					virtualHostModelImpl.getCompanyId(),
+					virtualHostModelImpl.getLayoutSetId()
+				};
+
+				FinderCacheUtil.removeResult(_finderPathCountByC_L, args);
+				FinderCacheUtil.removeResult(
+					_finderPathWithoutPaginationFindByC_L, args);
+			}
+		}
 
 		EntityCacheUtil.putResult(
 			VirtualHostModelImpl.ENTITY_CACHE_ENABLED, VirtualHostImpl.class,
@@ -1181,10 +1828,20 @@ public void afterPropertiesSet() {
 			FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION, "countByHostname",
 			new String[] {String.class.getName()});
 
-		_finderPathFetchByC_L = new FinderPath(
+		_finderPathWithPaginationFindByC_L = new FinderPath(
 			VirtualHostModelImpl.ENTITY_CACHE_ENABLED,
 			VirtualHostModelImpl.FINDER_CACHE_ENABLED, VirtualHostImpl.class,
-			FINDER_CLASS_NAME_ENTITY, "fetchByC_L",
+			FINDER_CLASS_NAME_LIST_WITH_PAGINATION, "findByC_L",
+			new String[] {
+				Long.class.getName(), Long.class.getName(),
+				Integer.class.getName(), Integer.class.getName(),
+				OrderByComparator.class.getName()
+			});
+
+		_finderPathWithoutPaginationFindByC_L = new FinderPath(
+			VirtualHostModelImpl.ENTITY_CACHE_ENABLED,
+			VirtualHostModelImpl.FINDER_CACHE_ENABLED, VirtualHostImpl.class,
+			FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION, "findByC_L",
 			new String[] {Long.class.getName(), Long.class.getName()},
 			VirtualHostModelImpl.COMPANYID_COLUMN_BITMASK |
 			VirtualHostModelImpl.LAYOUTSETID_COLUMN_BITMASK);
@@ -1194,6 +1851,27 @@ public void afterPropertiesSet() {
 			VirtualHostModelImpl.FINDER_CACHE_ENABLED, Long.class,
 			FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION, "countByC_L",
 			new String[] {Long.class.getName(), Long.class.getName()});
+
+		_finderPathFetchByC_L_D = new FinderPath(
+			VirtualHostModelImpl.ENTITY_CACHE_ENABLED,
+			VirtualHostModelImpl.FINDER_CACHE_ENABLED, VirtualHostImpl.class,
+			FINDER_CLASS_NAME_ENTITY, "fetchByC_L_D",
+			new String[] {
+				Long.class.getName(), Long.class.getName(),
+				Boolean.class.getName()
+			},
+			VirtualHostModelImpl.COMPANYID_COLUMN_BITMASK |
+			VirtualHostModelImpl.LAYOUTSETID_COLUMN_BITMASK |
+			VirtualHostModelImpl.DEFAULTVIRTUALHOST_COLUMN_BITMASK);
+
+		_finderPathCountByC_L_D = new FinderPath(
+			VirtualHostModelImpl.ENTITY_CACHE_ENABLED,
+			VirtualHostModelImpl.FINDER_CACHE_ENABLED, Long.class,
+			FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION, "countByC_L_D",
+			new String[] {
+				Long.class.getName(), Long.class.getName(),
+				Boolean.class.getName()
+			});
 	}
 
 	public void destroy() {
diff --git a/portal-impl/src/com/liferay/portal/util/PortalImpl.java b/portal-impl/src/com/liferay/portal/util/PortalImpl.java
index 484bf4caf459b3..39c9007b0ba00a 100644
--- a/portal-impl/src/com/liferay/portal/util/PortalImpl.java
+++ b/portal-impl/src/com/liferay/portal/util/PortalImpl.java
@@ -261,6 +261,7 @@
 import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.TimeZone;
+import java.util.TreeMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -3081,8 +3082,11 @@ public String getLayoutFullURL(
 
 		LayoutSet layoutSet = layout.getLayoutSet();
 
-		if (Validator.isNotNull(layoutSet.getVirtualHostname())) {
-			virtualHostname = layoutSet.getVirtualHostname();
+		TreeMap<String, String> virtualHostnames =
+			layoutSet.getVirtualHostnames();
+
+		if (!virtualHostnames.isEmpty()) {
+			virtualHostname = virtualHostnames.firstKey();
 		}
 		else {
 			Company company = CompanyLocalServiceUtil.getCompany(
@@ -3150,16 +3154,18 @@ public String getLayoutSetDisplayURL(
 		String portalURL = getPortalURL(
 			company.getVirtualHostname(), portalPort, secureConnection);
 
-		String virtualHostname = getVirtualHostname(layoutSet);
+		TreeMap<String, String> virtualHostnames = getVirtualHostnames(
+			layoutSet);
 
-		if (Validator.isNotNull(virtualHostname) &&
-			!StringUtil.equalsIgnoreCase(virtualHostname, "localhost")) {
+		if (!virtualHostnames.isEmpty() &&
+			!virtualHostnames.containsKey(_LOCALHOST)) {
 
 			int index = portalURL.indexOf("://");
 
 			String portalDomain = portalURL.substring(index + 3);
 
-			virtualHostname = getCanonicalDomain(virtualHostname, portalDomain);
+			String virtualHostname = getCanonicalDomain(
+				virtualHostnames, portalDomain);
 
 			virtualHostname = getPortalURL(
 				virtualHostname, portalPort, secureConnection);
@@ -4222,13 +4228,14 @@ public String getPortalURL(Layout layout, ThemeDisplay themeDisplay)
 	public String getPortalURL(LayoutSet layoutSet, ThemeDisplay themeDisplay) {
 		String serverName = themeDisplay.getServerName();
 
-		String virtualHostname = layoutSet.getVirtualHostname();
+		TreeMap<String, String> virtualHostnames =
+			layoutSet.getVirtualHostnames();
 
-		if (Validator.isNotNull(virtualHostname)) {
+		if (!virtualHostnames.isEmpty()) {
 			String domain = themeDisplay.getPortalDomain();
 
-			if (domain.startsWith(virtualHostname)) {
-				serverName = virtualHostname;
+			if (virtualHostnames.containsKey(domain)) {
+				serverName = domain;
 			}
 		}
 
@@ -6046,15 +6053,33 @@ public long getValidUserId(long companyId, long userId)
 		return userId;
 	}
 
+	/**
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 *             #getVirtualHostnames(LayoutSet)}
+	 */
+	@Deprecated
 	@Override
 	public String getVirtualHostname(LayoutSet layoutSet) {
-		String virtualHostname = layoutSet.getVirtualHostname();
+		TreeMap<String, String> virtualHostnames = getVirtualHostnames(
+			layoutSet);
 
-		if (Validator.isNull(virtualHostname)) {
-			virtualHostname = layoutSet.getCompanyFallbackVirtualHostname();
+		return virtualHostnames.firstKey();
+	}
+
+	@Override
+	public TreeMap<String, String> getVirtualHostnames(LayoutSet layoutSet) {
+		TreeMap<String, String> virtualHostnames =
+			layoutSet.getVirtualHostnames();
+
+		if (virtualHostnames.isEmpty()) {
+			virtualHostnames = new TreeMap<>();
+
+			virtualHostnames.put(
+				layoutSet.getCompanyFallbackVirtualHostname(),
+				StringPool.BLANK);
 		}
 
-		return virtualHostname;
+		return virtualHostnames;
 	}
 
 	@Override
@@ -7626,13 +7651,13 @@ protected Layout getBrowsableLayout(Layout layout) {
 	}
 
 	protected String getCanonicalDomain(
-		String virtualHostname, String portalDomain) {
+		TreeMap<String, String> virtualHostnames, String portalDomain) {
 
 		if (Validator.isBlank(portalDomain) ||
 			StringUtil.equalsIgnoreCase(portalDomain, _LOCALHOST) ||
-			!StringUtil.equalsIgnoreCase(virtualHostname, _LOCALHOST)) {
+			!virtualHostnames.containsKey(_LOCALHOST)) {
 
-			return virtualHostname;
+			return virtualHostnames.firstKey();
 		}
 
 		int pos = portalDomain.indexOf(CharPool.COLON);
@@ -8295,6 +8320,18 @@ private String _buildI18NPath(
 		return StringPool.SLASH.concat(LocaleUtil.toW3cLanguageId(languageId));
 	}
 
+	private boolean _containsHostName(
+		TreeMap<String, String> virtualHostNames, String portalDomain) {
+
+		int pos = portalDomain.indexOf(CharPool.COLON);
+
+		if (pos > 0) {
+			portalDomain = portalDomain.substring(0, pos);
+		}
+
+		return virtualHostNames.containsKey(portalDomain);
+	}
+
 	private Map<Locale, String> _getAlternateURLs(
 			String canonicalURL, ThemeDisplay themeDisplay, Layout layout,
 			Set<Locale> availableLocales)
@@ -8499,13 +8536,13 @@ private String _getGroupFriendlyURL(
 		}
 
 		if (useGroupVirtualHostName) {
-			String virtualHostname = getVirtualHostname(layoutSet);
+			TreeMap<String, String> virtualHostnames = getVirtualHostnames(
+				layoutSet);
 
 			String portalDomain = themeDisplay.getPortalDomain();
 
-			if (Validator.isNotNull(virtualHostname) &&
-				(canonicalURL ||
-				 !StringUtil.equalsIgnoreCase(virtualHostname, _LOCALHOST))) {
+			if (!virtualHostnames.isEmpty() &&
+				(canonicalURL || !virtualHostnames.containsKey(_LOCALHOST))) {
 
 				if (!controlPanel) {
 					if (canonicalURL) {
@@ -8515,12 +8552,13 @@ private String _getGroupFriendlyURL(
 							path = PropsValues.WIDGET_SERVLET_MAPPING;
 						}
 
-						if (!StringUtil.equalsIgnoreCase(
-								virtualHostname, _LOCALHOST) &&
-							!_isSameHostName(virtualHostname, portalDomain)) {
+						if (!virtualHostnames.containsKey(_LOCALHOST) &&
+							!_containsHostName(
+								virtualHostnames, portalDomain)) {
 
 							portalURL = getPortalURL(
-								virtualHostname, themeDisplay.getServerPort(),
+								virtualHostnames.firstKey(),
+								themeDisplay.getServerPort(),
 								themeDisplay.isSecure());
 						}
 
@@ -8531,11 +8569,9 @@ private String _getGroupFriendlyURL(
 						);
 					}
 
-					if (_isSameHostName(virtualHostname, portalDomain) &&
-						(virtualHostname.equals(
-							layoutSet.getVirtualHostname()) ||
-						 PropsValues.VIRTUAL_HOSTS_DEFAULT_SITE_NAME.equals(
-							 group.getGroupKey()))) {
+					if (_containsHostName(virtualHostnames, portalDomain) ||
+						PropsValues.VIRTUAL_HOSTS_DEFAULT_SITE_NAME.equals(
+							group.getGroupKey())) {
 
 						String path = StringPool.BLANK;
 
@@ -8562,36 +8598,43 @@ private String _getGroupFriendlyURL(
 					 (group.getClassPK() != themeDisplay.getUserId()))) {
 
 					if (group.isControlPanel() || controlPanel) {
-						virtualHostname = themeDisplay.getServerName();
+						virtualHostnames = new TreeMap<>();
 
-						if (Validator.isNull(virtualHostname) ||
-							StringUtil.equalsIgnoreCase(
-								virtualHostname, _LOCALHOST)) {
+						String serverName = themeDisplay.getServerName();
+
+						if (Validator.isNotNull(serverName)) {
+							virtualHostnames.put(serverName, StringPool.BLANK);
+						}
+
+						if (virtualHostnames.isEmpty() ||
+							virtualHostnames.containsKey(_LOCALHOST)) {
 
 							LayoutSet curLayoutSet =
 								LayoutSetLocalServiceUtil.getLayoutSet(
 									themeDisplay.getSiteGroupId(),
 									privateLayoutSet);
 
-							virtualHostname = curLayoutSet.getVirtualHostname();
+							virtualHostnames =
+								curLayoutSet.getVirtualHostnames();
 						}
 					}
 
-					if (Validator.isNull(virtualHostname) ||
-						StringUtil.equalsIgnoreCase(
-							virtualHostname, _LOCALHOST)) {
+					if (virtualHostnames.isEmpty() ||
+						virtualHostnames.containsKey(_LOCALHOST)) {
 
 						Company company = themeDisplay.getCompany();
 
-						virtualHostname = company.getVirtualHostname();
+						virtualHostnames = new TreeMap<>();
+
+						virtualHostnames.put(
+							company.getVirtualHostname(), StringPool.BLANK);
 					}
 
 					if (canonicalURL ||
-						!StringUtil.equalsIgnoreCase(
-							virtualHostname, _LOCALHOST)) {
+						!virtualHostnames.containsKey(_LOCALHOST)) {
 
-						virtualHostname = getCanonicalDomain(
-							virtualHostname, portalDomain);
+						String virtualHostname = getCanonicalDomain(
+							virtualHostnames, portalDomain);
 
 						portalURL = getPortalURL(
 							virtualHostname, themeDisplay.getServerPort(),
@@ -8827,18 +8870,6 @@ private Group _getSiteGroup(long groupId) {
 		return group;
 	}
 
-	private boolean _isSameHostName(
-		String virtualHostName, String portalDomain) {
-
-		int pos = portalDomain.indexOf(CharPool.COLON);
-
-		if (pos > 0) {
-			return virtualHostName.regionMatches(0, portalDomain, 0, pos);
-		}
-
-		return virtualHostName.equals(portalDomain);
-	}
-
 	private static final Log _logWebServerServlet = LogFactoryUtil.getLog(
 		WebServerServlet.class);
 
diff --git a/portal-impl/src/com/liferay/portal/util/PortalInstances.java b/portal-impl/src/com/liferay/portal/util/PortalInstances.java
index 8ad5ef92b001fe..85b7950619efa6 100644
--- a/portal-impl/src/com/liferay/portal/util/PortalInstances.java
+++ b/portal-impl/src/com/liferay/portal/util/PortalInstances.java
@@ -18,6 +18,7 @@
 import com.liferay.petra.string.StringBundler;
 import com.liferay.portal.events.EventsProcessorUtil;
 import com.liferay.portal.kernel.dao.jdbc.DataAccess;
+import com.liferay.portal.kernel.language.LanguageUtil;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.model.Company;
@@ -51,6 +52,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
+import java.util.TreeMap;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
@@ -159,7 +161,10 @@ public static long getCompanyId(HttpServletRequest httpServletRequest) {
 				LayoutSet layoutSet = LayoutSetLocalServiceUtil.getLayoutSet(
 					group.getGroupId(), false);
 
-				if (Validator.isNull(layoutSet.getVirtualHostname())) {
+				TreeMap<String, String> virtualHostnames =
+					layoutSet.getVirtualHostnames();
+
+				if (virtualHostnames.isEmpty()) {
 					httpServletRequest.setAttribute(
 						WebKeys.VIRTUAL_HOST_LAYOUT_SET, layoutSet);
 				}
@@ -461,6 +466,25 @@ private static long _getCompanyIdByVirtualHosts(
 
 				httpServletRequest.setAttribute(
 					WebKeys.VIRTUAL_HOST_LAYOUT_SET, layoutSet);
+
+				// Virtual Host default locale
+
+				String languageId = virtualHost.getLanguageId();
+
+				if (Validator.isNotNull(languageId) &&
+					LanguageUtil.isAvailableLocale(
+						layoutSet.getGroupId(), languageId)) {
+
+					if (_log.isDebugEnabled()) {
+						_log.debug(
+							StringBundler.concat(
+								"Virtual Host ", virtualHost.getHostname(),
+								" has default languageId ", languageId));
+					}
+
+					httpServletRequest.setAttribute(
+						WebKeys.I18N_LANGUAGE_ID, languageId);
+				}
 			}
 
 			return virtualHost.getCompanyId();
diff --git a/portal-impl/src/com/liferay/portal/util/RobotsUtil.java b/portal-impl/src/com/liferay/portal/util/RobotsUtil.java
index 274a37f14d10df..08ef6732a0c354 100644
--- a/portal-impl/src/com/liferay/portal/util/RobotsUtil.java
+++ b/portal-impl/src/com/liferay/portal/util/RobotsUtil.java
@@ -22,6 +22,8 @@
 import com.liferay.portal.kernel.util.StringUtil;
 import com.liferay.portal.kernel.util.Validator;
 
+import java.util.TreeMap;
+
 /**
  * @author David Truong
  * @author Jesse Rao
@@ -70,12 +72,14 @@ public static String getRobots(LayoutSet layoutSet, boolean secure)
 			return getDefaultRobots(null, secure, portalServerPort);
 		}
 
+		TreeMap<String, String> virtualHostnames =
+			PortalUtil.getVirtualHostnames(layoutSet);
+
 		return GetterUtil.get(
 			layoutSet.getSettingsProperty(
 				layoutSet.isPrivateLayout() + "-robots.txt"),
 			getDefaultRobots(
-				PortalUtil.getVirtualHostname(layoutSet), secure,
-				portalServerPort));
+				virtualHostnames.firstKey(), secure, portalServerPort));
 	}
 
 }
\ No newline at end of file
diff --git a/portal-impl/src/com/liferay/portal/util/packageinfo b/portal-impl/src/com/liferay/portal/util/packageinfo
index eb3245936f1a48..bd333699d2e121 100644
--- a/portal-impl/src/com/liferay/portal/util/packageinfo
+++ b/portal-impl/src/com/liferay/portal/util/packageinfo
@@ -1 +1 @@
-version 3.7.0
\ No newline at end of file
+version 4.0.0
\ No newline at end of file
diff --git a/portal-impl/src/com/liferay/portlet/asset/util/AssetSearcher.java b/portal-impl/src/com/liferay/portlet/asset/util/AssetSearcher.java
index 785b431f4dda1b..07988777b2a689 100644
--- a/portal-impl/src/com/liferay/portlet/asset/util/AssetSearcher.java
+++ b/portal-impl/src/com/liferay/portlet/asset/util/AssetSearcher.java
@@ -25,7 +25,10 @@
 import com.liferay.portal.kernel.search.Query;
 import com.liferay.portal.kernel.search.SearchContext;
 import com.liferay.portal.kernel.search.filter.BooleanFilter;
+import com.liferay.portal.kernel.search.filter.QueryFilter;
 import com.liferay.portal.kernel.search.filter.TermsFilter;
+import com.liferay.portal.kernel.search.generic.BooleanQueryImpl;
+import com.liferay.portal.kernel.search.generic.StringQuery;
 import com.liferay.portal.kernel.security.permission.PermissionThreadLocal;
 import com.liferay.portal.kernel.util.ArrayUtil;
 import com.liferay.portal.kernel.util.GetterUtil;
@@ -134,6 +137,27 @@ protected void addSearchAllCategories(BooleanFilter queryBooleanFilter)
 			categoryIdsBooleanFilter, BooleanClauseOccur.MUST);
 	}
 
+	protected void addSearchAllKeywords(BooleanFilter queryBooleanFilter)
+		throws Exception {
+
+		String[] allKeywords = _assetEntryQuery.getAllKeywords();
+
+		if (allKeywords.length == 0) {
+			return;
+		}
+
+		BooleanQuery keywordsQuery = new BooleanQueryImpl();
+
+		for (String keyword : allKeywords) {
+			StringQuery stringQuery = new StringQuery(keyword);
+
+			keywordsQuery.add(stringQuery, BooleanClauseOccur.MUST);
+		}
+
+		queryBooleanFilter.add(
+			new QueryFilter(keywordsQuery), BooleanClauseOccur.MUST);
+	}
+
 	protected void addSearchAllTags(BooleanFilter queryBooleanFilter)
 		throws Exception {
 
@@ -211,6 +235,27 @@ protected void addSearchAnyCategories(BooleanFilter queryBooleanFilter)
 		queryBooleanFilter.add(categoryIdsTermsFilter, BooleanClauseOccur.MUST);
 	}
 
+	protected void addSearchAnyKeywords(BooleanFilter queryBooleanFilter)
+		throws Exception {
+
+		String[] anyKeywords = _assetEntryQuery.getAnyKeywords();
+
+		if (anyKeywords.length == 0) {
+			return;
+		}
+
+		BooleanQuery keywordsQuery = new BooleanQueryImpl();
+
+		for (String keyword : anyKeywords) {
+			StringQuery stringQuery = new StringQuery(keyword);
+
+			keywordsQuery.add(stringQuery, BooleanClauseOccur.SHOULD);
+		}
+
+		queryBooleanFilter.add(
+			new QueryFilter(keywordsQuery), BooleanClauseOccur.MUST);
+	}
+
 	protected void addSearchAnyTags(BooleanFilter queryBooleanFilter)
 		throws Exception {
 
@@ -332,6 +377,27 @@ protected void addSearchNotAllCategories(BooleanFilter queryBooleanFilter)
 			categoryIdsBooleanFilter, BooleanClauseOccur.MUST_NOT);
 	}
 
+	protected void addSearchNotAllKeywords(BooleanFilter queryBooleanFilter)
+		throws Exception {
+
+		String[] notAllKeywords = _assetEntryQuery.getNotAllKeywords();
+
+		if (notAllKeywords.length == 0) {
+			return;
+		}
+
+		BooleanQuery keywordsQuery = new BooleanQueryImpl();
+
+		for (String keyword : notAllKeywords) {
+			StringQuery stringQuery = new StringQuery(keyword);
+
+			keywordsQuery.add(stringQuery, BooleanClauseOccur.MUST);
+		}
+
+		queryBooleanFilter.add(
+			new QueryFilter(keywordsQuery), BooleanClauseOccur.MUST_NOT);
+	}
+
 	protected void addSearchNotAllTags(BooleanFilter queryBooleanFilter)
 		throws Exception {
 
@@ -402,6 +468,27 @@ protected void addSearchNotAnyCategories(BooleanFilter queryBooleanFilter)
 			categoryIdsTermsFilter, BooleanClauseOccur.MUST_NOT);
 	}
 
+	protected void addSearchNotAnyKeywords(BooleanFilter queryBooleanFilter)
+		throws Exception {
+
+		String[] notAnyKeywords = _assetEntryQuery.getNotAnyKeywords();
+
+		if (notAnyKeywords.length == 0) {
+			return;
+		}
+
+		BooleanQuery keywordsQuery = new BooleanQueryImpl();
+
+		for (String keyword : notAnyKeywords) {
+			StringQuery stringQuery = new StringQuery(keyword);
+
+			keywordsQuery.add(stringQuery, BooleanClauseOccur.SHOULD);
+		}
+
+		queryBooleanFilter.add(
+			new QueryFilter(keywordsQuery), BooleanClauseOccur.MUST_NOT);
+	}
+
 	protected void addSearchNotAnyTags(BooleanFilter queryBooleanFilter)
 		throws Exception {
 
@@ -418,6 +505,19 @@ protected void addSearchNotAnyTags(BooleanFilter queryBooleanFilter)
 		queryBooleanFilter.add(tagIgsTermsFilter, BooleanClauseOccur.MUST_NOT);
 	}
 
+	@Override
+	protected BooleanQuery createFullQuery(
+			BooleanFilter fullQueryBooleanFilter, SearchContext searchContext)
+		throws Exception {
+
+		addSearchAllKeywords(fullQueryBooleanFilter);
+		addSearchAnyKeywords(fullQueryBooleanFilter);
+		addSearchNotAnyKeywords(fullQueryBooleanFilter);
+		addSearchNotAllKeywords(fullQueryBooleanFilter);
+
+		return super.createFullQuery(fullQueryBooleanFilter, searchContext);
+	}
+
 	@Override
 	protected void postProcessFullQuery(
 			BooleanQuery fullQuery, SearchContext searchContext)
diff --git a/portal-impl/src/com/liferay/portlet/asset/util/packageinfo b/portal-impl/src/com/liferay/portlet/asset/util/packageinfo
index 976427422c87d9..0eb084a0c3e791 100644
--- a/portal-impl/src/com/liferay/portlet/asset/util/packageinfo
+++ b/portal-impl/src/com/liferay/portlet/asset/util/packageinfo
@@ -1 +1 @@
-version 1.3.0
\ No newline at end of file
+version 1.4.0
\ No newline at end of file
diff --git a/portal-kernel/src/com/liferay/asset/kernel/service/persistence/AssetEntryQuery.java b/portal-kernel/src/com/liferay/asset/kernel/service/persistence/AssetEntryQuery.java
index e42beb19198332..b69bf7221cd209 100644
--- a/portal-kernel/src/com/liferay/asset/kernel/service/persistence/AssetEntryQuery.java
+++ b/portal-kernel/src/com/liferay/asset/kernel/service/persistence/AssetEntryQuery.java
@@ -85,9 +85,11 @@ public AssetEntryQuery() {
 
 	public AssetEntryQuery(AssetEntryQuery assetEntryQuery) {
 		setAllCategoryIds(assetEntryQuery.getAllCategoryIds());
+		setAllKeywords(assetEntryQuery.getAllKeywords());
 		setAllTagIdsArray(assetEntryQuery.getAllTagIdsArray());
 		setAndOperator(assetEntryQuery.isAndOperator());
 		setAnyCategoryIds(assetEntryQuery.getAnyCategoryIds());
+		setAnyKeywords(assetEntryQuery.getAnyKeywords());
 		setAnyTagIds(assetEntryQuery.getAnyTagIds());
 		setAttributes(assetEntryQuery.getAttributes());
 		setClassNameIds(assetEntryQuery.getClassNameIds());
@@ -103,8 +105,10 @@ public AssetEntryQuery(AssetEntryQuery assetEntryQuery) {
 		setLinkedAssetEntryId(assetEntryQuery.getLinkedAssetEntryId());
 		setListable(assetEntryQuery.isListable());
 		setNotAllCategoryIds(assetEntryQuery.getNotAllCategoryIds());
+		setNotAllKeywords(assetEntryQuery.getNotAllKeywords());
 		setNotAllTagIdsArray(assetEntryQuery.getNotAllTagIdsArray());
 		setNotAnyCategoryIds(assetEntryQuery.getNotAnyCategoryIds());
+		setNotAnyKeywords(assetEntryQuery.getNotAnyKeywords());
 		setNotAnyTagIds(assetEntryQuery.getNotAnyTagIds());
 		setOrderByCol1(assetEntryQuery.getOrderByCol1());
 		setOrderByCol2(assetEntryQuery.getOrderByCol2());
@@ -192,6 +196,10 @@ public long[] getAllCategoryIds() {
 		return _allCategoryIds;
 	}
 
+	public String[] getAllKeywords() {
+		return _allKeywords;
+	}
+
 	public long[] getAllLeftAndRightCategoryIds() {
 		return _getLeftAndRightCategoryIds(_allCategoryIds);
 	}
@@ -208,6 +216,10 @@ public long[] getAnyCategoryIds() {
 		return _anyCategoryIds;
 	}
 
+	public String[] getAnyKeywords() {
+		return _anyKeywords;
+	}
+
 	public long[] getAnyLeftAndRightCategoryIds() {
 		return _getLeftAndRightCategoryIds(_anyCategoryIds);
 	}
@@ -248,6 +260,11 @@ public long[] getGroupIds() {
 		return _groupIds;
 	}
 
+	/**
+	 * @deprecated As of Athanasius (7.3.x), replaced by {@link
+	 *             #getAllKeywords())}
+	 */
+	@Deprecated
 	public String getKeywords() {
 		return _keywords;
 	}
@@ -264,6 +281,10 @@ public long[] getNotAllCategoryIds() {
 		return _notAllCategoryIds;
 	}
 
+	public String[] getNotAllKeywords() {
+		return _notAllKeywords;
+	}
+
 	public long[] getNotAllLeftAndRightCategoryIds() {
 		return _getLeftAndRightCategoryIds(_notAllCategoryIds);
 	}
@@ -280,6 +301,10 @@ public long[] getNotAnyCategoryIds() {
 		return _notAnyCategoryIds;
 	}
 
+	public String[] getNotAnyKeywords() {
+		return _notAnyKeywords;
+	}
+
 	public long[] getNotAnyLeftAndRightCategoryIds() {
 		return _getLeftAndRightCategoryIds(_notAnyCategoryIds);
 	}
@@ -350,6 +375,12 @@ public void setAllCategoryIds(long[] allCategoryIds) {
 		_toString = null;
 	}
 
+	public void setAllKeywords(String[] allKeywords) {
+		_allKeywords = allKeywords;
+
+		_toString = null;
+	}
+
 	public void setAllTagIds(long[] allTagIds) {
 		_allTagIds = allTagIds;
 
@@ -376,6 +407,12 @@ public void setAnyCategoryIds(long[] anyCategoryIds) {
 		_toString = null;
 	}
 
+	public void setAnyKeywords(String[] anyKeywords) {
+		_anyKeywords = anyKeywords;
+
+		_toString = null;
+	}
+
 	public void setAnyTagIds(long[] anyTagIds) {
 		_anyTagIds = anyTagIds;
 
@@ -445,6 +482,11 @@ public void setGroupIds(long[] groupIds) {
 		_toString = null;
 	}
 
+	/**
+	 * @deprecated As of Athanasius (7.3.x), replaced by {@link
+	 *             #setAllKeywords(String[] keywords))}
+	 */
+	@Deprecated
 	public void setKeywords(String keywords) {
 		_keywords = keywords;
 	}
@@ -471,6 +513,12 @@ public void setNotAllCategoryIds(long[] notAllCategoryIds) {
 		_toString = null;
 	}
 
+	public void setNotAllKeywords(String[] notAllKeywords) {
+		_notAllKeywords = notAllKeywords;
+
+		_toString = null;
+	}
+
 	public void setNotAllTagIds(long[] notAllTagIds) {
 		_notAllTagIds = notAllTagIds;
 
@@ -493,6 +541,12 @@ public void setNotAnyCategoryIds(long[] notAnyCategoryIds) {
 		_toString = null;
 	}
 
+	public void setNotAnyKeywords(String[] notAnyKeywords) {
+		_notAnyKeywords = notAnyKeywords;
+
+		_toString = null;
+	}
+
 	public void setNotAnyTagIds(long[] notAnyTagIds) {
 		_notAnyTagIds = notAnyTagIds;
 
@@ -561,16 +615,20 @@ public String toString() {
 			return _toString;
 		}
 
-		StringBundler sb = new StringBundler(61);
+		StringBundler sb = new StringBundler(69);
 
 		sb.append("{allCategoryIds=");
 		sb.append(StringUtil.merge(_allCategoryIds));
+		sb.append(", allKeywords=");
+		sb.append(StringUtil.merge(_allKeywords));
 		sb.append(", allTagIds=");
 		sb.append(StringUtil.merge(_allTagIds));
 		sb.append(", andOperator=");
 		sb.append(_andOperator);
 		sb.append(", anyCategoryIds=");
 		sb.append(StringUtil.merge(_anyCategoryIds));
+		sb.append(", anyKeywords=");
+		sb.append(StringUtil.merge(_anyKeywords));
 		sb.append(", anyTagIds=");
 		sb.append(StringUtil.merge(_anyTagIds));
 		sb.append(", classNameIds=");
@@ -601,10 +659,14 @@ public String toString() {
 		sb.append(_listable);
 		sb.append(", notAllCategoryIds=");
 		sb.append(StringUtil.merge(_notAllCategoryIds));
+		sb.append(", notAllKeywords=");
+		sb.append(StringUtil.merge(_notAllKeywords));
 		sb.append(", notAllTagIds=");
 		sb.append(StringUtil.merge(_notAllTagIds));
 		sb.append(", notAnyCategoryIds=");
 		sb.append(StringUtil.merge(_notAnyCategoryIds));
+		sb.append(", notAnyKeywords=");
+		sb.append(StringUtil.merge(_notAnyKeywords));
 		sb.append(", notAnyTagIds=");
 		sb.append(StringUtil.merge(_notAnyTagIds));
 		sb.append(", orderByCol1=");
@@ -684,10 +746,12 @@ private long[] _getLeftAndRightCategoryIds(long[] categoryIds) {
 		AssetEntryQuery.class);
 
 	private long[] _allCategoryIds = new long[0];
+	private String[] _allKeywords = new String[0];
 	private long[] _allTagIds = new long[0];
 	private long[][] _allTagIdsArray = new long[0][];
 	private boolean _andOperator;
 	private long[] _anyCategoryIds = new long[0];
+	private String[] _anyKeywords = new String[0];
 	private long[] _anyTagIds = new long[0];
 	private Map<String, Serializable> _attributes = new HashMap<>();
 	private long[] _classNameIds = new long[0];
@@ -703,9 +767,11 @@ private long[] _getLeftAndRightCategoryIds(long[] categoryIds) {
 	private long _linkedAssetEntryId;
 	private Boolean _listable = true;
 	private long[] _notAllCategoryIds = new long[0];
+	private String[] _notAllKeywords = new String[0];
 	private long[] _notAllTagIds = new long[0];
 	private long[][] _notAllTagIdsArray = new long[0][];
 	private long[] _notAnyCategoryIds = new long[0];
+	private String[] _notAnyKeywords = new String[0];
 	private long[] _notAnyTagIds = new long[0];
 	private String _orderByCol1;
 	private String _orderByCol2;
diff --git a/portal-kernel/src/com/liferay/asset/kernel/service/persistence/packageinfo b/portal-kernel/src/com/liferay/asset/kernel/service/persistence/packageinfo
index 50447f66aecefa..63eb23612136a2 100644
--- a/portal-kernel/src/com/liferay/asset/kernel/service/persistence/packageinfo
+++ b/portal-kernel/src/com/liferay/asset/kernel/service/persistence/packageinfo
@@ -1 +1 @@
-version 3.0.0
\ No newline at end of file
+version 3.0.0
diff --git a/portal-kernel/src/com/liferay/portal/kernel/exception/AvailableLocaleException.java b/portal-kernel/src/com/liferay/portal/kernel/exception/AvailableLocaleException.java
new file mode 100644
index 00000000000000..008f6ad85eea4b
--- /dev/null
+++ b/portal-kernel/src/com/liferay/portal/kernel/exception/AvailableLocaleException.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+package com.liferay.portal.kernel.exception;
+
+/**
+ * @author Brian Wing Shun Chan
+ */
+public class AvailableLocaleException extends PortalException {
+
+	public AvailableLocaleException() {
+	}
+
+	public AvailableLocaleException(String msg) {
+		super(msg);
+	}
+
+	public AvailableLocaleException(String msg, Throwable cause) {
+		super(msg, cause);
+	}
+
+	public AvailableLocaleException(Throwable cause) {
+		super(cause);
+	}
+
+}
\ No newline at end of file
diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/LayoutModel.java b/portal-kernel/src/com/liferay/portal/kernel/model/LayoutModel.java
index 2cd39b46151bac..7b11dab35021d9 100644
--- a/portal-kernel/src/com/liferay/portal/kernel/model/LayoutModel.java
+++ b/portal-kernel/src/com/liferay/portal/kernel/model/LayoutModel.java
@@ -16,7 +16,6 @@
 
 import com.liferay.portal.kernel.bean.AutoEscape;
 import com.liferay.portal.kernel.exception.LocaleException;
-import com.liferay.portal.kernel.model.change.tracking.CTModel;
 
 import java.util.Date;
 import java.util.Locale;
@@ -37,8 +36,8 @@
  */
 @ProviderType
 public interface LayoutModel
-	extends AttachedModel, BaseModel<Layout>, CTModel<Layout>, LocalizedModel,
-			MVCCModel, ShardedModel, StagedGroupedModel {
+	extends AttachedModel, BaseModel<Layout>, LocalizedModel, MVCCModel,
+			ShardedModel, StagedGroupedModel {
 
 	/**
 	 * NOTE FOR DEVELOPERS:
@@ -51,7 +50,6 @@ public interface LayoutModel
 	 *
 	 * @return the primary key of this layout
 	 */
-	@Override
 	public long getPrimaryKey();
 
 	/**
@@ -59,7 +57,6 @@ public interface LayoutModel
 	 *
 	 * @param primaryKey the primary key of this layout
 	 */
-	@Override
 	public void setPrimaryKey(long primaryKey);
 
 	/**
@@ -78,22 +75,6 @@ public interface LayoutModel
 	@Override
 	public void setMvccVersion(long mvccVersion);
 
-	/**
-	 * Returns the ct collection ID of this layout.
-	 *
-	 * @return the ct collection ID of this layout
-	 */
-	@Override
-	public long getCtCollectionId();
-
-	/**
-	 * Sets the ct collection ID of this layout.
-	 *
-	 * @param ctCollectionId the ct collection ID of this layout
-	 */
-	@Override
-	public void setCtCollectionId(long ctCollectionId);
-
 	/**
 	 * Returns the uuid of this layout.
 	 *
diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/LayoutSet.java b/portal-kernel/src/com/liferay/portal/kernel/model/LayoutSet.java
index 23cae912fed058..4b23d6812ce9bd 100644
--- a/portal-kernel/src/com/liferay/portal/kernel/model/LayoutSet.java
+++ b/portal-kernel/src/com/liferay/portal/kernel/model/LayoutSet.java
@@ -108,18 +108,34 @@ public long getLayoutSetPrototypeId()
 	public String getThemeSetting(String key, String device);
 
 	/**
-	 * Returns the name of the layout set's virtual host.
+	 * Returns the name of the layout set's default virtual host.
 	 *
 	 * <p>
 	 * When accessing a layout set that has a the virtual host, the URL elements
 	 * "/web/sitename" or "/group/sitename" can be omitted.
 	 * </p>
 	 *
-	 * @return the layout set's virtual host name, or an empty string if the
-	 layout set has no virtual host configured
+	 * @return the layout set's default virtual host name, or an empty string if
+	 the layout set has no virtual hosts configured
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 #getVirtualHostnames()}
 	 */
+	@Deprecated
 	public String getVirtualHostname();
 
+	/**
+	 * Returns the names of the layout set's virtual hosts.
+	 *
+	 * <p>
+	 * When accessing a layout set that has a the virtual host, the URL elements
+	 * "/web/sitename" or "/group/sitename" can be omitted.
+	 * </p>
+	 *
+	 * @return the layout set's virtual host names, or an empty string if
+	 the layout set has no virtual hosts configured
+	 */
+	public java.util.TreeMap<String, String> getVirtualHostnames();
+
 	public boolean hasSetModifiedDate();
 
 	public boolean isLayoutSetPrototypeLinkActive();
@@ -137,7 +153,19 @@ public void setSettingsProperties(
 	 *
 	 * @param virtualHostname the name of the layout set's virtual host
 	 * @see #getVirtualHostname()
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 #setVirtualHostnames(TreeMap)}
 	 */
+	@Deprecated
 	public void setVirtualHostname(String virtualHostname);
 
+	/**
+	 * Sets the names of the layout set's virtual host name and language IDs.
+	 *
+	 * @param virtualHostnames the map of the layout set's virtual host name and
+	 language IDs
+	 * @see #getVirtualHostnames()
+	 */
+	public void setVirtualHostnames(java.util.TreeMap virtualHostnames);
+
 }
\ No newline at end of file
diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/LayoutSetWrapper.java b/portal-kernel/src/com/liferay/portal/kernel/model/LayoutSetWrapper.java
index c79beb9c0e2bdb..733dab47916366 100644
--- a/portal-kernel/src/com/liferay/portal/kernel/model/LayoutSetWrapper.java
+++ b/portal-kernel/src/com/liferay/portal/kernel/model/LayoutSetWrapper.java
@@ -388,21 +388,40 @@ public String getThemeSetting(String key, String device) {
 	}
 
 	/**
-	 * Returns the name of the layout set's virtual host.
+	 * Returns the name of the layout set's default virtual host.
 	 *
 	 * <p>
 	 * When accessing a layout set that has a the virtual host, the URL elements
 	 * "/web/sitename" or "/group/sitename" can be omitted.
 	 * </p>
 	 *
-	 * @return the layout set's virtual host name, or an empty string if the
-	 layout set has no virtual host configured
+	 * @return the layout set's default virtual host name, or an empty string if
+	 the layout set has no virtual hosts configured
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 #getVirtualHostnames()}
 	 */
+	@Deprecated
 	@Override
 	public String getVirtualHostname() {
 		return model.getVirtualHostname();
 	}
 
+	/**
+	 * Returns the names of the layout set's virtual hosts.
+	 *
+	 * <p>
+	 * When accessing a layout set that has a the virtual host, the URL elements
+	 * "/web/sitename" or "/group/sitename" can be omitted.
+	 * </p>
+	 *
+	 * @return the layout set's virtual host names, or an empty string if
+	 the layout set has no virtual hosts configured
+	 */
+	@Override
+	public java.util.TreeMap<String, String> getVirtualHostnames() {
+		return model.getVirtualHostnames();
+	}
+
 	@Override
 	public boolean hasSetModifiedDate() {
 		return model.hasSetModifiedDate();
@@ -619,12 +638,27 @@ public void setThemeId(String themeId) {
 	 *
 	 * @param virtualHostname the name of the layout set's virtual host
 	 * @see #getVirtualHostname()
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 #setVirtualHostnames(TreeMap)}
 	 */
+	@Deprecated
 	@Override
 	public void setVirtualHostname(String virtualHostname) {
 		model.setVirtualHostname(virtualHostname);
 	}
 
+	/**
+	 * Sets the names of the layout set's virtual host name and language IDs.
+	 *
+	 * @param virtualHostnames the map of the layout set's virtual host name and
+	 language IDs
+	 * @see #getVirtualHostnames()
+	 */
+	@Override
+	public void setVirtualHostnames(java.util.TreeMap virtualHostnames) {
+		model.setVirtualHostnames(virtualHostnames);
+	}
+
 	@Override
 	protected LayoutSetWrapper wrap(LayoutSet layoutSet) {
 		return new LayoutSetWrapper(layoutSet);
diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/LayoutSoap.java b/portal-kernel/src/com/liferay/portal/kernel/model/LayoutSoap.java
index 19b2bf7f87bb8e..b0c1e17c133c6f 100644
--- a/portal-kernel/src/com/liferay/portal/kernel/model/LayoutSoap.java
+++ b/portal-kernel/src/com/liferay/portal/kernel/model/LayoutSoap.java
@@ -32,7 +32,6 @@ public static LayoutSoap toSoapModel(Layout model) {
 		LayoutSoap soapModel = new LayoutSoap();
 
 		soapModel.setMvccVersion(model.getMvccVersion());
-		soapModel.setCtCollectionId(model.getCtCollectionId());
 		soapModel.setUuid(model.getUuid());
 		soapModel.setPlid(model.getPlid());
 		soapModel.setGroupId(model.getGroupId());
@@ -129,14 +128,6 @@ public void setMvccVersion(long mvccVersion) {
 		_mvccVersion = mvccVersion;
 	}
 
-	public long getCtCollectionId() {
-		return _ctCollectionId;
-	}
-
-	public void setCtCollectionId(long ctCollectionId) {
-		_ctCollectionId = ctCollectionId;
-	}
-
 	public String getUuid() {
 		return _uuid;
 	}
@@ -428,7 +419,6 @@ public void setLastPublishDate(Date lastPublishDate) {
 	}
 
 	private long _mvccVersion;
-	private long _ctCollectionId;
 	private String _uuid;
 	private long _plid;
 	private long _groupId;
diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/LayoutWrapper.java b/portal-kernel/src/com/liferay/portal/kernel/model/LayoutWrapper.java
index 67b8c1ecf1d7ee..3e6d59f7c77c8a 100644
--- a/portal-kernel/src/com/liferay/portal/kernel/model/LayoutWrapper.java
+++ b/portal-kernel/src/com/liferay/portal/kernel/model/LayoutWrapper.java
@@ -20,8 +20,6 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.function.BiConsumer;
-import java.util.function.Function;
 
 /**
  * <p>
@@ -44,7 +42,6 @@ public Map<String, Object> getModelAttributes() {
 		Map<String, Object> attributes = new HashMap<String, Object>();
 
 		attributes.put("mvccVersion", getMvccVersion());
-		attributes.put("ctCollectionId", getCtCollectionId());
 		attributes.put("uuid", getUuid());
 		attributes.put("plid", getPlid());
 		attributes.put("groupId", getGroupId());
@@ -93,12 +90,6 @@ public void setModelAttributes(Map<String, Object> attributes) {
 			setMvccVersion(mvccVersion);
 		}
 
-		Long ctCollectionId = (Long)attributes.get("ctCollectionId");
-
-		if (ctCollectionId != null) {
-			setCtCollectionId(ctCollectionId);
-		}
-
 		String uuid = (String)attributes.get("uuid");
 
 		if (uuid != null) {
@@ -497,16 +488,6 @@ public String getCssText()
 		return model.getCssText();
 	}
 
-	/**
-	 * Returns the ct collection ID of this layout.
-	 *
-	 * @return the ct collection ID of this layout
-	 */
-	@Override
-	public long getCtCollectionId() {
-		return model.getCtCollectionId();
-	}
-
 	@Override
 	public String getDefaultLanguageId() {
 		return model.getDefaultLanguageId();
@@ -1722,16 +1703,6 @@ public void setCss(String css) {
 		model.setCss(css);
 	}
 
-	/**
-	 * Sets the ct collection ID of this layout.
-	 *
-	 * @param ctCollectionId the ct collection ID of this layout
-	 */
-	@Override
-	public void setCtCollectionId(long ctCollectionId) {
-		model.setCtCollectionId(ctCollectionId);
-	}
-
 	/**
 	 * Sets the description of this layout.
 	 *
@@ -2331,18 +2302,6 @@ public void setUuid(String uuid) {
 		model.setUuid(uuid);
 	}
 
-	@Override
-	public Map<String, Function<Layout, Object>> getAttributeGetterFunctions() {
-		return model.getAttributeGetterFunctions();
-	}
-
-	@Override
-	public Map<String, BiConsumer<Layout, Object>>
-		getAttributeSetterBiConsumers() {
-
-		return model.getAttributeSetterBiConsumers();
-	}
-
 	@Override
 	public StagedModelType getStagedModelType() {
 		return model.getStagedModelType();
diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/VirtualHostModel.java b/portal-kernel/src/com/liferay/portal/kernel/model/VirtualHostModel.java
index 0ffe70cc4cbe35..b2c814c2f504f5 100644
--- a/portal-kernel/src/com/liferay/portal/kernel/model/VirtualHostModel.java
+++ b/portal-kernel/src/com/liferay/portal/kernel/model/VirtualHostModel.java
@@ -128,4 +128,40 @@ public interface VirtualHostModel
 	 */
 	public void setHostname(String hostname);
 
+	/**
+	 * Returns the default virtual host of this virtual host.
+	 *
+	 * @return the default virtual host of this virtual host
+	 */
+	public boolean getDefaultVirtualHost();
+
+	/**
+	 * Returns <code>true</code> if this virtual host is default virtual host.
+	 *
+	 * @return <code>true</code> if this virtual host is default virtual host; <code>false</code> otherwise
+	 */
+	public boolean isDefaultVirtualHost();
+
+	/**
+	 * Sets whether this virtual host is default virtual host.
+	 *
+	 * @param defaultVirtualHost the default virtual host of this virtual host
+	 */
+	public void setDefaultVirtualHost(boolean defaultVirtualHost);
+
+	/**
+	 * Returns the language ID of this virtual host.
+	 *
+	 * @return the language ID of this virtual host
+	 */
+	@AutoEscape
+	public String getLanguageId();
+
+	/**
+	 * Sets the language ID of this virtual host.
+	 *
+	 * @param languageId the language ID of this virtual host
+	 */
+	public void setLanguageId(String languageId);
+
 }
\ No newline at end of file
diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/VirtualHostSoap.java b/portal-kernel/src/com/liferay/portal/kernel/model/VirtualHostSoap.java
index cec385091dbbe2..c72510961faa2c 100644
--- a/portal-kernel/src/com/liferay/portal/kernel/model/VirtualHostSoap.java
+++ b/portal-kernel/src/com/liferay/portal/kernel/model/VirtualHostSoap.java
@@ -35,6 +35,8 @@ public static VirtualHostSoap toSoapModel(VirtualHost model) {
 		soapModel.setCompanyId(model.getCompanyId());
 		soapModel.setLayoutSetId(model.getLayoutSetId());
 		soapModel.setHostname(model.getHostname());
+		soapModel.setDefaultVirtualHost(model.isDefaultVirtualHost());
+		soapModel.setLanguageId(model.getLanguageId());
 
 		return soapModel;
 	}
@@ -128,10 +130,32 @@ public void setHostname(String hostname) {
 		_hostname = hostname;
 	}
 
+	public boolean getDefaultVirtualHost() {
+		return _defaultVirtualHost;
+	}
+
+	public boolean isDefaultVirtualHost() {
+		return _defaultVirtualHost;
+	}
+
+	public void setDefaultVirtualHost(boolean defaultVirtualHost) {
+		_defaultVirtualHost = defaultVirtualHost;
+	}
+
+	public String getLanguageId() {
+		return _languageId;
+	}
+
+	public void setLanguageId(String languageId) {
+		_languageId = languageId;
+	}
+
 	private long _mvccVersion;
 	private long _virtualHostId;
 	private long _companyId;
 	private long _layoutSetId;
 	private String _hostname;
+	private boolean _defaultVirtualHost;
+	private String _languageId;
 
 }
\ No newline at end of file
diff --git a/portal-kernel/src/com/liferay/portal/kernel/model/VirtualHostWrapper.java b/portal-kernel/src/com/liferay/portal/kernel/model/VirtualHostWrapper.java
index b4105e8c922253..de0fd53d0eca35 100644
--- a/portal-kernel/src/com/liferay/portal/kernel/model/VirtualHostWrapper.java
+++ b/portal-kernel/src/com/liferay/portal/kernel/model/VirtualHostWrapper.java
@@ -45,6 +45,8 @@ public Map<String, Object> getModelAttributes() {
 		attributes.put("companyId", getCompanyId());
 		attributes.put("layoutSetId", getLayoutSetId());
 		attributes.put("hostname", getHostname());
+		attributes.put("defaultVirtualHost", isDefaultVirtualHost());
+		attributes.put("languageId", getLanguageId());
 
 		return attributes;
 	}
@@ -80,6 +82,19 @@ public void setModelAttributes(Map<String, Object> attributes) {
 		if (hostname != null) {
 			setHostname(hostname);
 		}
+
+		Boolean defaultVirtualHost = (Boolean)attributes.get(
+			"defaultVirtualHost");
+
+		if (defaultVirtualHost != null) {
+			setDefaultVirtualHost(defaultVirtualHost);
+		}
+
+		String languageId = (String)attributes.get("languageId");
+
+		if (languageId != null) {
+			setLanguageId(languageId);
+		}
 	}
 
 	/**
@@ -92,6 +107,16 @@ public long getCompanyId() {
 		return model.getCompanyId();
 	}
 
+	/**
+	 * Returns the default virtual host of this virtual host.
+	 *
+	 * @return the default virtual host of this virtual host
+	 */
+	@Override
+	public boolean getDefaultVirtualHost() {
+		return model.getDefaultVirtualHost();
+	}
+
 	/**
 	 * Returns the hostname of this virtual host.
 	 *
@@ -102,6 +127,16 @@ public String getHostname() {
 		return model.getHostname();
 	}
 
+	/**
+	 * Returns the language ID of this virtual host.
+	 *
+	 * @return the language ID of this virtual host
+	 */
+	@Override
+	public String getLanguageId() {
+		return model.getLanguageId();
+	}
+
 	/**
 	 * Returns the layout set ID of this virtual host.
 	 *
@@ -142,6 +177,16 @@ public long getVirtualHostId() {
 		return model.getVirtualHostId();
 	}
 
+	/**
+	 * Returns <code>true</code> if this virtual host is default virtual host.
+	 *
+	 * @return <code>true</code> if this virtual host is default virtual host; <code>false</code> otherwise
+	 */
+	@Override
+	public boolean isDefaultVirtualHost() {
+		return model.isDefaultVirtualHost();
+	}
+
 	/**
 	 * NOTE FOR DEVELOPERS:
 	 *
@@ -162,6 +207,16 @@ public void setCompanyId(long companyId) {
 		model.setCompanyId(companyId);
 	}
 
+	/**
+	 * Sets whether this virtual host is default virtual host.
+	 *
+	 * @param defaultVirtualHost the default virtual host of this virtual host
+	 */
+	@Override
+	public void setDefaultVirtualHost(boolean defaultVirtualHost) {
+		model.setDefaultVirtualHost(defaultVirtualHost);
+	}
+
 	/**
 	 * Sets the hostname of this virtual host.
 	 *
@@ -172,6 +227,16 @@ public void setHostname(String hostname) {
 		model.setHostname(hostname);
 	}
 
+	/**
+	 * Sets the language ID of this virtual host.
+	 *
+	 * @param languageId the language ID of this virtual host
+	 */
+	@Override
+	public void setLanguageId(String languageId) {
+		model.setLanguageId(languageId);
+	}
+
 	/**
 	 * Sets the layout set ID of this virtual host.
 	 *
diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/LayoutLocalService.java b/portal-kernel/src/com/liferay/portal/kernel/service/LayoutLocalService.java
index 8737b4f3e8171c..11d0a68741f1aa 100644
--- a/portal-kernel/src/com/liferay/portal/kernel/service/LayoutLocalService.java
+++ b/portal-kernel/src/com/liferay/portal/kernel/service/LayoutLocalService.java
@@ -15,7 +15,6 @@
 package com.liferay.portal.kernel.service;
 
 import com.liferay.exportimport.kernel.lar.PortletDataContext;
-import com.liferay.petra.function.UnsafeFunction;
 import com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery;
 import com.liferay.portal.kernel.dao.orm.DynamicQuery;
 import com.liferay.portal.kernel.dao.orm.ExportActionableDynamicQuery;
@@ -32,8 +31,6 @@
 import com.liferay.portal.kernel.model.User;
 import com.liferay.portal.kernel.search.Indexable;
 import com.liferay.portal.kernel.search.IndexableType;
-import com.liferay.portal.kernel.service.change.tracking.CTService;
-import com.liferay.portal.kernel.service.persistence.change.tracking.CTPersistence;
 import com.liferay.portal.kernel.systemevent.SystemEvent;
 import com.liferay.portal.kernel.transaction.Isolation;
 import com.liferay.portal.kernel.transaction.Propagation;
@@ -65,7 +62,7 @@
 	rollbackFor = {PortalException.class, SystemException.class}
 )
 public interface LayoutLocalService
-	extends BaseLocalService, CTService<Layout>, PersistedModelLocalService {
+	extends BaseLocalService, PersistedModelLocalService {
 
 	/**
 	 * NOTE FOR DEVELOPERS:
@@ -1428,18 +1425,4 @@ public Layout updatePriority(long plid, int priority)
 
 	public Layout updateType(long plid, String type) throws PortalException;
 
-	@Override
-	@Transactional(enabled = false)
-	public CTPersistence<Layout> getCTPersistence();
-
-	@Override
-	@Transactional(enabled = false)
-	public Class<Layout> getModelClass();
-
-	@Override
-	@Transactional(rollbackFor = Throwable.class)
-	public <R, E extends Throwable> R updateWithUnsafeFunction(
-			UnsafeFunction<CTPersistence<Layout>, R, E> updateUnsafeFunction)
-		throws E;
-
 }
\ No newline at end of file
diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/LayoutLocalServiceWrapper.java b/portal-kernel/src/com/liferay/portal/kernel/service/LayoutLocalServiceWrapper.java
index 9aa0dd0c25c096..e32134e774dcb8 100644
--- a/portal-kernel/src/com/liferay/portal/kernel/service/LayoutLocalServiceWrapper.java
+++ b/portal-kernel/src/com/liferay/portal/kernel/service/LayoutLocalServiceWrapper.java
@@ -14,10 +14,6 @@
 
 package com.liferay.portal.kernel.service;
 
-import com.liferay.petra.function.UnsafeFunction;
-import com.liferay.portal.kernel.model.Layout;
-import com.liferay.portal.kernel.service.persistence.change.tracking.CTPersistence;
-
 /**
  * Provides a wrapper for {@link LayoutLocalService}.
  *
@@ -39,7 +35,9 @@ public LayoutLocalServiceWrapper(LayoutLocalService layoutLocalService) {
 	 * @return the layout that was added
 	 */
 	@Override
-	public Layout addLayout(Layout layout) {
+	public com.liferay.portal.kernel.model.Layout addLayout(
+		com.liferay.portal.kernel.model.Layout layout) {
+
 		return _layoutLocalService.addLayout(layout);
 	}
 
@@ -93,16 +91,17 @@ public Layout addLayout(Layout layout) {
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout addLayout(
+	public com.liferay.portal.kernel.model.Layout addLayout(
 			long userId, long groupId, boolean privateLayout,
 			long parentLayoutId, long classNameId, long classPK,
-			java.util.Map<java.util.Locale, String> nameMap,
-			java.util.Map<java.util.Locale, String> titleMap,
-			java.util.Map<java.util.Locale, String> descriptionMap,
-			java.util.Map<java.util.Locale, String> keywordsMap,
-			java.util.Map<java.util.Locale, String> robotsMap, String type,
-			String typeSettings, boolean hidden, boolean system,
-			java.util.Map<java.util.Locale, String> friendlyURLMap,
+			java.util.Map<java.util.Locale, java.lang.String> nameMap,
+			java.util.Map<java.util.Locale, java.lang.String> titleMap,
+			java.util.Map<java.util.Locale, java.lang.String> descriptionMap,
+			java.util.Map<java.util.Locale, java.lang.String> keywordsMap,
+			java.util.Map<java.util.Locale, java.lang.String> robotsMap,
+			java.lang.String type, java.lang.String typeSettings,
+			boolean hidden, boolean system,
+			java.util.Map<java.util.Locale, java.lang.String> friendlyURLMap,
 			ServiceContext serviceContext)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
@@ -160,16 +159,17 @@ public Layout addLayout(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout addLayout(
+	public com.liferay.portal.kernel.model.Layout addLayout(
 			long userId, long groupId, boolean privateLayout,
 			long parentLayoutId,
-			java.util.Map<java.util.Locale, String> nameMap,
-			java.util.Map<java.util.Locale, String> titleMap,
-			java.util.Map<java.util.Locale, String> descriptionMap,
-			java.util.Map<java.util.Locale, String> keywordsMap,
-			java.util.Map<java.util.Locale, String> robotsMap, String type,
-			String typeSettings, boolean hidden, boolean system,
-			java.util.Map<java.util.Locale, String> friendlyURLMap,
+			java.util.Map<java.util.Locale, java.lang.String> nameMap,
+			java.util.Map<java.util.Locale, java.lang.String> titleMap,
+			java.util.Map<java.util.Locale, java.lang.String> descriptionMap,
+			java.util.Map<java.util.Locale, java.lang.String> keywordsMap,
+			java.util.Map<java.util.Locale, java.lang.String> robotsMap,
+			java.lang.String type, java.lang.String typeSettings,
+			boolean hidden, boolean system,
+			java.util.Map<java.util.Locale, java.lang.String> friendlyURLMap,
 			ServiceContext serviceContext)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
@@ -226,16 +226,17 @@ public Layout addLayout(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout addLayout(
+	public com.liferay.portal.kernel.model.Layout addLayout(
 			long userId, long groupId, boolean privateLayout,
 			long parentLayoutId,
-			java.util.Map<java.util.Locale, String> nameMap,
-			java.util.Map<java.util.Locale, String> titleMap,
-			java.util.Map<java.util.Locale, String> descriptionMap,
-			java.util.Map<java.util.Locale, String> keywordsMap,
-			java.util.Map<java.util.Locale, String> robotsMap, String type,
-			String typeSettings, boolean hidden,
-			java.util.Map<java.util.Locale, String> friendlyURLMap,
+			java.util.Map<java.util.Locale, java.lang.String> nameMap,
+			java.util.Map<java.util.Locale, java.lang.String> titleMap,
+			java.util.Map<java.util.Locale, java.lang.String> descriptionMap,
+			java.util.Map<java.util.Locale, java.lang.String> keywordsMap,
+			java.util.Map<java.util.Locale, java.lang.String> robotsMap,
+			java.lang.String type, java.lang.String typeSettings,
+			boolean hidden,
+			java.util.Map<java.util.Locale, java.lang.String> friendlyURLMap,
 			ServiceContext serviceContext)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
@@ -294,10 +295,11 @@ public Layout addLayout(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout addLayout(
+	public com.liferay.portal.kernel.model.Layout addLayout(
 			long userId, long groupId, boolean privateLayout,
-			long parentLayoutId, String name, String title, String description,
-			String type, boolean hidden, boolean system, String friendlyURL,
+			long parentLayoutId, java.lang.String name, java.lang.String title,
+			java.lang.String description, java.lang.String type, boolean hidden,
+			boolean system, java.lang.String friendlyURL,
 			ServiceContext serviceContext)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
@@ -354,11 +356,11 @@ public Layout addLayout(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout addLayout(
+	public com.liferay.portal.kernel.model.Layout addLayout(
 			long userId, long groupId, boolean privateLayout,
-			long parentLayoutId, String name, String title, String description,
-			String type, boolean hidden, String friendlyURL,
-			ServiceContext serviceContext)
+			long parentLayoutId, java.lang.String name, java.lang.String title,
+			java.lang.String description, java.lang.String type, boolean hidden,
+			java.lang.String friendlyURL, ServiceContext serviceContext)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.addLayout(
@@ -373,7 +375,7 @@ public Layout addLayout(
 	 * @return the new layout
 	 */
 	@Override
-	public Layout createLayout(long plid) {
+	public com.liferay.portal.kernel.model.Layout createLayout(long plid) {
 		return _layoutLocalService.createLayout(plid);
 	}
 
@@ -385,7 +387,8 @@ public Layout createLayout(long plid) {
 	 * @throws PortalException
 	 */
 	@Override
-	public Layout deleteLayout(Layout layout)
+	public com.liferay.portal.kernel.model.Layout deleteLayout(
+			com.liferay.portal.kernel.model.Layout layout)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.deleteLayout(layout);
@@ -398,8 +401,8 @@ public Layout deleteLayout(Layout layout)
 	@Deprecated
 	@Override
 	public void deleteLayout(
-			Layout layout, boolean updateLayoutSet,
-			ServiceContext serviceContext)
+			com.liferay.portal.kernel.model.Layout layout,
+			boolean updateLayoutSet, ServiceContext serviceContext)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		_layoutLocalService.deleteLayout(
@@ -414,7 +417,9 @@ public void deleteLayout(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public void deleteLayout(Layout layout, ServiceContext serviceContext)
+	public void deleteLayout(
+			com.liferay.portal.kernel.model.Layout layout,
+			ServiceContext serviceContext)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		_layoutLocalService.deleteLayout(layout, serviceContext);
@@ -428,7 +433,7 @@ public void deleteLayout(Layout layout, ServiceContext serviceContext)
 	 * @throws PortalException if a layout with the primary key could not be found
 	 */
 	@Override
-	public Layout deleteLayout(long plid)
+	public com.liferay.portal.kernel.model.Layout deleteLayout(long plid)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.deleteLayout(plid);
@@ -591,12 +596,14 @@ public long dynamicQueryCount(
 	}
 
 	@Override
-	public Layout fetchDefaultLayout(long groupId, boolean privateLayout) {
+	public com.liferay.portal.kernel.model.Layout fetchDefaultLayout(
+		long groupId, boolean privateLayout) {
+
 		return _layoutLocalService.fetchDefaultLayout(groupId, privateLayout);
 	}
 
 	@Override
-	public Layout fetchFirstLayout(
+	public com.liferay.portal.kernel.model.Layout fetchFirstLayout(
 		long groupId, boolean privateLayout, long parentLayoutId) {
 
 		return _layoutLocalService.fetchFirstLayout(
@@ -604,7 +611,7 @@ public Layout fetchFirstLayout(
 	}
 
 	@Override
-	public Layout fetchFirstLayout(
+	public com.liferay.portal.kernel.model.Layout fetchFirstLayout(
 		long groupId, boolean privateLayout, long parentLayoutId,
 		boolean hidden) {
 
@@ -613,12 +620,12 @@ public Layout fetchFirstLayout(
 	}
 
 	@Override
-	public Layout fetchLayout(long plid) {
+	public com.liferay.portal.kernel.model.Layout fetchLayout(long plid) {
 		return _layoutLocalService.fetchLayout(plid);
 	}
 
 	@Override
-	public Layout fetchLayout(
+	public com.liferay.portal.kernel.model.Layout fetchLayout(
 		long groupId, boolean privateLayout, long layoutId) {
 
 		return _layoutLocalService.fetchLayout(
@@ -626,27 +633,29 @@ public Layout fetchLayout(
 	}
 
 	@Override
-	public Layout fetchLayout(long classNameId, long classPK) {
+	public com.liferay.portal.kernel.model.Layout fetchLayout(
+		long classNameId, long classPK) {
+
 		return _layoutLocalService.fetchLayout(classNameId, classPK);
 	}
 
 	@Override
-	public Layout fetchLayout(
-		String uuid, long groupId, boolean privateLayout) {
+	public com.liferay.portal.kernel.model.Layout fetchLayout(
+		java.lang.String uuid, long groupId, boolean privateLayout) {
 
 		return _layoutLocalService.fetchLayout(uuid, groupId, privateLayout);
 	}
 
 	@Override
-	public Layout fetchLayoutByFriendlyURL(
-		long groupId, boolean privateLayout, String friendlyURL) {
+	public com.liferay.portal.kernel.model.Layout fetchLayoutByFriendlyURL(
+		long groupId, boolean privateLayout, java.lang.String friendlyURL) {
 
 		return _layoutLocalService.fetchLayoutByFriendlyURL(
 			groupId, privateLayout, friendlyURL);
 	}
 
 	@Override
-	public Layout fetchLayoutByIconImageId(
+	public com.liferay.portal.kernel.model.Layout fetchLayoutByIconImageId(
 			boolean privateLayout, long iconImageId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
@@ -663,8 +672,8 @@ public Layout fetchLayoutByIconImageId(
 	 * @return the matching layout, or <code>null</code> if a matching layout could not be found
 	 */
 	@Override
-	public Layout fetchLayoutByUuidAndGroupId(
-		String uuid, long groupId, boolean privateLayout) {
+	public com.liferay.portal.kernel.model.Layout fetchLayoutByUuidAndGroupId(
+		java.lang.String uuid, long groupId, boolean privateLayout) {
 
 		return _layoutLocalService.fetchLayoutByUuidAndGroupId(
 			uuid, groupId, privateLayout);
@@ -714,7 +723,7 @@ public long getDefaultPlid(long groupId, boolean privateLayout) {
 	 */
 	@Override
 	public long getDefaultPlid(
-			long groupId, boolean privateLayout, String portletId)
+			long groupId, boolean privateLayout, java.lang.String portletId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.getDefaultPlid(
@@ -741,8 +750,8 @@ public long getDefaultPlid(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout getFriendlyURLLayout(
-			long groupId, boolean privateLayout, String friendlyURL)
+	public com.liferay.portal.kernel.model.Layout getFriendlyURLLayout(
+			long groupId, boolean privateLayout, java.lang.String friendlyURL)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.getFriendlyURLLayout(
@@ -764,7 +773,7 @@ public Layout getFriendlyURLLayout(
 	 * @throws PortalException if a layout with the primary key could not be found
 	 */
 	@Override
-	public Layout getLayout(long plid)
+	public com.liferay.portal.kernel.model.Layout getLayout(long plid)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.getLayout(plid);
@@ -781,7 +790,8 @@ public Layout getLayout(long plid)
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout getLayout(long groupId, boolean privateLayout, long layoutId)
+	public com.liferay.portal.kernel.model.Layout getLayout(
+			long groupId, boolean privateLayout, long layoutId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.getLayout(groupId, privateLayout, layoutId);
@@ -796,7 +806,8 @@ public Layout getLayout(long groupId, boolean privateLayout, long layoutId)
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout getLayoutByIconImageId(long iconImageId)
+	public com.liferay.portal.kernel.model.Layout getLayoutByIconImageId(
+			long iconImageId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.getLayoutByIconImageId(iconImageId);
@@ -812,8 +823,8 @@ public Layout getLayoutByIconImageId(long iconImageId)
 	 * @throws PortalException if a matching layout could not be found
 	 */
 	@Override
-	public Layout getLayoutByUuidAndGroupId(
-			String uuid, long groupId, boolean privateLayout)
+	public com.liferay.portal.kernel.model.Layout getLayoutByUuidAndGroupId(
+			java.lang.String uuid, long groupId, boolean privateLayout)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.getLayoutByUuidAndGroupId(
@@ -826,17 +837,23 @@ public Layout getLayoutByUuidAndGroupId(
 	 */
 	@Deprecated
 	@Override
-	public java.util.Map<Long, java.util.List<Layout>> getLayoutChildLayouts(
-		com.liferay.portal.kernel.model.LayoutSet layoutSet,
-		java.util.List<Layout> parentLayouts) {
+	public java.util.Map
+		<java.lang.Long, java.util.List<com.liferay.portal.kernel.model.Layout>>
+			getLayoutChildLayouts(
+				com.liferay.portal.kernel.model.LayoutSet layoutSet,
+				java.util.List<com.liferay.portal.kernel.model.Layout>
+					parentLayouts) {
 
 		return _layoutLocalService.getLayoutChildLayouts(
 			layoutSet, parentLayouts);
 	}
 
 	@Override
-	public java.util.Map<Long, java.util.List<Layout>> getLayoutChildLayouts(
-		java.util.List<Layout> parentLayouts) {
+	public java.util.Map
+		<java.lang.Long, java.util.List<com.liferay.portal.kernel.model.Layout>>
+			getLayoutChildLayouts(
+				java.util.List<com.liferay.portal.kernel.model.Layout>
+					parentLayouts) {
 
 		return _layoutLocalService.getLayoutChildLayouts(parentLayouts);
 	}
@@ -853,12 +870,16 @@ public java.util.Map<Long, java.util.List<Layout>> getLayoutChildLayouts(
 	 * @return the range of layouts
 	 */
 	@Override
-	public java.util.List<Layout> getLayouts(int start, int end) {
+	public java.util.List<com.liferay.portal.kernel.model.Layout> getLayouts(
+		int start, int end) {
+
 		return _layoutLocalService.getLayouts(start, end);
 	}
 
 	@Override
-	public java.util.List<Layout> getLayouts(long companyId) {
+	public java.util.List<com.liferay.portal.kernel.model.Layout> getLayouts(
+		long companyId) {
+
 		return _layoutLocalService.getLayouts(companyId);
 	}
 
@@ -871,7 +892,7 @@ public java.util.List<Layout> getLayouts(long companyId) {
 	 found
 	 */
 	@Override
-	public java.util.List<Layout> getLayouts(
+	public java.util.List<com.liferay.portal.kernel.model.Layout> getLayouts(
 		long groupId, boolean privateLayout) {
 
 		return _layoutLocalService.getLayouts(groupId, privateLayout);
@@ -889,9 +910,10 @@ public java.util.List<Layout> getLayouts(
 	 found
 	 */
 	@Override
-	public java.util.List<Layout> getLayouts(
+	public java.util.List<com.liferay.portal.kernel.model.Layout> getLayouts(
 		long groupId, boolean privateLayout, int start, int end,
-		com.liferay.portal.kernel.util.OrderByComparator<Layout> obc) {
+		com.liferay.portal.kernel.util.OrderByComparator
+			<com.liferay.portal.kernel.model.Layout> obc) {
 
 		return _layoutLocalService.getLayouts(
 			groupId, privateLayout, start, end, obc);
@@ -908,7 +930,7 @@ public java.util.List<Layout> getLayouts(
 	 found
 	 */
 	@Override
-	public java.util.List<Layout> getLayouts(
+	public java.util.List<com.liferay.portal.kernel.model.Layout> getLayouts(
 		long groupId, boolean privateLayout, long parentLayoutId) {
 
 		return _layoutLocalService.getLayouts(
@@ -938,7 +960,7 @@ public java.util.List<Layout> getLayouts(
 	 found
 	 */
 	@Override
-	public java.util.List<Layout> getLayouts(
+	public java.util.List<com.liferay.portal.kernel.model.Layout> getLayouts(
 		long groupId, boolean privateLayout, long parentLayoutId,
 		boolean incomplete, int start, int end) {
 
@@ -969,10 +991,11 @@ public java.util.List<Layout> getLayouts(
 	 found
 	 */
 	@Override
-	public java.util.List<Layout> getLayouts(
+	public java.util.List<com.liferay.portal.kernel.model.Layout> getLayouts(
 		long groupId, boolean privateLayout, long parentLayoutId,
 		boolean incomplete, int start, int end,
-		com.liferay.portal.kernel.util.OrderByComparator<Layout> obc) {
+		com.liferay.portal.kernel.util.OrderByComparator
+			<com.liferay.portal.kernel.model.Layout> obc) {
 
 		return _layoutLocalService.getLayouts(
 			groupId, privateLayout, parentLayoutId, incomplete, start, end,
@@ -990,7 +1013,7 @@ public java.util.List<Layout> getLayouts(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public java.util.List<Layout> getLayouts(
+	public java.util.List<com.liferay.portal.kernel.model.Layout> getLayouts(
 			long groupId, boolean privateLayout, long[] layoutIds)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
@@ -1009,8 +1032,8 @@ public java.util.List<Layout> getLayouts(
 	 found
 	 */
 	@Override
-	public java.util.List<Layout> getLayouts(
-			long groupId, boolean privateLayout, String type)
+	public java.util.List<com.liferay.portal.kernel.model.Layout> getLayouts(
+			long groupId, boolean privateLayout, java.lang.String type)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.getLayouts(groupId, privateLayout, type);
@@ -1030,10 +1053,11 @@ public java.util.List<Layout> getLayouts(
 	 found
 	 */
 	@Override
-	public java.util.List<Layout> getLayouts(
-			long groupId, boolean privateLayout, String keywords,
-			String[] types, int start, int end,
-			com.liferay.portal.kernel.util.OrderByComparator<Layout> obc)
+	public java.util.List<com.liferay.portal.kernel.model.Layout> getLayouts(
+			long groupId, boolean privateLayout, java.lang.String keywords,
+			java.lang.String[] types, int start, int end,
+			com.liferay.portal.kernel.util.OrderByComparator
+				<com.liferay.portal.kernel.model.Layout> obc)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.getLayouts(
@@ -1051,9 +1075,10 @@ public java.util.List<Layout> getLayouts(
 	 found
 	 */
 	@Override
-	public java.util.List<Layout> getLayouts(
+	public java.util.List<com.liferay.portal.kernel.model.Layout> getLayouts(
 		long groupId, int start, int end,
-		com.liferay.portal.kernel.util.OrderByComparator<Layout> obc) {
+		com.liferay.portal.kernel.util.OrderByComparator
+			<com.liferay.portal.kernel.model.Layout> obc) {
 
 		return _layoutLocalService.getLayouts(groupId, start, end, obc);
 	}
@@ -1070,8 +1095,8 @@ public java.util.List<Layout> getLayouts(
 	 */
 	@Override
 	public com.liferay.portal.kernel.model.LayoutReference[] getLayouts(
-		long companyId, String portletId, String preferencesKey,
-		String preferencesValue) {
+		long companyId, java.lang.String portletId,
+		java.lang.String preferencesKey, java.lang.String preferencesValue) {
 
 		return _layoutLocalService.getLayouts(
 			companyId, portletId, preferencesKey, preferencesValue);
@@ -1090,9 +1115,11 @@ public com.liferay.portal.kernel.model.LayoutReference[] getLayouts(
 	 found
 	 */
 	@Override
-	public java.util.List<Layout> getLayouts(
-			long groupId, String keywords, String[] types, int start, int end,
-			com.liferay.portal.kernel.util.OrderByComparator<Layout> obc)
+	public java.util.List<com.liferay.portal.kernel.model.Layout> getLayouts(
+			long groupId, java.lang.String keywords, java.lang.String[] types,
+			int start, int end,
+			com.liferay.portal.kernel.util.OrderByComparator
+				<com.liferay.portal.kernel.model.Layout> obc)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.getLayouts(
@@ -1100,8 +1127,8 @@ public java.util.List<Layout> getLayouts(
 	}
 
 	@Override
-	public java.util.List<Layout> getLayoutsByLayoutPrototypeUuid(
-		String layoutPrototypeUuid) {
+	public java.util.List<com.liferay.portal.kernel.model.Layout>
+		getLayoutsByLayoutPrototypeUuid(java.lang.String layoutPrototypeUuid) {
 
 		return _layoutLocalService.getLayoutsByLayoutPrototypeUuid(
 			layoutPrototypeUuid);
@@ -1109,7 +1136,7 @@ public java.util.List<Layout> getLayoutsByLayoutPrototypeUuid(
 
 	@Override
 	public int getLayoutsByLayoutPrototypeUuidCount(
-		String layoutPrototypeUuid) {
+		java.lang.String layoutPrototypeUuid) {
 
 		return _layoutLocalService.getLayoutsByLayoutPrototypeUuidCount(
 			layoutPrototypeUuid);
@@ -1123,8 +1150,8 @@ public int getLayoutsByLayoutPrototypeUuidCount(
 	 * @return the matching layouts, or an empty list if no matches were found
 	 */
 	@Override
-	public java.util.List<Layout> getLayoutsByUuidAndCompanyId(
-		String uuid, long companyId) {
+	public java.util.List<com.liferay.portal.kernel.model.Layout>
+		getLayoutsByUuidAndCompanyId(java.lang.String uuid, long companyId) {
 
 		return _layoutLocalService.getLayoutsByUuidAndCompanyId(
 			uuid, companyId);
@@ -1141,10 +1168,11 @@ public java.util.List<Layout> getLayoutsByUuidAndCompanyId(
 	 * @return the range of matching layouts, or an empty list if no matches were found
 	 */
 	@Override
-	public java.util.List<Layout> getLayoutsByUuidAndCompanyId(
-		String uuid, long companyId, int start, int end,
-		com.liferay.portal.kernel.util.OrderByComparator<Layout>
-			orderByComparator) {
+	public java.util.List<com.liferay.portal.kernel.model.Layout>
+		getLayoutsByUuidAndCompanyId(
+			java.lang.String uuid, long companyId, int start, int end,
+			com.liferay.portal.kernel.util.OrderByComparator
+				<com.liferay.portal.kernel.model.Layout> orderByComparator) {
 
 		return _layoutLocalService.getLayoutsByUuidAndCompanyId(
 			uuid, companyId, start, end, orderByComparator);
@@ -1199,7 +1227,7 @@ public int getLayoutsCount(
 	@Override
 	public int getLayoutsCount(
 			com.liferay.portal.kernel.model.Group group, boolean privateLayout,
-			String keywords, String[] types)
+			java.lang.String keywords, java.lang.String[] types)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.getLayoutsCount(
@@ -1212,7 +1240,8 @@ public int getLayoutsCount(long groupId) {
 	}
 
 	@Override
-	public int getLayoutsCount(long groupId, String keywords, String[] types)
+	public int getLayoutsCount(
+			long groupId, java.lang.String keywords, java.lang.String[] types)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.getLayoutsCount(groupId, keywords, types);
@@ -1257,7 +1286,9 @@ public long getNextLayoutId(long groupId, boolean privateLayout) {
 	 */
 	@Deprecated
 	@Override
-	public java.util.List<Layout> getNoPermissionLayouts(long roleId) {
+	public java.util.List<com.liferay.portal.kernel.model.Layout>
+		getNoPermissionLayouts(long roleId) {
+
 		return _layoutLocalService.getNoPermissionLayouts(roleId);
 	}
 
@@ -1269,7 +1300,9 @@ public java.util.List<Layout> getNoPermissionLayouts(long roleId) {
 	 */
 	@Deprecated
 	@Override
-	public java.util.List<Layout> getNullFriendlyURLLayouts() {
+	public java.util.List<com.liferay.portal.kernel.model.Layout>
+		getNullFriendlyURLLayouts() {
+
 		return _layoutLocalService.getNullFriendlyURLLayouts();
 	}
 
@@ -1279,12 +1312,13 @@ public java.util.List<Layout> getNullFriendlyURLLayouts() {
 	 * @return the OSGi service identifier
 	 */
 	@Override
-	public String getOSGiServiceIdentifier() {
+	public java.lang.String getOSGiServiceIdentifier() {
 		return _layoutLocalService.getOSGiServiceIdentifier();
 	}
 
 	@Override
-	public Layout getParentLayout(Layout layout)
+	public com.liferay.portal.kernel.model.Layout getParentLayout(
+			com.liferay.portal.kernel.model.Layout layout)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.getParentLayout(layout);
@@ -1299,7 +1333,8 @@ public com.liferay.portal.kernel.model.PersistedModel getPersistedModel(
 	}
 
 	@Override
-	public java.util.List<Layout> getScopeGroupLayouts(long parentGroupId)
+	public java.util.List<com.liferay.portal.kernel.model.Layout>
+			getScopeGroupLayouts(long parentGroupId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.getScopeGroupLayouts(parentGroupId);
@@ -1314,8 +1349,8 @@ public java.util.List<Layout> getScopeGroupLayouts(long parentGroupId)
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public java.util.List<Layout> getScopeGroupLayouts(
-			long parentGroupId, boolean privateLayout)
+	public java.util.List<com.liferay.portal.kernel.model.Layout>
+			getScopeGroupLayouts(long parentGroupId, boolean privateLayout)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.getScopeGroupLayouts(
@@ -1334,7 +1369,8 @@ public java.util.List<Layout> getScopeGroupLayouts(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public boolean hasLayout(String uuid, long groupId, boolean privateLayout)
+	public boolean hasLayout(
+			java.lang.String uuid, long groupId, boolean privateLayout)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.hasLayout(uuid, groupId, privateLayout);
@@ -1403,7 +1439,7 @@ public boolean hasLayouts(
 
 	@Override
 	public boolean hasLayoutSetPrototypeLayout(
-			long layoutSetPrototypeId, String layoutUuid)
+			long layoutSetPrototypeId, java.lang.String layoutUuid)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.hasLayoutSetPrototypeLayout(
@@ -1412,7 +1448,8 @@ public boolean hasLayoutSetPrototypeLayout(
 
 	@Override
 	public boolean hasLayoutSetPrototypeLayout(
-			String layoutSetPrototypeUuid, long companyId, String layoutUuid)
+			java.lang.String layoutSetPrototypeUuid, long companyId,
+			java.lang.String layoutUuid)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.hasLayoutSetPrototypeLayout(
@@ -1442,8 +1479,8 @@ public void setLayouts(
 
 	@Override
 	public void updateAsset(
-			long userId, Layout layout, long[] assetCategoryIds,
-			String[] assetTagNames)
+			long userId, com.liferay.portal.kernel.model.Layout layout,
+			long[] assetCategoryIds, java.lang.String[] assetTagNames)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		_layoutLocalService.updateAsset(
@@ -1461,8 +1498,9 @@ public void updateAsset(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout updateFriendlyURL(
-			long userId, long plid, String friendlyURL, String languageId)
+	public com.liferay.portal.kernel.model.Layout updateFriendlyURL(
+			long userId, long plid, java.lang.String friendlyURL,
+			java.lang.String languageId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.updateFriendlyURL(
@@ -1470,7 +1508,8 @@ public Layout updateFriendlyURL(
 	}
 
 	@Override
-	public Layout updateIconImage(long plid, byte[] bytes)
+	public com.liferay.portal.kernel.model.Layout updateIconImage(
+			long plid, byte[] bytes)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.updateIconImage(plid, bytes);
@@ -1483,7 +1522,9 @@ public Layout updateIconImage(long plid, byte[] bytes)
 	 * @return the layout that was updated
 	 */
 	@Override
-	public Layout updateLayout(Layout layout) {
+	public com.liferay.portal.kernel.model.Layout updateLayout(
+		com.liferay.portal.kernel.model.Layout layout) {
+
 		return _layoutLocalService.updateLayout(layout);
 	}
 
@@ -1498,7 +1539,7 @@ public Layout updateLayout(Layout layout) {
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout updateLayout(
+	public com.liferay.portal.kernel.model.Layout updateLayout(
 			long groupId, boolean privateLayout, long layoutId,
 			java.util.Date publishDate)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -1519,7 +1560,7 @@ public Layout updateLayout(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout updateLayout(
+	public com.liferay.portal.kernel.model.Layout updateLayout(
 			long groupId, boolean privateLayout, long layoutId,
 			long classNameId, long classPK)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -1567,16 +1608,16 @@ public Layout updateLayout(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout updateLayout(
+	public com.liferay.portal.kernel.model.Layout updateLayout(
 			long groupId, boolean privateLayout, long layoutId,
 			long parentLayoutId,
-			java.util.Map<java.util.Locale, String> nameMap,
-			java.util.Map<java.util.Locale, String> titleMap,
-			java.util.Map<java.util.Locale, String> descriptionMap,
-			java.util.Map<java.util.Locale, String> keywordsMap,
-			java.util.Map<java.util.Locale, String> robotsMap, String type,
-			boolean hidden,
-			java.util.Map<java.util.Locale, String> friendlyURLMap,
+			java.util.Map<java.util.Locale, java.lang.String> nameMap,
+			java.util.Map<java.util.Locale, java.lang.String> titleMap,
+			java.util.Map<java.util.Locale, java.lang.String> descriptionMap,
+			java.util.Map<java.util.Locale, java.lang.String> keywordsMap,
+			java.util.Map<java.util.Locale, java.lang.String> robotsMap,
+			java.lang.String type, boolean hidden,
+			java.util.Map<java.util.Locale, java.lang.String> friendlyURLMap,
 			boolean hasIconImage, byte[] iconBytes,
 			ServiceContext serviceContext)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -1599,9 +1640,9 @@ public Layout updateLayout(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout updateLayout(
+	public com.liferay.portal.kernel.model.Layout updateLayout(
 			long groupId, boolean privateLayout, long layoutId,
-			String typeSettings)
+			java.lang.String typeSettings)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.updateLayout(
@@ -1621,9 +1662,10 @@ public Layout updateLayout(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout updateLookAndFeel(
-			long groupId, boolean privateLayout, long layoutId, String themeId,
-			String colorSchemeId, String css)
+	public com.liferay.portal.kernel.model.Layout updateLookAndFeel(
+			long groupId, boolean privateLayout, long layoutId,
+			java.lang.String themeId, java.lang.String colorSchemeId,
+			java.lang.String css)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.updateLookAndFeel(
@@ -1641,7 +1683,9 @@ public Layout updateLookAndFeel(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout updateName(Layout layout, String name, String languageId)
+	public com.liferay.portal.kernel.model.Layout updateName(
+			com.liferay.portal.kernel.model.Layout layout,
+			java.lang.String name, java.lang.String languageId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.updateName(layout, name, languageId);
@@ -1661,9 +1705,9 @@ public Layout updateName(Layout layout, String name, String languageId)
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout updateName(
-			long groupId, boolean privateLayout, long layoutId, String name,
-			String languageId)
+	public com.liferay.portal.kernel.model.Layout updateName(
+			long groupId, boolean privateLayout, long layoutId,
+			java.lang.String name, java.lang.String languageId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.updateName(
@@ -1681,7 +1725,8 @@ public Layout updateName(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout updateName(long plid, String name, String languageId)
+	public com.liferay.portal.kernel.model.Layout updateName(
+			long plid, java.lang.String name, java.lang.String languageId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.updateName(plid, name, languageId);
@@ -1699,7 +1744,7 @@ public Layout updateName(long plid, String name, String languageId)
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout updateParentLayoutId(
+	public com.liferay.portal.kernel.model.Layout updateParentLayoutId(
 			long groupId, boolean privateLayout, long layoutId,
 			long parentLayoutId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -1720,7 +1765,8 @@ public Layout updateParentLayoutId(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout updateParentLayoutId(long plid, long parentPlid)
+	public com.liferay.portal.kernel.model.Layout updateParentLayoutId(
+			long plid, long parentPlid)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.updateParentLayoutId(plid, parentPlid);
@@ -1736,8 +1782,9 @@ public Layout updateParentLayoutId(long plid, long parentPlid)
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout updateParentLayoutIdAndPriority(
-			long plid, long parentPlid, int priority)
+	public com.liferay.portal.kernel.model.Layout
+			updateParentLayoutIdAndPriority(
+				long plid, long parentPlid, int priority)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.updateParentLayoutIdAndPriority(
@@ -1767,7 +1814,8 @@ public void updatePriorities(long groupId, boolean privateLayout)
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout updatePriority(Layout layout, int priority)
+	public com.liferay.portal.kernel.model.Layout updatePriority(
+			com.liferay.portal.kernel.model.Layout layout, int priority)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.updatePriority(layout, priority);
@@ -1785,7 +1833,7 @@ public Layout updatePriority(Layout layout, int priority)
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout updatePriority(
+	public com.liferay.portal.kernel.model.Layout updatePriority(
 			long groupId, boolean privateLayout, long layoutId, int priority)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
@@ -1807,7 +1855,7 @@ public Layout updatePriority(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout updatePriority(
+	public com.liferay.portal.kernel.model.Layout updatePriority(
 			long groupId, boolean privateLayout, long layoutId,
 			long nextLayoutId, long previousLayoutId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -1825,38 +1873,21 @@ public Layout updatePriority(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout updatePriority(long plid, int priority)
+	public com.liferay.portal.kernel.model.Layout updatePriority(
+			long plid, int priority)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.updatePriority(plid, priority);
 	}
 
 	@Override
-	public Layout updateType(long plid, String type)
+	public com.liferay.portal.kernel.model.Layout updateType(
+			long plid, java.lang.String type)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutLocalService.updateType(plid, type);
 	}
 
-	@Override
-	public CTPersistence<Layout> getCTPersistence() {
-		return _layoutLocalService.getCTPersistence();
-	}
-
-	@Override
-	public Class<Layout> getModelClass() {
-		return _layoutLocalService.getModelClass();
-	}
-
-	@Override
-	public <R, E extends Throwable> R updateWithUnsafeFunction(
-			UnsafeFunction<CTPersistence<Layout>, R, E> updateUnsafeFunction)
-		throws E {
-
-		return _layoutLocalService.updateWithUnsafeFunction(
-			updateUnsafeFunction);
-	}
-
 	@Override
 	public LayoutLocalService getWrappedService() {
 		return _layoutLocalService;
diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/LayoutServiceWrapper.java b/portal-kernel/src/com/liferay/portal/kernel/service/LayoutServiceWrapper.java
index a259c2c7aa45cf..6b29650aef379f 100644
--- a/portal-kernel/src/com/liferay/portal/kernel/service/LayoutServiceWrapper.java
+++ b/portal-kernel/src/com/liferay/portal/kernel/service/LayoutServiceWrapper.java
@@ -14,8 +14,6 @@
 
 package com.liferay.portal.kernel.service;
 
-import com.liferay.portal.kernel.model.Layout;
-
 /**
  * Provides a wrapper for {@link LayoutService}.
  *
@@ -73,16 +71,17 @@ public LayoutServiceWrapper(LayoutService layoutService) {
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout addLayout(
+	public com.liferay.portal.kernel.model.Layout addLayout(
 			long groupId, boolean privateLayout, long parentLayoutId,
 			long classNameId, long classPK,
-			java.util.Map<java.util.Locale, String> localeNamesMap,
-			java.util.Map<java.util.Locale, String> localeTitlesMap,
-			java.util.Map<java.util.Locale, String> descriptionMap,
-			java.util.Map<java.util.Locale, String> keywordsMap,
-			java.util.Map<java.util.Locale, String> robotsMap, String type,
-			String typeSettings, boolean hidden, boolean system,
-			java.util.Map<java.util.Locale, String> friendlyURLMap,
+			java.util.Map<java.util.Locale, java.lang.String> localeNamesMap,
+			java.util.Map<java.util.Locale, java.lang.String> localeTitlesMap,
+			java.util.Map<java.util.Locale, java.lang.String> descriptionMap,
+			java.util.Map<java.util.Locale, java.lang.String> keywordsMap,
+			java.util.Map<java.util.Locale, java.lang.String> robotsMap,
+			java.lang.String type, java.lang.String typeSettings,
+			boolean hidden, boolean system,
+			java.util.Map<java.util.Locale, java.lang.String> friendlyURLMap,
 			ServiceContext serviceContext)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
@@ -133,15 +132,16 @@ public Layout addLayout(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout addLayout(
+	public com.liferay.portal.kernel.model.Layout addLayout(
 			long groupId, boolean privateLayout, long parentLayoutId,
-			java.util.Map<java.util.Locale, String> localeNamesMap,
-			java.util.Map<java.util.Locale, String> localeTitlesMap,
-			java.util.Map<java.util.Locale, String> descriptionMap,
-			java.util.Map<java.util.Locale, String> keywordsMap,
-			java.util.Map<java.util.Locale, String> robotsMap, String type,
-			String typeSettings, boolean hidden,
-			java.util.Map<java.util.Locale, String> friendlyURLMap,
+			java.util.Map<java.util.Locale, java.lang.String> localeNamesMap,
+			java.util.Map<java.util.Locale, java.lang.String> localeTitlesMap,
+			java.util.Map<java.util.Locale, java.lang.String> descriptionMap,
+			java.util.Map<java.util.Locale, java.lang.String> keywordsMap,
+			java.util.Map<java.util.Locale, java.lang.String> robotsMap,
+			java.lang.String type, java.lang.String typeSettings,
+			boolean hidden,
+			java.util.Map<java.util.Locale, java.lang.String> friendlyURLMap,
 			ServiceContext serviceContext)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
@@ -187,10 +187,11 @@ public Layout addLayout(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout addLayout(
+	public com.liferay.portal.kernel.model.Layout addLayout(
 			long groupId, boolean privateLayout, long parentLayoutId,
-			String name, String title, String description, String type,
-			boolean hidden, String friendlyURL, ServiceContext serviceContext)
+			java.lang.String name, java.lang.String title,
+			java.lang.String description, java.lang.String type, boolean hidden,
+			java.lang.String friendlyURL, ServiceContext serviceContext)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutService.addLayout(
@@ -201,8 +202,9 @@ public Layout addLayout(
 	@Override
 	public com.liferay.portal.kernel.repository.model.FileEntry
 			addTempFileEntry(
-				long groupId, String folderName, String fileName,
-				java.io.InputStream inputStream, String mimeType)
+				long groupId, java.lang.String folderName,
+				java.lang.String fileName, java.io.InputStream inputStream,
+				java.lang.String mimeType)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutService.addTempFileEntry(
@@ -246,7 +248,8 @@ public void deleteLayout(long plid, ServiceContext serviceContext)
 
 	@Override
 	public void deleteTempFileEntry(
-			long groupId, String folderName, String fileName)
+			long groupId, java.lang.String folderName,
+			java.lang.String fileName)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		_layoutService.deleteTempFileEntry(groupId, folderName, fileName);
@@ -260,7 +263,8 @@ public void deleteTempFileEntry(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public java.util.List<Layout> getAncestorLayouts(long plid)
+	public java.util.List<com.liferay.portal.kernel.model.Layout>
+			getAncestorLayouts(long plid)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutService.getAncestorLayouts(plid);
@@ -307,7 +311,7 @@ public long getDefaultPlid(long groupId, boolean privateLayout) {
 	@Override
 	public long getDefaultPlid(
 			long groupId, long scopeGroupId, boolean privateLayout,
-			String portletId)
+			java.lang.String portletId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutService.getDefaultPlid(
@@ -316,7 +320,7 @@ public long getDefaultPlid(
 
 	@Override
 	public long getDefaultPlid(
-			long groupId, long scopeGroupId, String portletId)
+			long groupId, long scopeGroupId, java.lang.String portletId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutService.getDefaultPlid(groupId, scopeGroupId, portletId);
@@ -332,8 +336,8 @@ public long getDefaultPlid(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout getLayoutByUuidAndGroupId(
-			String uuid, long groupId, boolean privateLayout)
+	public com.liferay.portal.kernel.model.Layout getLayoutByUuidAndGroupId(
+			java.lang.String uuid, long groupId, boolean privateLayout)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutService.getLayoutByUuidAndGroupId(
@@ -352,9 +356,9 @@ public Layout getLayoutByUuidAndGroupId(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public String getLayoutName(
+	public java.lang.String getLayoutName(
 			long groupId, boolean privateLayout, long layoutId,
-			String languageId)
+			java.lang.String languageId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutService.getLayoutName(
@@ -371,7 +375,8 @@ public String getLayoutName(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public long getLayoutPlid(String uuid, long groupId, boolean privateLayout)
+	public long getLayoutPlid(
+			java.lang.String uuid, long groupId, boolean privateLayout)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutService.getLayoutPlid(uuid, groupId, privateLayout);
@@ -390,22 +395,23 @@ public long getLayoutPlid(String uuid, long groupId, boolean privateLayout)
 	@Override
 	public com.liferay.portal.kernel.model.LayoutReference[]
 		getLayoutReferences(
-			long companyId, String portletId, String preferencesKey,
-			String preferencesValue) {
+			long companyId, java.lang.String portletId,
+			java.lang.String preferencesKey,
+			java.lang.String preferencesValue) {
 
 		return _layoutService.getLayoutReferences(
 			companyId, portletId, preferencesKey, preferencesValue);
 	}
 
 	@Override
-	public java.util.List<Layout> getLayouts(
+	public java.util.List<com.liferay.portal.kernel.model.Layout> getLayouts(
 		long groupId, boolean privateLayout) {
 
 		return _layoutService.getLayouts(groupId, privateLayout);
 	}
 
 	@Override
-	public java.util.List<Layout> getLayouts(
+	public java.util.List<com.liferay.portal.kernel.model.Layout> getLayouts(
 			long groupId, boolean privateLayout, long parentLayoutId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
@@ -414,7 +420,7 @@ public java.util.List<Layout> getLayouts(
 	}
 
 	@Override
-	public java.util.List<Layout> getLayouts(
+	public java.util.List<com.liferay.portal.kernel.model.Layout> getLayouts(
 			long groupId, boolean privateLayout, long parentLayoutId,
 			boolean incomplete, int start, int end)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -424,21 +430,23 @@ public java.util.List<Layout> getLayouts(
 	}
 
 	@Override
-	public java.util.List<Layout> getLayouts(
-			long groupId, boolean privateLayout, String type)
+	public java.util.List<com.liferay.portal.kernel.model.Layout> getLayouts(
+			long groupId, boolean privateLayout, java.lang.String type)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutService.getLayouts(groupId, privateLayout, type);
 	}
 
 	@Override
-	public java.util.List<Layout> getLayouts(long groupId, String type) {
+	public java.util.List<com.liferay.portal.kernel.model.Layout> getLayouts(
+		long groupId, java.lang.String type) {
+
 		return _layoutService.getLayouts(groupId, type);
 	}
 
 	@Override
-	public java.util.List<Layout> getLayouts(
-		long groupId, String type, int start, int end) {
+	public java.util.List<com.liferay.portal.kernel.model.Layout> getLayouts(
+		long groupId, java.lang.String type, int start, int end) {
 
 		return _layoutService.getLayouts(groupId, type, start, end);
 	}
@@ -466,7 +474,7 @@ public int getLayoutsCount(
 	}
 
 	@Override
-	public int getLayoutsCount(long groupId, String type) {
+	public int getLayoutsCount(long groupId, java.lang.String type) {
 		return _layoutService.getLayoutsCount(groupId, type);
 	}
 
@@ -476,12 +484,13 @@ public int getLayoutsCount(long groupId, String type) {
 	 * @return the OSGi service identifier
 	 */
 	@Override
-	public String getOSGiServiceIdentifier() {
+	public java.lang.String getOSGiServiceIdentifier() {
 		return _layoutService.getOSGiServiceIdentifier();
 	}
 
 	@Override
-	public String[] getTempFileNames(long groupId, String folderName)
+	public java.lang.String[] getTempFileNames(
+			long groupId, java.lang.String folderName)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutService.getTempFileNames(groupId, folderName);
@@ -499,14 +508,15 @@ public String[] getTempFileNames(long groupId, String folderName)
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public boolean hasLayout(String uuid, long groupId, boolean privateLayout)
+	public boolean hasLayout(
+			java.lang.String uuid, long groupId, boolean privateLayout)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutService.hasLayout(uuid, groupId, privateLayout);
 	}
 
 	@Override
-	public boolean hasPortletId(long plid, String portletId)
+	public boolean hasPortletId(long plid, java.lang.String portletId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutService.hasPortletId(plid, portletId);
@@ -536,10 +546,11 @@ public boolean hasPortletId(long plid, String portletId)
 	@Override
 	public void schedulePublishToLive(
 			long sourceGroupId, long targetGroupId, boolean privateLayout,
-			long[] layoutIds, java.util.Map<String, String[]> parameterMap,
-			String groupName, String cronText,
+			long[] layoutIds,
+			java.util.Map<java.lang.String, java.lang.String[]> parameterMap,
+			java.lang.String groupName, java.lang.String cronText,
 			java.util.Date schedulerStartDate, java.util.Date schedulerEndDate,
-			String description)
+			java.lang.String description)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		_layoutService.schedulePublishToLive(
@@ -579,13 +590,15 @@ public void schedulePublishToLive(
 	@Override
 	public void schedulePublishToRemote(
 			long sourceGroupId, boolean privateLayout,
-			java.util.Map<Long, Boolean> layoutIdMap,
-			java.util.Map<String, String[]> parameterMap, String remoteAddress,
-			int remotePort, String remotePathContext, boolean secureConnection,
+			java.util.Map<java.lang.Long, java.lang.Boolean> layoutIdMap,
+			java.util.Map<java.lang.String, java.lang.String[]> parameterMap,
+			java.lang.String remoteAddress, int remotePort,
+			java.lang.String remotePathContext, boolean secureConnection,
 			long remoteGroupId, boolean remotePrivateLayout,
-			java.util.Date startDate, java.util.Date endDate, String groupName,
-			String cronText, java.util.Date schedulerStartDate,
-			java.util.Date schedulerEndDate, String description)
+			java.util.Date startDate, java.util.Date endDate,
+			java.lang.String groupName, java.lang.String cronText,
+			java.util.Date schedulerStartDate, java.util.Date schedulerEndDate,
+			java.lang.String description)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		_layoutService.schedulePublishToRemote(
@@ -628,7 +641,7 @@ public void setLayouts(
 	 */
 	@Override
 	public void unschedulePublishToLive(
-			long groupId, String jobName, String groupName)
+			long groupId, java.lang.String jobName, java.lang.String groupName)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		_layoutService.unschedulePublishToLive(groupId, jobName, groupName);
@@ -646,14 +659,15 @@ public void unschedulePublishToLive(
 	 */
 	@Override
 	public void unschedulePublishToRemote(
-			long groupId, String jobName, String groupName)
+			long groupId, java.lang.String jobName, java.lang.String groupName)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		_layoutService.unschedulePublishToRemote(groupId, jobName, groupName);
 	}
 
 	@Override
-	public Layout updateIconImage(long plid, byte[] bytes)
+	public com.liferay.portal.kernel.model.Layout updateIconImage(
+			long plid, byte[] bytes)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutService.updateIconImage(plid, bytes);
@@ -689,16 +703,16 @@ public Layout updateIconImage(long plid, byte[] bytes)
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout updateLayout(
+	public com.liferay.portal.kernel.model.Layout updateLayout(
 			long groupId, boolean privateLayout, long layoutId,
 			long parentLayoutId,
-			java.util.Map<java.util.Locale, String> localeNamesMap,
-			java.util.Map<java.util.Locale, String> localeTitlesMap,
-			java.util.Map<java.util.Locale, String> descriptionMap,
-			java.util.Map<java.util.Locale, String> keywordsMap,
-			java.util.Map<java.util.Locale, String> robotsMap, String type,
-			boolean hidden,
-			java.util.Map<java.util.Locale, String> friendlyURLMap,
+			java.util.Map<java.util.Locale, java.lang.String> localeNamesMap,
+			java.util.Map<java.util.Locale, java.lang.String> localeTitlesMap,
+			java.util.Map<java.util.Locale, java.lang.String> descriptionMap,
+			java.util.Map<java.util.Locale, java.lang.String> keywordsMap,
+			java.util.Map<java.util.Locale, java.lang.String> robotsMap,
+			java.lang.String type, boolean hidden,
+			java.util.Map<java.util.Locale, java.lang.String> friendlyURLMap,
 			boolean hasIconImage, byte[] iconBytes,
 			ServiceContext serviceContext)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -722,9 +736,9 @@ public Layout updateLayout(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout updateLayout(
+	public com.liferay.portal.kernel.model.Layout updateLayout(
 			long groupId, boolean privateLayout, long layoutId,
-			String typeSettings)
+			java.lang.String typeSettings)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutService.updateLayout(
@@ -744,9 +758,10 @@ public Layout updateLayout(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout updateLookAndFeel(
-			long groupId, boolean privateLayout, long layoutId, String themeId,
-			String colorSchemeId, String css)
+	public com.liferay.portal.kernel.model.Layout updateLookAndFeel(
+			long groupId, boolean privateLayout, long layoutId,
+			java.lang.String themeId, java.lang.String colorSchemeId,
+			java.lang.String css)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutService.updateLookAndFeel(
@@ -767,9 +782,9 @@ public Layout updateLookAndFeel(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout updateName(
-			long groupId, boolean privateLayout, long layoutId, String name,
-			String languageId)
+	public com.liferay.portal.kernel.model.Layout updateName(
+			long groupId, boolean privateLayout, long layoutId,
+			java.lang.String name, java.lang.String languageId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutService.updateName(
@@ -787,7 +802,8 @@ public Layout updateName(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout updateName(long plid, String name, String languageId)
+	public com.liferay.portal.kernel.model.Layout updateName(
+			long plid, java.lang.String name, java.lang.String languageId)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutService.updateName(plid, name, languageId);
@@ -805,7 +821,7 @@ public Layout updateName(long plid, String name, String languageId)
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout updateParentLayoutId(
+	public com.liferay.portal.kernel.model.Layout updateParentLayoutId(
 			long groupId, boolean privateLayout, long layoutId,
 			long parentLayoutId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -826,7 +842,8 @@ public Layout updateParentLayoutId(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout updateParentLayoutId(long plid, long parentPlid)
+	public com.liferay.portal.kernel.model.Layout updateParentLayoutId(
+			long plid, long parentPlid)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutService.updateParentLayoutId(plid, parentPlid);
@@ -842,8 +859,9 @@ public Layout updateParentLayoutId(long plid, long parentPlid)
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout updateParentLayoutIdAndPriority(
-			long plid, long parentPlid, int priority)
+	public com.liferay.portal.kernel.model.Layout
+			updateParentLayoutIdAndPriority(
+				long plid, long parentPlid, int priority)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutService.updateParentLayoutIdAndPriority(
@@ -862,7 +880,7 @@ public Layout updateParentLayoutIdAndPriority(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout updatePriority(
+	public com.liferay.portal.kernel.model.Layout updatePriority(
 			long groupId, boolean privateLayout, long layoutId, int priority)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
@@ -884,7 +902,7 @@ public Layout updatePriority(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout updatePriority(
+	public com.liferay.portal.kernel.model.Layout updatePriority(
 			long groupId, boolean privateLayout, long layoutId,
 			long nextLayoutId, long previousLayoutId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -902,14 +920,16 @@ public Layout updatePriority(
 	 * @throws PortalException if a portal exception occurred
 	 */
 	@Override
-	public Layout updatePriority(long plid, int priority)
+	public com.liferay.portal.kernel.model.Layout updatePriority(
+			long plid, int priority)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutService.updatePriority(plid, priority);
 	}
 
 	@Override
-	public Layout updateType(long plid, String type)
+	public com.liferay.portal.kernel.model.Layout updateType(
+			long plid, java.lang.String type)
 		throws com.liferay.portal.kernel.exception.PortalException {
 
 		return _layoutService.updateType(plid, type);
diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/LayoutSetLocalService.java b/portal-kernel/src/com/liferay/portal/kernel/service/LayoutSetLocalService.java
index 04ca52340a3063..54621815223ed8 100644
--- a/portal-kernel/src/com/liferay/portal/kernel/service/LayoutSetLocalService.java
+++ b/portal-kernel/src/com/liferay/portal/kernel/service/LayoutSetLocalService.java
@@ -34,6 +34,7 @@
 import java.io.Serializable;
 
 import java.util.List;
+import java.util.TreeMap;
 
 import org.osgi.annotation.versioning.ProviderType;
 
@@ -312,8 +313,18 @@ public LayoutSet updateSettings(
 			long groupId, boolean privateLayout, String settings)
 		throws PortalException;
 
+	/**
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 #updateVirtualHosts(long, boolean, TreeMap)}
+	 */
+	@Deprecated
 	public LayoutSet updateVirtualHost(
 			long groupId, boolean privateLayout, String virtualHostname)
 		throws PortalException;
 
+	public LayoutSet updateVirtualHosts(
+			long groupId, boolean privateLayout,
+			TreeMap<String, String> virtualHostnames)
+		throws PortalException;
+
 }
\ No newline at end of file
diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/LayoutSetLocalServiceUtil.java b/portal-kernel/src/com/liferay/portal/kernel/service/LayoutSetLocalServiceUtil.java
index 15c0ff301b2aae..f273f0790963cd 100644
--- a/portal-kernel/src/com/liferay/portal/kernel/service/LayoutSetLocalServiceUtil.java
+++ b/portal-kernel/src/com/liferay/portal/kernel/service/LayoutSetLocalServiceUtil.java
@@ -403,6 +403,11 @@ public static com.liferay.portal.kernel.model.LayoutSet updateSettings(
 		return getService().updateSettings(groupId, privateLayout, settings);
 	}
 
+	/**
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 #updateVirtualHosts(long, boolean, TreeMap)}
+	 */
+	@Deprecated
 	public static com.liferay.portal.kernel.model.LayoutSet updateVirtualHost(
 			long groupId, boolean privateLayout, String virtualHostname)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -411,6 +416,15 @@ public static com.liferay.portal.kernel.model.LayoutSet updateVirtualHost(
 			groupId, privateLayout, virtualHostname);
 	}
 
+	public static com.liferay.portal.kernel.model.LayoutSet updateVirtualHosts(
+			long groupId, boolean privateLayout,
+			java.util.TreeMap<String, String> virtualHostnames)
+		throws com.liferay.portal.kernel.exception.PortalException {
+
+		return getService().updateVirtualHosts(
+			groupId, privateLayout, virtualHostnames);
+	}
+
 	public static LayoutSetLocalService getService() {
 		if (_service == null) {
 			_service = (LayoutSetLocalService)PortalBeanLocatorUtil.locate(
diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/LayoutSetLocalServiceWrapper.java b/portal-kernel/src/com/liferay/portal/kernel/service/LayoutSetLocalServiceWrapper.java
index ba64ca6468d276..ba24be8e71a0a9 100644
--- a/portal-kernel/src/com/liferay/portal/kernel/service/LayoutSetLocalServiceWrapper.java
+++ b/portal-kernel/src/com/liferay/portal/kernel/service/LayoutSetLocalServiceWrapper.java
@@ -440,6 +440,11 @@ public com.liferay.portal.kernel.model.LayoutSet updateSettings(
 			groupId, privateLayout, settings);
 	}
 
+	/**
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 #updateVirtualHosts(long, boolean, TreeMap)}
+	 */
+	@Deprecated
 	@Override
 	public com.liferay.portal.kernel.model.LayoutSet updateVirtualHost(
 			long groupId, boolean privateLayout,
@@ -450,6 +455,17 @@ public com.liferay.portal.kernel.model.LayoutSet updateVirtualHost(
 			groupId, privateLayout, virtualHostname);
 	}
 
+	@Override
+	public com.liferay.portal.kernel.model.LayoutSet updateVirtualHosts(
+			long groupId, boolean privateLayout,
+			java.util.TreeMap<java.lang.String, java.lang.String>
+				virtualHostnames)
+		throws com.liferay.portal.kernel.exception.PortalException {
+
+		return _layoutSetLocalService.updateVirtualHosts(
+			groupId, privateLayout, virtualHostnames);
+	}
+
 	@Override
 	public LayoutSetLocalService getWrappedService() {
 		return _layoutSetLocalService;
diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/LayoutSetService.java b/portal-kernel/src/com/liferay/portal/kernel/service/LayoutSetService.java
index 5917105240d3b4..00b3c94f8038ff 100644
--- a/portal-kernel/src/com/liferay/portal/kernel/service/LayoutSetService.java
+++ b/portal-kernel/src/com/liferay/portal/kernel/service/LayoutSetService.java
@@ -25,6 +25,8 @@
 import java.io.File;
 import java.io.InputStream;
 
+import java.util.TreeMap;
+
 import org.osgi.annotation.versioning.ProviderType;
 
 /**
@@ -109,8 +111,18 @@ public LayoutSet updateSettings(
 			long groupId, boolean privateLayout, String settings)
 		throws PortalException;
 
+	/**
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 #updateVirtualHosts(long, boolean, TreeMap)}
+	 */
+	@Deprecated
 	public LayoutSet updateVirtualHost(
 			long groupId, boolean privateLayout, String virtualHost)
 		throws PortalException;
 
+	public LayoutSet updateVirtualHosts(
+			long groupId, boolean privateLayout,
+			TreeMap<String, String> virtualHostnames)
+		throws PortalException;
+
 }
\ No newline at end of file
diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/LayoutSetServiceUtil.java b/portal-kernel/src/com/liferay/portal/kernel/service/LayoutSetServiceUtil.java
index 91642aeda64050..e7795a10d89f06 100644
--- a/portal-kernel/src/com/liferay/portal/kernel/service/LayoutSetServiceUtil.java
+++ b/portal-kernel/src/com/liferay/portal/kernel/service/LayoutSetServiceUtil.java
@@ -122,6 +122,11 @@ public static com.liferay.portal.kernel.model.LayoutSet updateSettings(
 		return getService().updateSettings(groupId, privateLayout, settings);
 	}
 
+	/**
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 #updateVirtualHosts(long, boolean, TreeMap)}
+	 */
+	@Deprecated
 	public static com.liferay.portal.kernel.model.LayoutSet updateVirtualHost(
 			long groupId, boolean privateLayout, String virtualHost)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -130,6 +135,15 @@ public static com.liferay.portal.kernel.model.LayoutSet updateVirtualHost(
 			groupId, privateLayout, virtualHost);
 	}
 
+	public static com.liferay.portal.kernel.model.LayoutSet updateVirtualHosts(
+			long groupId, boolean privateLayout,
+			java.util.TreeMap<String, String> virtualHostnames)
+		throws com.liferay.portal.kernel.exception.PortalException {
+
+		return getService().updateVirtualHosts(
+			groupId, privateLayout, virtualHostnames);
+	}
+
 	public static LayoutSetService getService() {
 		if (_service == null) {
 			_service = (LayoutSetService)PortalBeanLocatorUtil.locate(
diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/LayoutSetServiceWrapper.java b/portal-kernel/src/com/liferay/portal/kernel/service/LayoutSetServiceWrapper.java
index 50cd58e81f5bd8..63c4ea4f75f279 100644
--- a/portal-kernel/src/com/liferay/portal/kernel/service/LayoutSetServiceWrapper.java
+++ b/portal-kernel/src/com/liferay/portal/kernel/service/LayoutSetServiceWrapper.java
@@ -124,6 +124,11 @@ public com.liferay.portal.kernel.model.LayoutSet updateSettings(
 			groupId, privateLayout, settings);
 	}
 
+	/**
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 #updateVirtualHosts(long, boolean, TreeMap)}
+	 */
+	@Deprecated
 	@Override
 	public com.liferay.portal.kernel.model.LayoutSet updateVirtualHost(
 			long groupId, boolean privateLayout, java.lang.String virtualHost)
@@ -133,6 +138,17 @@ public com.liferay.portal.kernel.model.LayoutSet updateVirtualHost(
 			groupId, privateLayout, virtualHost);
 	}
 
+	@Override
+	public com.liferay.portal.kernel.model.LayoutSet updateVirtualHosts(
+			long groupId, boolean privateLayout,
+			java.util.TreeMap<java.lang.String, java.lang.String>
+				virtualHostnames)
+		throws com.liferay.portal.kernel.exception.PortalException {
+
+		return _layoutSetService.updateVirtualHosts(
+			groupId, privateLayout, virtualHostnames);
+	}
+
 	@Override
 	public LayoutSetService getWrappedService() {
 		return _layoutSetService;
diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/VirtualHostLocalService.java b/portal-kernel/src/com/liferay/portal/kernel/service/VirtualHostLocalService.java
index 328a9da2ca1d5a..6f71ed17a343be 100644
--- a/portal-kernel/src/com/liferay/portal/kernel/service/VirtualHostLocalService.java
+++ b/portal-kernel/src/com/liferay/portal/kernel/service/VirtualHostLocalService.java
@@ -32,6 +32,7 @@
 import java.io.Serializable;
 
 import java.util.List;
+import java.util.TreeMap;
 
 import org.osgi.annotation.versioning.ProviderType;
 
@@ -173,6 +174,11 @@ public long dynamicQueryCount(
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public VirtualHost fetchVirtualHost(long virtualHostId);
 
+	/**
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 #getVirtualHosts(long, long)}
+	 */
+	@Deprecated
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public VirtualHost fetchVirtualHost(long companyId, long layoutSetId);
 
@@ -208,6 +214,11 @@ public PersistedModel getPersistedModel(Serializable primaryKeyObj)
 	public VirtualHost getVirtualHost(long virtualHostId)
 		throws PortalException;
 
+	/**
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 #getVirtualHosts(long, long)}
+	 */
+	@Deprecated
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public VirtualHost getVirtualHost(long companyId, long layoutSetId)
 		throws PortalException;
@@ -229,6 +240,10 @@ public VirtualHost getVirtualHost(long companyId, long layoutSetId)
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public List<VirtualHost> getVirtualHosts(int start, int end);
 
+	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
+	public List<VirtualHost> getVirtualHosts(long companyId, long layoutSetId)
+		throws PortalException;
+
 	/**
 	 * Returns the number of virtual hosts.
 	 *
@@ -237,6 +252,11 @@ public VirtualHost getVirtualHost(long companyId, long layoutSetId)
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public int getVirtualHostsCount();
 
+	/**
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 #updateVirtualHosts(long, long, TreeMap)}
+	 */
+	@Deprecated
 	public VirtualHost updateVirtualHost(
 		long companyId, long layoutSetId, String hostname);
 
@@ -249,4 +269,7 @@ public VirtualHost updateVirtualHost(
 	@Indexable(type = IndexableType.REINDEX)
 	public VirtualHost updateVirtualHost(VirtualHost virtualHost);
 
+	public List<VirtualHost> updateVirtualHosts(
+		long companyId, long layoutSetId, TreeMap<String, String> hostnameMap);
+
 }
\ No newline at end of file
diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/VirtualHostLocalServiceUtil.java b/portal-kernel/src/com/liferay/portal/kernel/service/VirtualHostLocalServiceUtil.java
index 61a22e766432de..ff828c7de54318 100644
--- a/portal-kernel/src/com/liferay/portal/kernel/service/VirtualHostLocalServiceUtil.java
+++ b/portal-kernel/src/com/liferay/portal/kernel/service/VirtualHostLocalServiceUtil.java
@@ -188,6 +188,11 @@ public static com.liferay.portal.kernel.model.VirtualHost fetchVirtualHost(
 		return getService().fetchVirtualHost(virtualHostId);
 	}
 
+	/**
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 #getVirtualHosts(long, long)}
+	 */
+	@Deprecated
 	public static com.liferay.portal.kernel.model.VirtualHost fetchVirtualHost(
 		long companyId, long layoutSetId) {
 
@@ -243,6 +248,11 @@ public static com.liferay.portal.kernel.model.VirtualHost getVirtualHost(
 		return getService().getVirtualHost(virtualHostId);
 	}
 
+	/**
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 #getVirtualHosts(long, long)}
+	 */
+	@Deprecated
 	public static com.liferay.portal.kernel.model.VirtualHost getVirtualHost(
 			long companyId, long layoutSetId)
 		throws com.liferay.portal.kernel.exception.PortalException {
@@ -274,6 +284,13 @@ public static com.liferay.portal.kernel.model.VirtualHost getVirtualHost(
 		return getService().getVirtualHosts(start, end);
 	}
 
+	public static java.util.List<com.liferay.portal.kernel.model.VirtualHost>
+			getVirtualHosts(long companyId, long layoutSetId)
+		throws com.liferay.portal.kernel.exception.PortalException {
+
+		return getService().getVirtualHosts(companyId, layoutSetId);
+	}
+
 	/**
 	 * Returns the number of virtual hosts.
 	 *
@@ -283,6 +300,11 @@ public static int getVirtualHostsCount() {
 		return getService().getVirtualHostsCount();
 	}
 
+	/**
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 #updateVirtualHosts(long, long, TreeMap)}
+	 */
+	@Deprecated
 	public static com.liferay.portal.kernel.model.VirtualHost updateVirtualHost(
 		long companyId, long layoutSetId, String hostname) {
 
@@ -301,6 +323,15 @@ public static com.liferay.portal.kernel.model.VirtualHost updateVirtualHost(
 		return getService().updateVirtualHost(virtualHost);
 	}
 
+	public static java.util.List<com.liferay.portal.kernel.model.VirtualHost>
+		updateVirtualHosts(
+			long companyId, long layoutSetId,
+			java.util.TreeMap<String, String> hostnameMap) {
+
+		return getService().updateVirtualHosts(
+			companyId, layoutSetId, hostnameMap);
+	}
+
 	public static VirtualHostLocalService getService() {
 		if (_service == null) {
 			_service = (VirtualHostLocalService)PortalBeanLocatorUtil.locate(
diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/VirtualHostLocalServiceWrapper.java b/portal-kernel/src/com/liferay/portal/kernel/service/VirtualHostLocalServiceWrapper.java
index 3896862e1c2799..d8ea5bf5495fbb 100644
--- a/portal-kernel/src/com/liferay/portal/kernel/service/VirtualHostLocalServiceWrapper.java
+++ b/portal-kernel/src/com/liferay/portal/kernel/service/VirtualHostLocalServiceWrapper.java
@@ -193,6 +193,11 @@ public com.liferay.portal.kernel.model.VirtualHost fetchVirtualHost(
 		return _virtualHostLocalService.fetchVirtualHost(virtualHostId);
 	}
 
+	/**
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 #getVirtualHosts(long, long)}
+	 */
+	@Deprecated
 	@Override
 	public com.liferay.portal.kernel.model.VirtualHost fetchVirtualHost(
 		long companyId, long layoutSetId) {
@@ -255,6 +260,11 @@ public com.liferay.portal.kernel.model.VirtualHost getVirtualHost(
 		return _virtualHostLocalService.getVirtualHost(virtualHostId);
 	}
 
+	/**
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 #getVirtualHosts(long, long)}
+	 */
+	@Deprecated
 	@Override
 	public com.liferay.portal.kernel.model.VirtualHost getVirtualHost(
 			long companyId, long layoutSetId)
@@ -289,6 +299,14 @@ public com.liferay.portal.kernel.model.VirtualHost getVirtualHost(
 		return _virtualHostLocalService.getVirtualHosts(start, end);
 	}
 
+	@Override
+	public java.util.List<com.liferay.portal.kernel.model.VirtualHost>
+			getVirtualHosts(long companyId, long layoutSetId)
+		throws com.liferay.portal.kernel.exception.PortalException {
+
+		return _virtualHostLocalService.getVirtualHosts(companyId, layoutSetId);
+	}
+
 	/**
 	 * Returns the number of virtual hosts.
 	 *
@@ -299,6 +317,11 @@ public int getVirtualHostsCount() {
 		return _virtualHostLocalService.getVirtualHostsCount();
 	}
 
+	/**
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 #updateVirtualHosts(long, long, TreeMap)}
+	 */
+	@Deprecated
 	@Override
 	public com.liferay.portal.kernel.model.VirtualHost updateVirtualHost(
 		long companyId, long layoutSetId, java.lang.String hostname) {
@@ -320,6 +343,16 @@ public com.liferay.portal.kernel.model.VirtualHost updateVirtualHost(
 		return _virtualHostLocalService.updateVirtualHost(virtualHost);
 	}
 
+	@Override
+	public java.util.List<com.liferay.portal.kernel.model.VirtualHost>
+		updateVirtualHosts(
+			long companyId, long layoutSetId,
+			java.util.TreeMap<java.lang.String, java.lang.String> hostnameMap) {
+
+		return _virtualHostLocalService.updateVirtualHosts(
+			companyId, layoutSetId, hostnameMap);
+	}
+
 	@Override
 	public VirtualHostLocalService getWrappedService() {
 		return _virtualHostLocalService;
diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/LayoutPersistence.java b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/LayoutPersistence.java
index 62f1053b50fe40..fbe0d8e97d7a44 100644
--- a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/LayoutPersistence.java
+++ b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/LayoutPersistence.java
@@ -16,7 +16,6 @@
 
 import com.liferay.portal.kernel.exception.NoSuchLayoutException;
 import com.liferay.portal.kernel.model.Layout;
-import com.liferay.portal.kernel.service.persistence.change.tracking.CTPersistence;
 
 import org.osgi.annotation.versioning.ProviderType;
 
@@ -32,8 +31,7 @@
  * @generated
  */
 @ProviderType
-public interface LayoutPersistence
-	extends BasePersistence<Layout>, CTPersistence<Layout> {
+public interface LayoutPersistence extends BasePersistence<Layout> {
 
 	/**
 	 * NOTE FOR DEVELOPERS:
@@ -397,150 +395,6 @@ public Layout[] findByUuid_C_PrevAndNext(
 	 */
 	public int countByUuid_C(String uuid, long companyId);
 
-	/**
-	 * Returns all the layouts where ctCollectionId = &#63;.
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 * @return the matching layouts
-	 */
-	@Override
-	public java.util.List<Layout> findByCTCollectionId(long ctCollectionId);
-
-	/**
-	 * Returns a range of all the layouts where ctCollectionId = &#63;.
-	 *
-	 * <p>
-	 * Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to <code>QueryUtil#ALL_POS</code> will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not <code>QueryUtil#ALL_POS</code>), then the query will include the default ORDER BY logic from <code>LayoutModelImpl</code>. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
-	 * </p>
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 * @param start the lower bound of the range of layouts
-	 * @param end the upper bound of the range of layouts (not inclusive)
-	 * @return the range of matching layouts
-	 */
-	public java.util.List<Layout> findByCTCollectionId(
-		long ctCollectionId, int start, int end);
-
-	/**
-	 * Returns an ordered range of all the layouts where ctCollectionId = &#63;.
-	 *
-	 * <p>
-	 * Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to <code>QueryUtil#ALL_POS</code> will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not <code>QueryUtil#ALL_POS</code>), then the query will include the default ORDER BY logic from <code>LayoutModelImpl</code>. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
-	 * </p>
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 * @param start the lower bound of the range of layouts
-	 * @param end the upper bound of the range of layouts (not inclusive)
-	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
-	 * @return the ordered range of matching layouts
-	 */
-	public java.util.List<Layout> findByCTCollectionId(
-		long ctCollectionId, int start, int end,
-		com.liferay.portal.kernel.util.OrderByComparator<Layout>
-			orderByComparator);
-
-	/**
-	 * Returns an ordered range of all the layouts where ctCollectionId = &#63;.
-	 *
-	 * <p>
-	 * Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to <code>QueryUtil#ALL_POS</code> will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not <code>QueryUtil#ALL_POS</code>), then the query will include the default ORDER BY logic from <code>LayoutModelImpl</code>. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
-	 * </p>
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 * @param start the lower bound of the range of layouts
-	 * @param end the upper bound of the range of layouts (not inclusive)
-	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
-	 * @param useFinderCache whether to use the finder cache
-	 * @return the ordered range of matching layouts
-	 */
-	public java.util.List<Layout> findByCTCollectionId(
-		long ctCollectionId, int start, int end,
-		com.liferay.portal.kernel.util.OrderByComparator<Layout>
-			orderByComparator,
-		boolean useFinderCache);
-
-	/**
-	 * Returns the first layout in the ordered set where ctCollectionId = &#63;.
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
-	 * @return the first matching layout
-	 * @throws NoSuchLayoutException if a matching layout could not be found
-	 */
-	public Layout findByCTCollectionId_First(
-			long ctCollectionId,
-			com.liferay.portal.kernel.util.OrderByComparator<Layout>
-				orderByComparator)
-		throws NoSuchLayoutException;
-
-	/**
-	 * Returns the first layout in the ordered set where ctCollectionId = &#63;.
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
-	 * @return the first matching layout, or <code>null</code> if a matching layout could not be found
-	 */
-	public Layout fetchByCTCollectionId_First(
-		long ctCollectionId,
-		com.liferay.portal.kernel.util.OrderByComparator<Layout>
-			orderByComparator);
-
-	/**
-	 * Returns the last layout in the ordered set where ctCollectionId = &#63;.
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
-	 * @return the last matching layout
-	 * @throws NoSuchLayoutException if a matching layout could not be found
-	 */
-	public Layout findByCTCollectionId_Last(
-			long ctCollectionId,
-			com.liferay.portal.kernel.util.OrderByComparator<Layout>
-				orderByComparator)
-		throws NoSuchLayoutException;
-
-	/**
-	 * Returns the last layout in the ordered set where ctCollectionId = &#63;.
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
-	 * @return the last matching layout, or <code>null</code> if a matching layout could not be found
-	 */
-	public Layout fetchByCTCollectionId_Last(
-		long ctCollectionId,
-		com.liferay.portal.kernel.util.OrderByComparator<Layout>
-			orderByComparator);
-
-	/**
-	 * Returns the layouts before and after the current layout in the ordered set where ctCollectionId = &#63;.
-	 *
-	 * @param plid the primary key of the current layout
-	 * @param ctCollectionId the ct collection ID
-	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
-	 * @return the previous, current, and next layout
-	 * @throws NoSuchLayoutException if a layout with the primary key could not be found
-	 */
-	public Layout[] findByCTCollectionId_PrevAndNext(
-			long plid, long ctCollectionId,
-			com.liferay.portal.kernel.util.OrderByComparator<Layout>
-				orderByComparator)
-		throws NoSuchLayoutException;
-
-	/**
-	 * Removes all the layouts where ctCollectionId = &#63; from the database.
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 */
-	public void removeByCTCollectionId(long ctCollectionId);
-
-	/**
-	 * Returns the number of layouts where ctCollectionId = &#63;.
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 * @return the number of matching layouts
-	 */
-	public int countByCTCollectionId(long ctCollectionId);
-
 	/**
 	 * Returns all the layouts where groupId = &#63;.
 	 *
diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/LayoutUtil.java b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/LayoutUtil.java
index 4a1af6e177eadd..72646a55e57a01 100644
--- a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/LayoutUtil.java
+++ b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/LayoutUtil.java
@@ -535,175 +535,6 @@ public static int countByUuid_C(String uuid, long companyId) {
 		return getPersistence().countByUuid_C(uuid, companyId);
 	}
 
-	/**
-	 * Returns all the layouts where ctCollectionId = &#63;.
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 * @return the matching layouts
-	 */
-	public static List<Layout> findByCTCollectionId(long ctCollectionId) {
-		return getPersistence().findByCTCollectionId(ctCollectionId);
-	}
-
-	/**
-	 * Returns a range of all the layouts where ctCollectionId = &#63;.
-	 *
-	 * <p>
-	 * Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to <code>QueryUtil#ALL_POS</code> will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not <code>QueryUtil#ALL_POS</code>), then the query will include the default ORDER BY logic from <code>LayoutModelImpl</code>. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
-	 * </p>
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 * @param start the lower bound of the range of layouts
-	 * @param end the upper bound of the range of layouts (not inclusive)
-	 * @return the range of matching layouts
-	 */
-	public static List<Layout> findByCTCollectionId(
-		long ctCollectionId, int start, int end) {
-
-		return getPersistence().findByCTCollectionId(
-			ctCollectionId, start, end);
-	}
-
-	/**
-	 * Returns an ordered range of all the layouts where ctCollectionId = &#63;.
-	 *
-	 * <p>
-	 * Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to <code>QueryUtil#ALL_POS</code> will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not <code>QueryUtil#ALL_POS</code>), then the query will include the default ORDER BY logic from <code>LayoutModelImpl</code>. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
-	 * </p>
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 * @param start the lower bound of the range of layouts
-	 * @param end the upper bound of the range of layouts (not inclusive)
-	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
-	 * @return the ordered range of matching layouts
-	 */
-	public static List<Layout> findByCTCollectionId(
-		long ctCollectionId, int start, int end,
-		OrderByComparator<Layout> orderByComparator) {
-
-		return getPersistence().findByCTCollectionId(
-			ctCollectionId, start, end, orderByComparator);
-	}
-
-	/**
-	 * Returns an ordered range of all the layouts where ctCollectionId = &#63;.
-	 *
-	 * <p>
-	 * Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to <code>QueryUtil#ALL_POS</code> will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not <code>QueryUtil#ALL_POS</code>), then the query will include the default ORDER BY logic from <code>LayoutModelImpl</code>. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
-	 * </p>
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 * @param start the lower bound of the range of layouts
-	 * @param end the upper bound of the range of layouts (not inclusive)
-	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
-	 * @param useFinderCache whether to use the finder cache
-	 * @return the ordered range of matching layouts
-	 */
-	public static List<Layout> findByCTCollectionId(
-		long ctCollectionId, int start, int end,
-		OrderByComparator<Layout> orderByComparator, boolean useFinderCache) {
-
-		return getPersistence().findByCTCollectionId(
-			ctCollectionId, start, end, orderByComparator, useFinderCache);
-	}
-
-	/**
-	 * Returns the first layout in the ordered set where ctCollectionId = &#63;.
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
-	 * @return the first matching layout
-	 * @throws NoSuchLayoutException if a matching layout could not be found
-	 */
-	public static Layout findByCTCollectionId_First(
-			long ctCollectionId, OrderByComparator<Layout> orderByComparator)
-		throws com.liferay.portal.kernel.exception.NoSuchLayoutException {
-
-		return getPersistence().findByCTCollectionId_First(
-			ctCollectionId, orderByComparator);
-	}
-
-	/**
-	 * Returns the first layout in the ordered set where ctCollectionId = &#63;.
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
-	 * @return the first matching layout, or <code>null</code> if a matching layout could not be found
-	 */
-	public static Layout fetchByCTCollectionId_First(
-		long ctCollectionId, OrderByComparator<Layout> orderByComparator) {
-
-		return getPersistence().fetchByCTCollectionId_First(
-			ctCollectionId, orderByComparator);
-	}
-
-	/**
-	 * Returns the last layout in the ordered set where ctCollectionId = &#63;.
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
-	 * @return the last matching layout
-	 * @throws NoSuchLayoutException if a matching layout could not be found
-	 */
-	public static Layout findByCTCollectionId_Last(
-			long ctCollectionId, OrderByComparator<Layout> orderByComparator)
-		throws com.liferay.portal.kernel.exception.NoSuchLayoutException {
-
-		return getPersistence().findByCTCollectionId_Last(
-			ctCollectionId, orderByComparator);
-	}
-
-	/**
-	 * Returns the last layout in the ordered set where ctCollectionId = &#63;.
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
-	 * @return the last matching layout, or <code>null</code> if a matching layout could not be found
-	 */
-	public static Layout fetchByCTCollectionId_Last(
-		long ctCollectionId, OrderByComparator<Layout> orderByComparator) {
-
-		return getPersistence().fetchByCTCollectionId_Last(
-			ctCollectionId, orderByComparator);
-	}
-
-	/**
-	 * Returns the layouts before and after the current layout in the ordered set where ctCollectionId = &#63;.
-	 *
-	 * @param plid the primary key of the current layout
-	 * @param ctCollectionId the ct collection ID
-	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
-	 * @return the previous, current, and next layout
-	 * @throws NoSuchLayoutException if a layout with the primary key could not be found
-	 */
-	public static Layout[] findByCTCollectionId_PrevAndNext(
-			long plid, long ctCollectionId,
-			OrderByComparator<Layout> orderByComparator)
-		throws com.liferay.portal.kernel.exception.NoSuchLayoutException {
-
-		return getPersistence().findByCTCollectionId_PrevAndNext(
-			plid, ctCollectionId, orderByComparator);
-	}
-
-	/**
-	 * Removes all the layouts where ctCollectionId = &#63; from the database.
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 */
-	public static void removeByCTCollectionId(long ctCollectionId) {
-		getPersistence().removeByCTCollectionId(ctCollectionId);
-	}
-
-	/**
-	 * Returns the number of layouts where ctCollectionId = &#63;.
-	 *
-	 * @param ctCollectionId the ct collection ID
-	 * @return the number of matching layouts
-	 */
-	public static int countByCTCollectionId(long ctCollectionId) {
-		return getPersistence().countByCTCollectionId(ctCollectionId);
-	}
-
 	/**
 	 * Returns all the layouts where groupId = &#63;.
 	 *
diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/VirtualHostPersistence.java b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/VirtualHostPersistence.java
index a736b929e085b6..27b25b7812b601 100644
--- a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/VirtualHostPersistence.java
+++ b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/VirtualHostPersistence.java
@@ -84,54 +84,219 @@ public VirtualHost removeByHostname(String hostname)
 	public int countByHostname(String hostname);
 
 	/**
-	 * Returns the virtual host where companyId = &#63; and layoutSetId = &#63; or throws a <code>NoSuchVirtualHostException</code> if it could not be found.
+	 * Returns all the virtual hosts where companyId = &#63; and layoutSetId = &#63;.
 	 *
 	 * @param companyId the company ID
 	 * @param layoutSetId the layout set ID
+	 * @return the matching virtual hosts
+	 */
+	public java.util.List<VirtualHost> findByC_L(
+		long companyId, long layoutSetId);
+
+	/**
+	 * Returns a range of all the virtual hosts where companyId = &#63; and layoutSetId = &#63;.
+	 *
+	 * <p>
+	 * Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to <code>QueryUtil#ALL_POS</code> will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not <code>QueryUtil#ALL_POS</code>), then the query will include the default ORDER BY logic from <code>VirtualHostModelImpl</code>. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	 * </p>
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @param start the lower bound of the range of virtual hosts
+	 * @param end the upper bound of the range of virtual hosts (not inclusive)
+	 * @return the range of matching virtual hosts
+	 */
+	public java.util.List<VirtualHost> findByC_L(
+		long companyId, long layoutSetId, int start, int end);
+
+	/**
+	 * Returns an ordered range of all the virtual hosts where companyId = &#63; and layoutSetId = &#63;.
+	 *
+	 * <p>
+	 * Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to <code>QueryUtil#ALL_POS</code> will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not <code>QueryUtil#ALL_POS</code>), then the query will include the default ORDER BY logic from <code>VirtualHostModelImpl</code>. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	 * </p>
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @param start the lower bound of the range of virtual hosts
+	 * @param end the upper bound of the range of virtual hosts (not inclusive)
+	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
+	 * @return the ordered range of matching virtual hosts
+	 */
+	public java.util.List<VirtualHost> findByC_L(
+		long companyId, long layoutSetId, int start, int end,
+		com.liferay.portal.kernel.util.OrderByComparator<VirtualHost>
+			orderByComparator);
+
+	/**
+	 * Returns an ordered range of all the virtual hosts where companyId = &#63; and layoutSetId = &#63;.
+	 *
+	 * <p>
+	 * Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to <code>QueryUtil#ALL_POS</code> will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not <code>QueryUtil#ALL_POS</code>), then the query will include the default ORDER BY logic from <code>VirtualHostModelImpl</code>. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	 * </p>
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @param start the lower bound of the range of virtual hosts
+	 * @param end the upper bound of the range of virtual hosts (not inclusive)
+	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
+	 * @param useFinderCache whether to use the finder cache
+	 * @return the ordered range of matching virtual hosts
+	 */
+	public java.util.List<VirtualHost> findByC_L(
+		long companyId, long layoutSetId, int start, int end,
+		com.liferay.portal.kernel.util.OrderByComparator<VirtualHost>
+			orderByComparator,
+		boolean useFinderCache);
+
+	/**
+	 * Returns the first virtual host in the ordered set where companyId = &#63; and layoutSetId = &#63;.
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	 * @return the first matching virtual host
+	 * @throws NoSuchVirtualHostException if a matching virtual host could not be found
+	 */
+	public VirtualHost findByC_L_First(
+			long companyId, long layoutSetId,
+			com.liferay.portal.kernel.util.OrderByComparator<VirtualHost>
+				orderByComparator)
+		throws NoSuchVirtualHostException;
+
+	/**
+	 * Returns the first virtual host in the ordered set where companyId = &#63; and layoutSetId = &#63;.
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	 * @return the first matching virtual host, or <code>null</code> if a matching virtual host could not be found
+	 */
+	public VirtualHost fetchByC_L_First(
+		long companyId, long layoutSetId,
+		com.liferay.portal.kernel.util.OrderByComparator<VirtualHost>
+			orderByComparator);
+
+	/**
+	 * Returns the last virtual host in the ordered set where companyId = &#63; and layoutSetId = &#63;.
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	 * @return the last matching virtual host
+	 * @throws NoSuchVirtualHostException if a matching virtual host could not be found
+	 */
+	public VirtualHost findByC_L_Last(
+			long companyId, long layoutSetId,
+			com.liferay.portal.kernel.util.OrderByComparator<VirtualHost>
+				orderByComparator)
+		throws NoSuchVirtualHostException;
+
+	/**
+	 * Returns the last virtual host in the ordered set where companyId = &#63; and layoutSetId = &#63;.
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	 * @return the last matching virtual host, or <code>null</code> if a matching virtual host could not be found
+	 */
+	public VirtualHost fetchByC_L_Last(
+		long companyId, long layoutSetId,
+		com.liferay.portal.kernel.util.OrderByComparator<VirtualHost>
+			orderByComparator);
+
+	/**
+	 * Returns the virtual hosts before and after the current virtual host in the ordered set where companyId = &#63; and layoutSetId = &#63;.
+	 *
+	 * @param virtualHostId the primary key of the current virtual host
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	 * @return the previous, current, and next virtual host
+	 * @throws NoSuchVirtualHostException if a virtual host with the primary key could not be found
+	 */
+	public VirtualHost[] findByC_L_PrevAndNext(
+			long virtualHostId, long companyId, long layoutSetId,
+			com.liferay.portal.kernel.util.OrderByComparator<VirtualHost>
+				orderByComparator)
+		throws NoSuchVirtualHostException;
+
+	/**
+	 * Removes all the virtual hosts where companyId = &#63; and layoutSetId = &#63; from the database.
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 */
+	public void removeByC_L(long companyId, long layoutSetId);
+
+	/**
+	 * Returns the number of virtual hosts where companyId = &#63; and layoutSetId = &#63;.
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @return the number of matching virtual hosts
+	 */
+	public int countByC_L(long companyId, long layoutSetId);
+
+	/**
+	 * Returns the virtual host where companyId = &#63; and layoutSetId = &#63; and defaultVirtualHost = &#63; or throws a <code>NoSuchVirtualHostException</code> if it could not be found.
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @param defaultVirtualHost the default virtual host
 	 * @return the matching virtual host
 	 * @throws NoSuchVirtualHostException if a matching virtual host could not be found
 	 */
-	public VirtualHost findByC_L(long companyId, long layoutSetId)
+	public VirtualHost findByC_L_D(
+			long companyId, long layoutSetId, boolean defaultVirtualHost)
 		throws NoSuchVirtualHostException;
 
 	/**
-	 * Returns the virtual host where companyId = &#63; and layoutSetId = &#63; or returns <code>null</code> if it could not be found. Uses the finder cache.
+	 * Returns the virtual host where companyId = &#63; and layoutSetId = &#63; and defaultVirtualHost = &#63; or returns <code>null</code> if it could not be found. Uses the finder cache.
 	 *
 	 * @param companyId the company ID
 	 * @param layoutSetId the layout set ID
+	 * @param defaultVirtualHost the default virtual host
 	 * @return the matching virtual host, or <code>null</code> if a matching virtual host could not be found
 	 */
-	public VirtualHost fetchByC_L(long companyId, long layoutSetId);
+	public VirtualHost fetchByC_L_D(
+		long companyId, long layoutSetId, boolean defaultVirtualHost);
 
 	/**
-	 * Returns the virtual host where companyId = &#63; and layoutSetId = &#63; or returns <code>null</code> if it could not be found, optionally using the finder cache.
+	 * Returns the virtual host where companyId = &#63; and layoutSetId = &#63; and defaultVirtualHost = &#63; or returns <code>null</code> if it could not be found, optionally using the finder cache.
 	 *
 	 * @param companyId the company ID
 	 * @param layoutSetId the layout set ID
+	 * @param defaultVirtualHost the default virtual host
 	 * @param useFinderCache whether to use the finder cache
 	 * @return the matching virtual host, or <code>null</code> if a matching virtual host could not be found
 	 */
-	public VirtualHost fetchByC_L(
-		long companyId, long layoutSetId, boolean useFinderCache);
+	public VirtualHost fetchByC_L_D(
+		long companyId, long layoutSetId, boolean defaultVirtualHost,
+		boolean useFinderCache);
 
 	/**
-	 * Removes the virtual host where companyId = &#63; and layoutSetId = &#63; from the database.
+	 * Removes the virtual host where companyId = &#63; and layoutSetId = &#63; and defaultVirtualHost = &#63; from the database.
 	 *
 	 * @param companyId the company ID
 	 * @param layoutSetId the layout set ID
+	 * @param defaultVirtualHost the default virtual host
 	 * @return the virtual host that was removed
 	 */
-	public VirtualHost removeByC_L(long companyId, long layoutSetId)
+	public VirtualHost removeByC_L_D(
+			long companyId, long layoutSetId, boolean defaultVirtualHost)
 		throws NoSuchVirtualHostException;
 
 	/**
-	 * Returns the number of virtual hosts where companyId = &#63; and layoutSetId = &#63;.
+	 * Returns the number of virtual hosts where companyId = &#63; and layoutSetId = &#63; and defaultVirtualHost = &#63;.
 	 *
 	 * @param companyId the company ID
 	 * @param layoutSetId the layout set ID
+	 * @param defaultVirtualHost the default virtual host
 	 * @return the number of matching virtual hosts
 	 */
-	public int countByC_L(long companyId, long layoutSetId);
+	public int countByC_L_D(
+		long companyId, long layoutSetId, boolean defaultVirtualHost);
 
 	/**
 	 * Caches the virtual host in the entity cache if it is enabled.
diff --git a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/VirtualHostUtil.java b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/VirtualHostUtil.java
index 28a2d1a69ff749..631bbf5e3c3da7 100644
--- a/portal-kernel/src/com/liferay/portal/kernel/service/persistence/VirtualHostUtil.java
+++ b/portal-kernel/src/com/liferay/portal/kernel/service/persistence/VirtualHostUtil.java
@@ -179,67 +179,270 @@ public static int countByHostname(String hostname) {
 	}
 
 	/**
-	 * Returns the virtual host where companyId = &#63; and layoutSetId = &#63; or throws a <code>NoSuchVirtualHostException</code> if it could not be found.
+	 * Returns all the virtual hosts where companyId = &#63; and layoutSetId = &#63;.
 	 *
 	 * @param companyId the company ID
 	 * @param layoutSetId the layout set ID
+	 * @return the matching virtual hosts
+	 */
+	public static List<VirtualHost> findByC_L(
+		long companyId, long layoutSetId) {
+
+		return getPersistence().findByC_L(companyId, layoutSetId);
+	}
+
+	/**
+	 * Returns a range of all the virtual hosts where companyId = &#63; and layoutSetId = &#63;.
+	 *
+	 * <p>
+	 * Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to <code>QueryUtil#ALL_POS</code> will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not <code>QueryUtil#ALL_POS</code>), then the query will include the default ORDER BY logic from <code>VirtualHostModelImpl</code>. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	 * </p>
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @param start the lower bound of the range of virtual hosts
+	 * @param end the upper bound of the range of virtual hosts (not inclusive)
+	 * @return the range of matching virtual hosts
+	 */
+	public static List<VirtualHost> findByC_L(
+		long companyId, long layoutSetId, int start, int end) {
+
+		return getPersistence().findByC_L(companyId, layoutSetId, start, end);
+	}
+
+	/**
+	 * Returns an ordered range of all the virtual hosts where companyId = &#63; and layoutSetId = &#63;.
+	 *
+	 * <p>
+	 * Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to <code>QueryUtil#ALL_POS</code> will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not <code>QueryUtil#ALL_POS</code>), then the query will include the default ORDER BY logic from <code>VirtualHostModelImpl</code>. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	 * </p>
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @param start the lower bound of the range of virtual hosts
+	 * @param end the upper bound of the range of virtual hosts (not inclusive)
+	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
+	 * @return the ordered range of matching virtual hosts
+	 */
+	public static List<VirtualHost> findByC_L(
+		long companyId, long layoutSetId, int start, int end,
+		OrderByComparator<VirtualHost> orderByComparator) {
+
+		return getPersistence().findByC_L(
+			companyId, layoutSetId, start, end, orderByComparator);
+	}
+
+	/**
+	 * Returns an ordered range of all the virtual hosts where companyId = &#63; and layoutSetId = &#63;.
+	 *
+	 * <p>
+	 * Useful when paginating results. Returns a maximum of <code>end - start</code> instances. <code>start</code> and <code>end</code> are not primary keys, they are indexes in the result set. Thus, <code>0</code> refers to the first result in the set. Setting both <code>start</code> and <code>end</code> to <code>QueryUtil#ALL_POS</code> will return the full result set. If <code>orderByComparator</code> is specified, then the query will include the given ORDER BY logic. If <code>orderByComparator</code> is absent and pagination is required (<code>start</code> and <code>end</code> are not <code>QueryUtil#ALL_POS</code>), then the query will include the default ORDER BY logic from <code>VirtualHostModelImpl</code>. If both <code>orderByComparator</code> and pagination are absent, for performance reasons, the query will not have an ORDER BY clause and the returned result set will be sorted on by the primary key in an ascending order.
+	 * </p>
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @param start the lower bound of the range of virtual hosts
+	 * @param end the upper bound of the range of virtual hosts (not inclusive)
+	 * @param orderByComparator the comparator to order the results by (optionally <code>null</code>)
+	 * @param useFinderCache whether to use the finder cache
+	 * @return the ordered range of matching virtual hosts
+	 */
+	public static List<VirtualHost> findByC_L(
+		long companyId, long layoutSetId, int start, int end,
+		OrderByComparator<VirtualHost> orderByComparator,
+		boolean useFinderCache) {
+
+		return getPersistence().findByC_L(
+			companyId, layoutSetId, start, end, orderByComparator,
+			useFinderCache);
+	}
+
+	/**
+	 * Returns the first virtual host in the ordered set where companyId = &#63; and layoutSetId = &#63;.
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	 * @return the first matching virtual host
+	 * @throws NoSuchVirtualHostException if a matching virtual host could not be found
+	 */
+	public static VirtualHost findByC_L_First(
+			long companyId, long layoutSetId,
+			OrderByComparator<VirtualHost> orderByComparator)
+		throws com.liferay.portal.kernel.exception.NoSuchVirtualHostException {
+
+		return getPersistence().findByC_L_First(
+			companyId, layoutSetId, orderByComparator);
+	}
+
+	/**
+	 * Returns the first virtual host in the ordered set where companyId = &#63; and layoutSetId = &#63;.
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	 * @return the first matching virtual host, or <code>null</code> if a matching virtual host could not be found
+	 */
+	public static VirtualHost fetchByC_L_First(
+		long companyId, long layoutSetId,
+		OrderByComparator<VirtualHost> orderByComparator) {
+
+		return getPersistence().fetchByC_L_First(
+			companyId, layoutSetId, orderByComparator);
+	}
+
+	/**
+	 * Returns the last virtual host in the ordered set where companyId = &#63; and layoutSetId = &#63;.
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	 * @return the last matching virtual host
+	 * @throws NoSuchVirtualHostException if a matching virtual host could not be found
+	 */
+	public static VirtualHost findByC_L_Last(
+			long companyId, long layoutSetId,
+			OrderByComparator<VirtualHost> orderByComparator)
+		throws com.liferay.portal.kernel.exception.NoSuchVirtualHostException {
+
+		return getPersistence().findByC_L_Last(
+			companyId, layoutSetId, orderByComparator);
+	}
+
+	/**
+	 * Returns the last virtual host in the ordered set where companyId = &#63; and layoutSetId = &#63;.
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	 * @return the last matching virtual host, or <code>null</code> if a matching virtual host could not be found
+	 */
+	public static VirtualHost fetchByC_L_Last(
+		long companyId, long layoutSetId,
+		OrderByComparator<VirtualHost> orderByComparator) {
+
+		return getPersistence().fetchByC_L_Last(
+			companyId, layoutSetId, orderByComparator);
+	}
+
+	/**
+	 * Returns the virtual hosts before and after the current virtual host in the ordered set where companyId = &#63; and layoutSetId = &#63;.
+	 *
+	 * @param virtualHostId the primary key of the current virtual host
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @param orderByComparator the comparator to order the set by (optionally <code>null</code>)
+	 * @return the previous, current, and next virtual host
+	 * @throws NoSuchVirtualHostException if a virtual host with the primary key could not be found
+	 */
+	public static VirtualHost[] findByC_L_PrevAndNext(
+			long virtualHostId, long companyId, long layoutSetId,
+			OrderByComparator<VirtualHost> orderByComparator)
+		throws com.liferay.portal.kernel.exception.NoSuchVirtualHostException {
+
+		return getPersistence().findByC_L_PrevAndNext(
+			virtualHostId, companyId, layoutSetId, orderByComparator);
+	}
+
+	/**
+	 * Removes all the virtual hosts where companyId = &#63; and layoutSetId = &#63; from the database.
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 */
+	public static void removeByC_L(long companyId, long layoutSetId) {
+		getPersistence().removeByC_L(companyId, layoutSetId);
+	}
+
+	/**
+	 * Returns the number of virtual hosts where companyId = &#63; and layoutSetId = &#63;.
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @return the number of matching virtual hosts
+	 */
+	public static int countByC_L(long companyId, long layoutSetId) {
+		return getPersistence().countByC_L(companyId, layoutSetId);
+	}
+
+	/**
+	 * Returns the virtual host where companyId = &#63; and layoutSetId = &#63; and defaultVirtualHost = &#63; or throws a <code>NoSuchVirtualHostException</code> if it could not be found.
+	 *
+	 * @param companyId the company ID
+	 * @param layoutSetId the layout set ID
+	 * @param defaultVirtualHost the default virtual host
 	 * @return the matching virtual host
 	 * @throws NoSuchVirtualHostException if a matching virtual host could not be found
 	 */
-	public static VirtualHost findByC_L(long companyId, long layoutSetId)
+	public static VirtualHost findByC_L_D(
+			long companyId, long layoutSetId, boolean defaultVirtualHost)
 		throws com.liferay.portal.kernel.exception.NoSuchVirtualHostException {
 
-		return getPersistence().findByC_L(companyId, layoutSetId);
+		return getPersistence().findByC_L_D(
+			companyId, layoutSetId, defaultVirtualHost);
 	}
 
 	/**
-	 * Returns the virtual host where companyId = &#63; and layoutSetId = &#63; or returns <code>null</code> if it could not be found. Uses the finder cache.
+	 * Returns the virtual host where companyId = &#63; and layoutSetId = &#63; and defaultVirtualHost = &#63; or returns <code>null</code> if it could not be found. Uses the finder cache.
 	 *
 	 * @param companyId the company ID
 	 * @param layoutSetId the layout set ID
+	 * @param defaultVirtualHost the default virtual host
 	 * @return the matching virtual host, or <code>null</code> if a matching virtual host could not be found
 	 */
-	public static VirtualHost fetchByC_L(long companyId, long layoutSetId) {
-		return getPersistence().fetchByC_L(companyId, layoutSetId);
+	public static VirtualHost fetchByC_L_D(
+		long companyId, long layoutSetId, boolean defaultVirtualHost) {
+
+		return getPersistence().fetchByC_L_D(
+			companyId, layoutSetId, defaultVirtualHost);
 	}
 
 	/**
-	 * Returns the virtual host where companyId = &#63; and layoutSetId = &#63; or returns <code>null</code> if it could not be found, optionally using the finder cache.
+	 * Returns the virtual host where companyId = &#63; and layoutSetId = &#63; and defaultVirtualHost = &#63; or returns <code>null</code> if it could not be found, optionally using the finder cache.
 	 *
 	 * @param companyId the company ID
 	 * @param layoutSetId the layout set ID
+	 * @param defaultVirtualHost the default virtual host
 	 * @param useFinderCache whether to use the finder cache
 	 * @return the matching virtual host, or <code>null</code> if a matching virtual host could not be found
 	 */
-	public static VirtualHost fetchByC_L(
-		long companyId, long layoutSetId, boolean useFinderCache) {
+	public static VirtualHost fetchByC_L_D(
+		long companyId, long layoutSetId, boolean defaultVirtualHost,
+		boolean useFinderCache) {
 
-		return getPersistence().fetchByC_L(
-			companyId, layoutSetId, useFinderCache);
+		return getPersistence().fetchByC_L_D(
+			companyId, layoutSetId, defaultVirtualHost, useFinderCache);
 	}
 
 	/**
-	 * Removes the virtual host where companyId = &#63; and layoutSetId = &#63; from the database.
+	 * Removes the virtual host where companyId = &#63; and layoutSetId = &#63; and defaultVirtualHost = &#63; from the database.
 	 *
 	 * @param companyId the company ID
 	 * @param layoutSetId the layout set ID
+	 * @param defaultVirtualHost the default virtual host
 	 * @return the virtual host that was removed
 	 */
-	public static VirtualHost removeByC_L(long companyId, long layoutSetId)
+	public static VirtualHost removeByC_L_D(
+			long companyId, long layoutSetId, boolean defaultVirtualHost)
 		throws com.liferay.portal.kernel.exception.NoSuchVirtualHostException {
 
-		return getPersistence().removeByC_L(companyId, layoutSetId);
+		return getPersistence().removeByC_L_D(
+			companyId, layoutSetId, defaultVirtualHost);
 	}
 
 	/**
-	 * Returns the number of virtual hosts where companyId = &#63; and layoutSetId = &#63;.
+	 * Returns the number of virtual hosts where companyId = &#63; and layoutSetId = &#63; and defaultVirtualHost = &#63;.
 	 *
 	 * @param companyId the company ID
 	 * @param layoutSetId the layout set ID
+	 * @param defaultVirtualHost the default virtual host
 	 * @return the number of matching virtual hosts
 	 */
-	public static int countByC_L(long companyId, long layoutSetId) {
-		return getPersistence().countByC_L(companyId, layoutSetId);
+	public static int countByC_L_D(
+		long companyId, long layoutSetId, boolean defaultVirtualHost) {
+
+		return getPersistence().countByC_L_D(
+			companyId, layoutSetId, defaultVirtualHost);
 	}
 
 	/**
diff --git a/portal-kernel/src/com/liferay/portal/kernel/util/Portal.java b/portal-kernel/src/com/liferay/portal/kernel/util/Portal.java
index 2c12367a57f659..72461265c7717d 100644
--- a/portal-kernel/src/com/liferay/portal/kernel/util/Portal.java
+++ b/portal-kernel/src/com/liferay/portal/kernel/util/Portal.java
@@ -48,6 +48,7 @@
 import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.TimeZone;
+import java.util.TreeMap;
 
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
@@ -1196,8 +1197,15 @@ public String getUserName(
 	public long getValidUserId(long companyId, long userId)
 		throws PortalException;
 
+	/**
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 *             #getVirtualHostnames(LayoutSet)}
+	 */
+	@Deprecated
 	public String getVirtualHostname(LayoutSet layoutSet);
 
+	public TreeMap<String, String> getVirtualHostnames(LayoutSet layoutSet);
+
 	public String getWidgetURL(Portlet portlet, ThemeDisplay themeDisplay)
 		throws PortalException;
 
diff --git a/portal-kernel/src/com/liferay/portal/kernel/util/PortalUtil.java b/portal-kernel/src/com/liferay/portal/kernel/util/PortalUtil.java
index db83cf464504e7..ff1324a58e6f29 100644
--- a/portal-kernel/src/com/liferay/portal/kernel/util/PortalUtil.java
+++ b/portal-kernel/src/com/liferay/portal/kernel/util/PortalUtil.java
@@ -51,6 +51,7 @@
 import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.TimeZone;
+import java.util.TreeMap;
 
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
@@ -1940,10 +1941,21 @@ public static long getValidUserId(long companyId, long userId)
 		return getPortal().getValidUserId(companyId, userId);
 	}
 
+	/**
+	 * @deprecated As of Mueller (7.2.x), replaced by {@link
+	 *             #getVirtualHostnames(LayoutSet)}
+	 */
+	@Deprecated
 	public static String getVirtualHostname(LayoutSet layoutSet) {
 		return getPortal().getVirtualHostname(layoutSet);
 	}
 
+	public static TreeMap<String, String> getVirtualHostnames(
+		LayoutSet layoutSet) {
+
+		return getPortal().getVirtualHostnames(layoutSet);
+	}
+
 	public static String getWidgetURL(
 			Portlet portlet, ThemeDisplay themeDisplay)
 		throws PortalException {
diff --git a/sql/indexes.sql b/sql/indexes.sql
index e7301ad503bb03..4ebeaf4fafa2fc 100644
--- a/sql/indexes.sql
+++ b/sql/indexes.sql
@@ -179,28 +179,22 @@ create index IX_3B69160F on Groups_UserGroups (userGroupId);
 
 create index IX_6A925A4D on Image (size_);
 
-create index IX_31B45343 on Layout (classNameId, classPK, ctCollectionId);
-create index IX_4B906FF6 on Layout (companyId, ctCollectionId);
-create index IX_8F868C29 on Layout (companyId, layoutPrototypeUuid[$COLUMN_LENGTH:75$], ctCollectionId);
-create index IX_FD5AF6EE on Layout (ctCollectionId);
-create index IX_34D93878 on Layout (groupId, ctCollectionId);
-create index IX_7BFE8B01 on Layout (groupId, privateLayout, ctCollectionId);
-create unique index IX_B556968F on Layout (groupId, privateLayout, friendlyURL[$COLUMN_LENGTH:255$], ctCollectionId);
-create unique index IX_CF5120DA on Layout (groupId, privateLayout, layoutId, ctCollectionId);
-create index IX_52D89564 on Layout (groupId, privateLayout, parentLayoutId, ctCollectionId);
-create index IX_1E4451FD on Layout (groupId, privateLayout, parentLayoutId, hidden_, ctCollectionId);
-create index IX_989E917C on Layout (groupId, privateLayout, parentLayoutId, priority, ctCollectionId);
-create index IX_18D0C537 on Layout (groupId, privateLayout, sourcePrototypeLayoutUuid[$COLUMN_LENGTH:75$], ctCollectionId);
-create index IX_A1FC5430 on Layout (groupId, privateLayout, type_[$COLUMN_LENGTH:75$], ctCollectionId);
-create index IX_94E0E2D9 on Layout (groupId, type_[$COLUMN_LENGTH:75$], ctCollectionId);
-create index IX_E7B06BDB on Layout (iconImageId, ctCollectionId);
-create index IX_11389031 on Layout (layoutPrototypeUuid[$COLUMN_LENGTH:75$], ctCollectionId);
-create index IX_7F60B703 on Layout (parentPlid, ctCollectionId);
-create index IX_C95F601E on Layout (privateLayout, iconImageId, ctCollectionId);
-create index IX_ED8D4D2A on Layout (sourcePrototypeLayoutUuid[$COLUMN_LENGTH:75$], ctCollectionId);
-create index IX_24AA0CE2 on Layout (uuid_[$COLUMN_LENGTH:75$], companyId, ctCollectionId);
-create index IX_5AA23582 on Layout (uuid_[$COLUMN_LENGTH:75$], ctCollectionId);
-create unique index IX_52D84D95 on Layout (uuid_[$COLUMN_LENGTH:75$], groupId, privateLayout, ctCollectionId);
+create index IX_B8E1E6E5 on Layout (classNameId, classPK);
+create index IX_881EABCB on Layout (companyId, layoutPrototypeUuid[$COLUMN_LENGTH:75$]);
+create unique index IX_BC2C4231 on Layout (groupId, privateLayout, friendlyURL[$COLUMN_LENGTH:255$]);
+create unique index IX_7162C27C on Layout (groupId, privateLayout, layoutId);
+create index IX_7DAA999F on Layout (groupId, privateLayout, parentLayoutId, hidden_);
+create index IX_7399B71E on Layout (groupId, privateLayout, parentLayoutId, priority);
+create index IX_8CE8C0D9 on Layout (groupId, privateLayout, sourcePrototypeLayoutUuid[$COLUMN_LENGTH:75$]);
+create index IX_1A1B61D2 on Layout (groupId, privateLayout, type_[$COLUMN_LENGTH:75$]);
+create index IX_6EDC627B on Layout (groupId, type_[$COLUMN_LENGTH:75$]);
+create index IX_23922F7D on Layout (iconImageId);
+create index IX_B529BFD3 on Layout (layoutPrototypeUuid[$COLUMN_LENGTH:75$]);
+create index IX_1D4DCAA5 on Layout (parentPlid);
+create index IX_3BC009C0 on Layout (privateLayout, iconImageId);
+create index IX_39A18ECC on Layout (sourcePrototypeLayoutUuid[$COLUMN_LENGTH:75$]);
+create index IX_2CE4BE84 on Layout (uuid_[$COLUMN_LENGTH:75$], companyId);
+create unique index IX_E118C537 on Layout (uuid_[$COLUMN_LENGTH:75$], groupId, privateLayout);
 
 create index IX_A705FF94 on LayoutBranch (layoutSetBranchId, plid, master);
 create unique index IX_FD57097D on LayoutBranch (layoutSetBranchId, plid, name[$COLUMN_LENGTH:75$]);
@@ -465,7 +459,7 @@ create index IX_A098EFBF on Users_Teams (userId);
 create index IX_BB65040C on Users_UserGroups (companyId);
 create index IX_66FF2503 on Users_UserGroups (userGroupId);
 
-create unique index IX_A083D394 on VirtualHost (companyId, layoutSetId);
+create index IX_EECA5FDA on VirtualHost (companyId, layoutSetId, defaultVirtualHost);
 create unique index IX_431A3960 on VirtualHost (hostname[$COLUMN_LENGTH:200$]);
 
 create unique index IX_97DFA146 on WebDAVProps (classNameId, classPK);
diff --git a/sql/portal-tables.sql b/sql/portal-tables.sql
index c24fc7d2f1f02a..c7a8cb963213bb 100644
--- a/sql/portal-tables.sql
+++ b/sql/portal-tables.sql
@@ -556,9 +556,8 @@ create table Image (
 
 create table Layout (
 	mvccVersion LONG default 0 not null,
-	ctCollectionId LONG default 0 not null,
 	uuid_ VARCHAR(75) null,
-	plid LONG not null,
+	plid LONG not null primary key,
 	groupId LONG,
 	companyId LONG,
 	userId LONG,
@@ -590,8 +589,7 @@ create table Layout (
 	layoutPrototypeLinkEnabled BOOLEAN,
 	sourcePrototypeLayoutUuid VARCHAR(75) null,
 	publishDate DATE null,
-	lastPublishDate DATE null,
-	primary key (plid, ctCollectionId)
+	lastPublishDate DATE null
 );
 
 create table LayoutBranch (
@@ -1424,7 +1422,9 @@ create table VirtualHost (
 	virtualHostId LONG not null primary key,
 	companyId LONG,
 	layoutSetId LONG,
-	hostname VARCHAR(200) null
+	hostname VARCHAR(200) null,
+	defaultVirtualHost BOOLEAN,
+	languageId VARCHAR(75) null
 );
 
 create table WebDAVProps (