diff --git a/.vscode/cspell.json b/.vscode/cspell.json
index 2a80131a5c4..4a9139b57eb 100644
--- a/.vscode/cspell.json
+++ b/.vscode/cspell.json
@@ -4,6 +4,7 @@
     "words": [
         "decoratee",
         "ICESTORM",
+        "nullopt",
         "unmarshal",
         "unmarshaling"
     ],
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 40be48d6dd3..daf861a6118 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -6,6 +6,7 @@
         "--rcfile=tox.ini"
     ],
     "files.associations": {
+        "Make.*": "makefile",
         "vector": "cpp",
         "__bit_reference": "cpp",
         "__config": "cpp",
@@ -79,7 +80,8 @@
         "cassert": "cpp",
         "span": "cpp",
         "functional": "cpp",
-        "__memory": "cpp"
+        "__memory": "cpp",
+        "queue": "cpp"
     },
     "C_Cpp.default.cppStandard": "c++20",
 }
diff --git a/config/PropertyNames.xml b/config/PropertyNames.xml
index ab2f6b9dfd9..364fe90f472 100644
--- a/config/PropertyNames.xml
+++ b/config/PropertyNames.xml
@@ -249,11 +249,11 @@ generated from the section label.
     </class>
 
     <class name="connection" prefix-only="false">
-        <suffix name="CloseTimeout" />
-        <suffix name="ConnectTimeout" />
-        <suffix name="EnableIdleCheck" />
-        <suffix name="IdleTimeout" />
-        <suffix name="InactivityTimeout" />
+        <suffix name="CloseTimeout" default="10" />
+        <suffix name="ConnectTimeout" default="10" />
+        <suffix name="EnableIdleCheck" default="1" />
+        <suffix name="IdleTimeout" default="60" />
+        <suffix name="InactivityTimeout" default="300" />
     </class>
 
     <class name="threadpool" prefix-only="true">
@@ -267,7 +267,8 @@ generated from the section label.
     </class>
 
     <class name="objectadapter" prefix-only="true">
-        <suffix name="ACM" class="acm"/> <!-- Getting replaced by Connection -->
+        <!-- ACM is getting replaced by Connection -->
+        <suffix name="ACM" class="acm"/>
         <suffix name="AdapterId" />
         <suffix name="Connection" class="connection"/>
         <suffix name="Endpoints" />
@@ -372,7 +373,7 @@ generated from the section label.
         <property name="PrintProcessId" />
         <property name="PrintStackTraces" />
         <property name="ProgramName" />
-        <property name="RetryIntervals" />
+        <property name="RetryIntervals" default="0" />
         <property name="ServerIdleTime" />
         <property name="SOCKSProxyHost" />
         <property name="SOCKSProxyPort" />
@@ -382,7 +383,7 @@ generated from the section label.
         <property name="ThreadPool.Client" class="threadpool" />
         <property name="ThreadPool.Server" class="threadpool" />
         <property name="ThreadPriority"/>
-        <property name="ToStringMode" />
+        <property name="ToStringMode" default="Unicode" />
         <property name="Trace.Admin.Properties" />
         <property name="Trace.Admin.Logger" />
         <property name="Trace.Locator" />
diff --git a/config/makeprops.py b/config/makeprops.py
index 9e88bee7301..0d7a57a12f6 100755
--- a/config/makeprops.py
+++ b/config/makeprops.py
@@ -20,13 +20,11 @@
 contentHandler = None
 propertyClasses = {}
 
-commonPreamble = """//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-"""
+commonPreamble = "// Copyright (c) ZeroC, Inc. All rights reserved."
 
 commonPreamble = (
     commonPreamble
+    + "\n\n"
     + "// Generated by "
     + progname
     + " from file %(inputfile)s, "
@@ -54,23 +52,19 @@
 struct Property
 {
     const char* pattern;
+    const char* defaultValue;
     bool deprecated;
     const char* deprecatedBy;
 
-    Property(const char* n, bool d, const char* b) :
+    Property(const char* n, const char* dv, bool d, const char* b) :
         pattern(n),
+        defaultValue(dv),
         deprecated(d),
         deprecatedBy(b)
     {
     }
 
-    Property() :
-        pattern(0),
-        deprecated(false),
-        deprecatedBy(0)
-    {
-    }
-
+    Property() = delete;
 };
 
 struct PropertyArray
@@ -123,10 +117,10 @@ class %(classname)s
 csPreamble = (
     commonPreamble
     + """
-namespace IceInternal
+namespace Ice.Internal;
+
+public sealed class %(classname)s
 {
-    public sealed class %(classname)s
-    {
 """
 )
 
@@ -209,12 +203,12 @@ def initPropertyClasses(filename):
 #
 
 
-def handler(signum, frame):
+def handler(sigNum, frame):
     """Installed as signal handler. Should cause an files that are in
     use to be closed and removed"""
     global contentHandler
     contentHandler.cleanup()
-    sys.exit(128 + signum)
+    sys.exit(128 + sigNum)
 
 
 class UnknownElementException(Exception):
@@ -226,10 +220,10 @@ def __str__(self):
 
 
 class PropertyHandler(ContentHandler):
-    def __init__(self, inputfile, className):
+    def __init__(self, inputFile, className):
         self.start = False
         self.properties = {}
-        self.inputfile = inputfile
+        self.inputFile = inputFile
         self.className = className
         self.currentSection = None
         self.sectionPropertyCount = 0
@@ -248,15 +242,7 @@ def closeFiles(self):
         """Needs to be overridden in derived class"""
         pass
 
-    def deprecatedImpl(self, propertyName):
-        """Needs to be overridden in derived class"""
-        pass
-
-    def deprecatedImplWithReplacementImpl(self, propertyName, deprecatedBy):
-        """Needs to be overridden in derived class"""
-        pass
-
-    def propertyImpl(self, propertyName):
+    def propertyImpl(self, propertyName, defaultValue, deprecated, deprecatedBy):
         """Needs to be overridden in derived class"""
         pass
 
@@ -276,17 +262,9 @@ def handleNewSection(self, sectionName, noCmdLine):
         self.sections.append(sectionName)
         self.newSection()
 
-    def handleDeprecated(self, propertyName):
-        self.properties[propertyName] = None
-        self.deprecatedImpl(propertyName)
-
-    def handleDeprecatedWithReplacement(self, propertyName, deprecatedBy):
-        self.properties[propertyName] = deprecatedBy
-        self.deprecatedImplWithReplacementImpl(propertyName, deprecatedBy)
-
-    def handleProperty(self, propertyName):
-        self.properties[propertyName] = ""
-        self.propertyImpl(propertyName)
+    def handleProperty(self, propertyName, defaultValue, deprecated, deprecatedBy):
+        self.properties[propertyName] = deprecatedBy if deprecatedBy else ""
+        self.propertyImpl(propertyName, defaultValue, deprecated, deprecatedBy)
 
     def startElement(self, name, attrs):
         if name == "properties":
@@ -326,16 +304,10 @@ def startElement(self, name, attrs):
                 if c.isPrefixOnly():
                     return
 
-            #
-            # 'is not None' implies deprecated == true
-            #
             deprecatedBy = attrs.get("deprecatedBy", None)
-            if deprecatedBy is not None:
-                self.handleDeprecatedWithReplacement(propertyName, deprecatedBy)
-            elif attrs.get("deprecated", "false").lower() == "true":
-                self.handleDeprecated(propertyName)
-            else:
-                self.handleProperty(propertyName)
+            deprecated = attrs.get("deprecated", "false").lower() == "true"
+            defaultValue = attrs.get("default", None) or ""
+            self.handleProperty(propertyName, defaultValue, deprecated, deprecatedBy)
 
     def endElement(self, name):
         if name == "properties":
@@ -365,10 +337,10 @@ def startFiles(self):
         self.cppFile = open(self.className + ".cpp", "w")
         self.hFile.write(
             cppHeaderPreamble
-            % {"inputfile": self.inputfile, "classname": self.className}
+            % {"inputfile": self.inputFile, "classname": self.className}
         )
         self.cppFile.write(
-            cppSrcPreamble % {"inputfile": self.inputfile, "classname": self.className}
+            cppSrcPreamble % {"inputfile": self.inputFile, "classname": self.className}
         )
 
     def closeFiles(self):
@@ -400,23 +372,16 @@ def closeFiles(self):
     def fix(self, propertyName):
         return propertyName.replace("[any]", "*")
 
-    def deprecatedImpl(self, propertyName):
-        self.cppFile.write(
-            '    IceInternal::Property("%s.%s", true, 0),\n'
-            % (self.currentSection, self.fix(propertyName))
+    def propertyImpl(self, propertyName, defaultValue, deprecated, deprecatedBy):
+        propertyLine = 'IceInternal::Property("{section}.{name}", {defaultValue}, {deprecated}, {deprecatedBy})'.format(
+            section=self.currentSection,
+            name=self.fix(propertyName),
+            defaultValue=f'"{defaultValue}"',
+            deprecated="true" if deprecated else "false",
+            deprecatedBy=f'"{deprecatedBy}"' if deprecatedBy else "nullptr",
         )
 
-    def deprecatedImplWithReplacementImpl(self, propertyName, deprecatedBy):
-        self.cppFile.write(
-            '    IceInternal::Property("%s.%s", true, "%s"),\n'
-            % (self.currentSection, self.fix(propertyName), deprecatedBy)
-        )
-
-    def propertyImpl(self, propertyName):
-        self.cppFile.write(
-            '    IceInternal::Property("%s.%s", false, 0),\n'
-            % (self.currentSection, self.fix(propertyName))
-        )
+        self.cppFile.write(f"    {propertyLine},\n")
 
     def newSection(self):
         self.hFile.write(
@@ -463,7 +428,7 @@ def cleanup(self):
     def startFiles(self):
         self.srcFile = open(self.className + ".java", "w")
         self.srcFile.write(
-            javaPreamble % {"inputfile": self.inputfile, "classname": self.className}
+            javaPreamble % {"inputfile": self.inputFile, "classname": self.className}
         )
 
     def closeFiles(self):
@@ -490,30 +455,15 @@ def fix(self, propertyName):
         #
         return propertyName.replace(".", r"\\.").replace("[any]", r"[^\\s]+")
 
-    def deprecatedImpl(self, propertyName):
-        self.srcFile.write(
-            '        new Property("%(section)s\\\\.%(pattern)s", '
-            "true, null),\n"
-            % {"section": self.currentSection, "pattern": self.fix(propertyName)}
-        )
-
-    def deprecatedImplWithReplacementImpl(self, propertyName, deprecatedBy):
-        self.srcFile.write(
-            '        new Property("%(section)s\\\\.%(pattern)s", '
-            'true, "%(deprecatedBy)s"),\n'
-            % {
-                "section": self.currentSection,
-                "pattern": self.fix(propertyName),
-                "deprecatedBy": deprecatedBy,
-            }
-        )
-
-    def propertyImpl(self, propertyName):
-        self.srcFile.write(
-            '        new Property("%(section)s\\\\.%(pattern)s", '
-            "false, null),\n"
-            % {"section": self.currentSection, "pattern": self.fix(propertyName)}
+    def propertyImpl(self, propertyName, defaultValue, deprecated, deprecatedBy):
+        line = 'new Property("{section}\\\\.{name}", {defaultValue}, {deprecated}, {deprecatedBy})'.format(
+            section=self.currentSection,
+            name=self.fix(propertyName),
+            defaultValue=f'"{defaultValue}"',
+            deprecated="true" if deprecated else "false",
+            deprecatedBy=f'"{deprecatedBy}"' if deprecatedBy else "null",
         )
+        self.srcFile.write(f"        {line},\n")
 
     def newSection(self):
         self.srcFile.write(
@@ -557,59 +507,50 @@ def cleanup(self):
     def startFiles(self):
         self.srcFile = open(self.className + ".cs", "w")
         self.srcFile.write(
-            csPreamble % {"inputfile": self.inputfile, "classname": self.className}
+            csPreamble % {"inputfile": self.inputFile, "classname": self.className}
         )
 
     def closeFiles(self):
-        self.srcFile.write("        public static Property[][] validProps =\n")
+        self.srcFile.write("    public static Property[][] validProps =\n")
 
-        self.srcFile.write("        {\n")
+        self.srcFile.write("    {\n")
         for s in self.sections:
-            self.srcFile.write("            %sProps,\n" % s)
-        self.srcFile.write("        };\n\n")
+            self.srcFile.write("        %sProps,\n" % s)
+        self.srcFile.write("    };\n\n")
 
-        self.srcFile.write("        public static string[] clPropNames =\n")
-        self.srcFile.write("        {\n")
+        self.srcFile.write("    public static string[] clPropNames =\n")
+        self.srcFile.write("    {\n")
         for s in self.cmdLineOptions:
-            self.srcFile.write('            "%s",\n' % s)
-        self.srcFile.write("        };\n")
-        self.srcFile.write("    }\n")
+            self.srcFile.write('        "%s",\n' % s)
+        self.srcFile.write("    };\n")
         self.srcFile.write("}\n")
         self.srcFile.close()
 
     def fix(self, propertyName):
         return propertyName.replace(".", r"\.").replace("[any]", r"[^\s]+")
 
-    def deprecatedImpl(self, propertyName):
-        self.srcFile.write(
-            r'             new Property(@"^%s\.%s$", true, null),\n'
-            % (self.currentSection, self.fix(propertyName))
-        )
-
-    def deprecatedImplWithReplacementImpl(self, propertyName, deprecatedBy):
-        self.srcFile.write(
-            r'             new Property(@"^%s\.%s$", true, @"%s"),\n'
-            % (self.currentSection, self.fix(propertyName), deprecatedBy)
-        )
-
-    def propertyImpl(self, propertyName):
-        self.srcFile.write(
-            r'             new Property(@"^%s\.%s$", false, null),\n'
-            % (self.currentSection, self.fix(propertyName))
+    def propertyImpl(self, propertyName, defaultValue, deprecated, deprecatedBy):
+        line = 'new Property(@"^{section}\\.{name}$", {defaultValue}, {deprecated}, {deprecatedBy})'.format(
+            section=self.currentSection,
+            name=self.fix(propertyName),
+            defaultValue=f'"{defaultValue}"',
+            deprecated="true" if deprecated else "false",
+            deprecatedBy=f'"{deprecatedBy}"' if deprecatedBy else "null",
         )
+        self.srcFile.write(f"         {line},\n")
 
     def newSection(self):
         self.srcFile.write(
-            "        public static Property[] %sProps =\n" % self.currentSection
+            "    public static Property[] %sProps =\n" % self.currentSection
         )
-        self.srcFile.write("        {\n")
+        self.srcFile.write("    {\n")
 
     def closeSection(self):
-        self.srcFile.write("        };\n")
+        self.srcFile.write("    };\n")
         self.srcFile.write("\n")
 
     def moveFiles(self, location):
-        dest = os.path.join(location, "csharp", "src", "Ice")
+        dest = os.path.join(location, "csharp", "src", "Ice", "Internal")
         if os.path.exists(os.path.join(dest, self.className + ".cs")):
             os.remove(os.path.join(dest, self.className + ".cs"))
         shutil.move(self.className + ".cs", dest)
@@ -630,7 +571,7 @@ def cleanup(self):
     def startFiles(self):
         self.srcFile = open(self.className + ".js", "w")
         self.srcFile.write(
-            jsPreamble % {"inputfile": self.inputfile, "classname": self.className}
+            jsPreamble % {"inputfile": self.inputFile, "classname": self.className}
         )
 
     def closeFiles(self):
@@ -654,26 +595,16 @@ def closeFiles(self):
     def fix(self, propertyName):
         return propertyName.replace(".", "\\.").replace("[any]", ".")
 
-    def deprecatedImpl(self, propertyName):
+    def propertyImpl(self, propertyName, defaultValue, deprecated, deprecatedBy):
         if self.currentSection in self.validSections:
-            self.srcFile.write(
-                r'    new Property("/^%s\.%s/", true, null),\n'
-                % (self.currentSection, self.fix(propertyName))
-            )
-
-    def deprecatedImplWithReplacementImpl(self, propertyName, deprecatedBy):
-        if self.currentSection in self.validSections:
-            self.srcFile.write(
-                r'    new Property("/^%s\.%s/", true, "%s"),\n'
-                % (self.currentSection, self.fix(propertyName), deprecatedBy)
-            )
-
-    def propertyImpl(self, propertyName):
-        if self.currentSection in self.validSections:
-            self.srcFile.write(
-                r'    new Property("/^%s\.%s/", false, null),\n'
-                % (self.currentSection, self.fix(propertyName))
+            line = 'new Property("^{section}\\.{name}$", {defaultValue}, {deprecated}, {deprecatedBy})'.format(
+                section=self.currentSection,
+                name=self.fix(propertyName),
+                defaultValue=f'"{defaultValue}"',
+                deprecated="true" if deprecated else "false",
+                deprecatedBy=f'"{deprecatedBy}"' if deprecatedBy else "null",
             )
+            self.srcFile.write(f"    {line},\n")
 
     def newSection(self):
         if self.currentSection in self.validSections:
@@ -725,17 +656,11 @@ def handleNewSection(self, sectionName, cmdLine):
         for f in self.handlers:
             f.handleNewSection(sectionName, cmdLine)
 
-    def handleDeprecated(self, propertyName):
-        for f in self.handlers:
-            f.handleDeprecated(propertyName)
-
-    def handleDeprecatedWithReplacement(self, propertyName, deprecatedBy):
-        for f in self.handlers:
-            f.handleDeprecatedWithReplacement(propertyName, deprecatedBy)
-
-    def handleProperty(self, propertyName):
+    def handleProperty(
+        self, propertyName, default=None, deprecated=False, deprecatedBy=None
+    ):
         for f in self.handlers:
-            f.handleProperty(propertyName)
+            f.handleProperty(propertyName, default, deprecated, deprecatedBy)
 
     def startElement(self, name, attrs):
         for f in self.handlers:
diff --git a/cpp/include/Ice/Properties.h b/cpp/include/Ice/Properties.h
index 8d55a2e09c8..30465ac3a35 100644
--- a/cpp/include/Ice/Properties.h
+++ b/cpp/include/Ice/Properties.h
@@ -57,6 +57,15 @@ namespace Ice
          */
         std::string getProperty(std::string_view key) noexcept;
 
+        /**
+         * Get an Ice property by key. If the property is not set, its default value is returned.
+         * @param key The property key.
+         * @return The property value or the default value.
+         * @throws std::invalid_argument If the property is not a known Ice property.
+         * @see #setProperty
+         */
+        std::string getIceProperty(std::string_view key);
+
         /**
          * Get a property by key. If the property is not set, the given default value is returned.
          * @param key The property key.
@@ -74,6 +83,15 @@ namespace Ice
          */
         int getPropertyAsInt(std::string_view key) noexcept;
 
+        /**
+         * Get an Ice property as an integer. If the property is not set, its default value is returned.
+         * @param key The property key.
+         * @return The property value interpreted as an integer, or the default value.
+         * @throws std::invalid_argument If the property is not a known Ice property.
+         * @see #setProperty
+         */
+        int getIcePropertyAsInt(std::string_view key);
+
         /**
          * Get a property as an integer. If the property is not set, the given default value is returned.
          * @param key The property key.
@@ -95,6 +113,19 @@ namespace Ice
          */
         StringSeq getPropertyAsList(std::string_view key) noexcept;
 
+        /**
+         * Get an Ice property as a list of strings. The strings must be separated by whitespace or comma. If the
+         * property is not set, its default list is returned. The strings in the list can contain whitespace and commas
+         * if they are enclosed in single or double quotes. If quotes are mismatched, the default list is returned.
+         * Within single quotes or double quotes, you can escape the quote in question with a backslash, e.g. O'Reilly
+         * can be written as O'Reilly, "O'Reilly" or 'O\'Reilly'.
+         * @param key The property key.
+         * @return The property value interpreted as list of strings, or the default value.
+         * @throws std::invalid_argument If the property is not a known Ice property.
+         * @see #setProperty
+         */
+        StringSeq getIcePropertyAsList(std::string_view key);
+
         /**
          * Get a property as a list of strings.  The strings must be separated by whitespace or comma. If the property
          * is not set, the default list is returned. The strings in the list can contain whitespace and commas if they
diff --git a/cpp/include/IceUtil/StringUtil.h b/cpp/include/IceUtil/StringUtil.h
index 74712da837d..9b77ec5b047 100644
--- a/cpp/include/IceUtil/StringUtil.h
+++ b/cpp/include/IceUtil/StringUtil.h
@@ -40,7 +40,7 @@ namespace IceUtilInternal
     // Split a string using the given delimiters. Considers single and double quotes;
     // returns false for unbalanced quote, true otherwise.
     //
-    ICE_API bool splitString(const std::string&, const std::string&, std::vector<std::string>&);
+    ICE_API bool splitString(std::string_view, std::string_view, std::vector<std::string>&);
 
     //
     // Join a list of strings using the given delimiter.
diff --git a/cpp/src/Ice/Properties.cpp b/cpp/src/Ice/Properties.cpp
index 4499dd0c3ce..c7c95713759 100644
--- a/cpp/src/Ice/Properties.cpp
+++ b/cpp/src/Ice/Properties.cpp
@@ -18,6 +18,105 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+namespace
+{
+    /// Find a property in the Ice property set.
+    /// @param key The property name.
+    /// @param logWarnings Whether to log relevant warnings.
+    /// @return The property if found, nullopt otherwise.
+    optional<Property> findProperty(string_view key, bool logWarnings)
+    {
+        // Check if the property is legal.
+        LoggerPtr logger = getProcessLogger();
+        string::size_type dotPos = key.find('.');
+        if (dotPos != string::npos)
+        {
+            string_view prefix = key.substr(0, dotPos);
+            for (int i = 0; IceInternal::PropertyNames::validProps[i].properties != 0; ++i)
+            {
+                string pattern{IceInternal::PropertyNames::validProps[i].properties[0].pattern};
+
+                dotPos = pattern.find('.');
+
+                //
+                // Each top level prefix describes a non-empty
+                // namespace. Having a string without a prefix followed by a
+                // dot is an error.
+                //
+                assert(dotPos != string::npos);
+                string propPrefix = pattern.substr(0, dotPos);
+
+                // If the prefix doesn't match, continue to the next prefix.
+                if (IceUtilInternal::toUpper(propPrefix) != IceUtilInternal::toUpper(string{prefix}))
+                {
+                    continue;
+                }
+
+                for (int j = 0; j < IceInternal::PropertyNames::validProps[i].length; ++j)
+                {
+                    const IceInternal::Property& prop = IceInternal::PropertyNames::validProps[i].properties[j];
+
+                    if (IceUtilInternal::match(string{key}, prop.pattern))
+                    {
+                        if (prop.deprecated && logWarnings)
+                        {
+                            logger->warning("deprecated property: " + string{key});
+                        }
+                        return prop;
+                    }
+
+                    // Check for case-insensitive match.
+
+                    if (IceUtilInternal::match(
+                            IceUtilInternal::toUpper(string{key}),
+                            IceUtilInternal::toUpper(prop.pattern)))
+                    {
+                        if (logWarnings)
+                        {
+                            ostringstream os;
+                            os << "unknown property: `" << key << "'; did you mean `" << prop.pattern << "'";
+                            logger->warning(os.str());
+                        }
+                        return nullopt;
+                    }
+                }
+
+                if (logWarnings)
+                {
+                    ostringstream os;
+                    os << "unknown property: `" << key << "'";
+                    logger->warning(os.str());
+                }
+                return nullopt;
+            }
+        }
+
+        // The key does not match a known Ice property
+        return nullopt;
+    }
+
+    /// Find the default value for an Ice property. If there is no default value, return an empty string.
+    /// @param key The ice property name.
+    /// @return The default value for the property.
+    /// @throws std::invalid_argument if the property is unknown.
+    string_view getDefaultValue(string_view key)
+    {
+        for (int i = 0; IceInternal::PropertyNames::validProps[i].properties != 0; ++i)
+        {
+            for (int j = 0; j < IceInternal::PropertyNames::validProps[i].length; ++j)
+            {
+                const IceInternal::Property& prop = IceInternal::PropertyNames::validProps[i].properties[j];
+                if (IceUtilInternal::match(string{key}, prop.pattern))
+                {
+                    // There's always a non-null default value.
+                    return prop.defaultValue;
+                }
+            }
+        }
+        throw invalid_argument("unknown ice property: " + string{key});
+    }
+}
+
 Ice::Properties::Properties(const Properties& p)
 {
     lock_guard lock(p._mutex);
@@ -112,6 +211,13 @@ Ice::Properties::getProperty(string_view key) noexcept
     }
 }
 
+string
+Ice::Properties::getIceProperty(string_view key)
+{
+    string_view defaultValue = getDefaultValue(key);
+    return getPropertyWithDefault(key, defaultValue);
+}
+
 string
 Ice::Properties::getPropertyWithDefault(string_view key, string_view value) noexcept
 {
@@ -135,6 +241,22 @@ Ice::Properties::getPropertyAsInt(string_view key) noexcept
     return getPropertyAsIntWithDefault(key, 0);
 }
 
+int32_t
+Ice::Properties::getIcePropertyAsInt(string_view key)
+{
+    string defaultValueString{getDefaultValue(key)};
+    int32_t defaultValue{0};
+
+    if (!defaultValueString.empty())
+    {
+        // If the default value is not empty, it should be a number.
+        // These come from the IceInternal::PropertyNames::validProps array so they should be valid.
+        defaultValue = stoi(defaultValueString);
+    }
+
+    return getPropertyAsIntWithDefault(key, defaultValue);
+}
+
 int32_t
 Ice::Properties::getPropertyAsIntWithDefault(string_view key, int32_t value) noexcept
 {
@@ -163,6 +285,15 @@ Ice::Properties::getPropertyAsList(string_view key) noexcept
     return getPropertyAsListWithDefault(key, StringSeq());
 }
 
+Ice::StringSeq
+Ice::Properties::getIcePropertyAsList(string_view key)
+{
+    string_view defaultValue = getDefaultValue(key);
+    StringSeq defaultList;
+    IceUtilInternal::splitString(defaultValue, ", \t\r\n", defaultList);
+    return getPropertyAsListWithDefault(key, defaultList);
+}
+
 Ice::StringSeq
 Ice::Properties::getPropertyAsListWithDefault(string_view key, const StringSeq& value) noexcept
 {
@@ -221,70 +352,13 @@ Ice::Properties::setProperty(string_view key, string_view value)
         throw InitializationException(__FILE__, __LINE__, "Attempt to set property with empty key");
     }
 
-    //
-    // Check if the property is legal.
-    //
-    LoggerPtr logger = getProcessLogger();
-    string::size_type dotPos = currentKey.find('.');
-    if (dotPos != string::npos)
-    {
-        string prefix = currentKey.substr(0, dotPos);
-        for (int i = 0; IceInternal::PropertyNames::validProps[i].properties != 0; ++i)
-        {
-            string pattern(IceInternal::PropertyNames::validProps[i].properties[0].pattern);
-
-            dotPos = pattern.find('.');
-
-            //
-            // Each top level prefix describes a non-empty
-            // namespace. Having a string without a prefix followed by a
-            // dot is an error.
-            //
-            assert(dotPos != string::npos);
-
-            bool mismatchCase = false;
-            string otherKey;
-            string propPrefix = pattern.substr(0, dotPos);
-            if (IceUtilInternal::toUpper(propPrefix) != IceUtilInternal::toUpper(prefix))
-            {
-                continue;
-            }
-
-            bool found = false;
+    // Find the property, log warnings if necessary
+    auto prop = findProperty(key, true);
 
-            for (int j = 0; j < IceInternal::PropertyNames::validProps[i].length && !found; ++j)
-            {
-                const IceInternal::Property& prop = IceInternal::PropertyNames::validProps[i].properties[j];
-                found = IceUtilInternal::match(currentKey, prop.pattern);
-
-                if (found && prop.deprecated)
-                {
-                    logger->warning("deprecated property: " + currentKey);
-                    if (prop.deprecatedBy != 0)
-                    {
-                        currentKey = prop.deprecatedBy;
-                    }
-                }
-
-                if (!found && IceUtilInternal::match(
-                                  IceUtilInternal::toUpper(currentKey),
-                                  IceUtilInternal::toUpper(prop.pattern)))
-                {
-                    found = true;
-                    mismatchCase = true;
-                    otherKey = prop.pattern;
-                    break;
-                }
-            }
-            if (!found)
-            {
-                logger->warning("unknown property: `" + currentKey + "'");
-            }
-            else if (mismatchCase)
-            {
-                logger->warning("unknown property: `" + currentKey + "'; did you mean `" + otherKey + "'");
-            }
-        }
+    // If the property is deprecated by another property, use the new property key
+    if (prop && prop->deprecatedBy)
+    {
+        currentKey = prop->deprecatedBy;
     }
 
     lock_guard lock(_mutex);
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index 5508eaa189d..dd78245b9e3 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -1,357 +1,356 @@
-//
 // Copyright (c) ZeroC, Inc. All rights reserved.
-//
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Apr 26 11:24:58 2024
+
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Thu May  2 12:34:29 2024
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
 #include "PropertyNames.h"
 
 const IceInternal::Property IcePropsData[] = {
-    IceInternal::Property("Ice.AcceptClassCycles", false, 0),
-    IceInternal::Property("Ice.ACM.Client", true, 0),
-    IceInternal::Property("Ice.ACM.Server", true, 0),
-    IceInternal::Property("Ice.ACM.Timeout", false, 0),
-    IceInternal::Property("Ice.ACM.Heartbeat", false, 0),
-    IceInternal::Property("Ice.ACM.Close", false, 0),
-    IceInternal::Property("Ice.ACM", false, 0),
-    IceInternal::Property("Ice.ACM.Client.Timeout", false, 0),
-    IceInternal::Property("Ice.ACM.Client.Heartbeat", false, 0),
-    IceInternal::Property("Ice.ACM.Client.Close", false, 0),
-    IceInternal::Property("Ice.ACM.Client", false, 0),
-    IceInternal::Property("Ice.ACM.Server.Timeout", false, 0),
-    IceInternal::Property("Ice.ACM.Server.Heartbeat", false, 0),
-    IceInternal::Property("Ice.ACM.Server.Close", false, 0),
-    IceInternal::Property("Ice.ACM.Server", false, 0),
-    IceInternal::Property("Ice.Admin.ACM.Timeout", false, 0),
-    IceInternal::Property("Ice.Admin.ACM.Heartbeat", false, 0),
-    IceInternal::Property("Ice.Admin.ACM.Close", false, 0),
-    IceInternal::Property("Ice.Admin.ACM", false, 0),
-    IceInternal::Property("Ice.Admin.AdapterId", false, 0),
-    IceInternal::Property("Ice.Admin.Connection.CloseTimeout", false, 0),
-    IceInternal::Property("Ice.Admin.Connection.ConnectTimeout", false, 0),
-    IceInternal::Property("Ice.Admin.Connection.EnableIdleCheck", false, 0),
-    IceInternal::Property("Ice.Admin.Connection.IdleTimeout", false, 0),
-    IceInternal::Property("Ice.Admin.Connection.InactivityTimeout", false, 0),
-    IceInternal::Property("Ice.Admin.Connection", false, 0),
-    IceInternal::Property("Ice.Admin.Endpoints", false, 0),
-    IceInternal::Property("Ice.Admin.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("Ice.Admin.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("Ice.Admin.Locator.PreferSecure", false, 0),
-    IceInternal::Property("Ice.Admin.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Ice.Admin.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("Ice.Admin.Locator.Locator", false, 0),
-    IceInternal::Property("Ice.Admin.Locator.Router", false, 0),
-    IceInternal::Property("Ice.Admin.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("Ice.Admin.Locator.Context.*", false, 0),
-    IceInternal::Property("Ice.Admin.Locator", false, 0),
-    IceInternal::Property("Ice.Admin.PublishedEndpoints", false, 0),
-    IceInternal::Property("Ice.Admin.ReplicaGroupId", false, 0),
-    IceInternal::Property("Ice.Admin.Router.EndpointSelection", false, 0),
-    IceInternal::Property("Ice.Admin.Router.ConnectionCached", false, 0),
-    IceInternal::Property("Ice.Admin.Router.PreferSecure", false, 0),
-    IceInternal::Property("Ice.Admin.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Ice.Admin.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("Ice.Admin.Router.Locator", false, 0),
-    IceInternal::Property("Ice.Admin.Router.Router", false, 0),
-    IceInternal::Property("Ice.Admin.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("Ice.Admin.Router.Context.*", false, 0),
-    IceInternal::Property("Ice.Admin.Router", false, 0),
-    IceInternal::Property("Ice.Admin.ProxyOptions", false, 0),
-    IceInternal::Property("Ice.Admin.ThreadPool.Size", false, 0),
-    IceInternal::Property("Ice.Admin.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("Ice.Admin.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("Ice.Admin.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("Ice.Admin.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("Ice.Admin.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("Ice.Admin.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("Ice.Admin.MessageSizeMax", false, 0),
-    IceInternal::Property("Ice.Admin.DelayCreation", false, 0),
-    IceInternal::Property("Ice.Admin.Enabled", false, 0),
-    IceInternal::Property("Ice.Admin.Facets", false, 0),
-    IceInternal::Property("Ice.Admin.InstanceName", false, 0),
-    IceInternal::Property("Ice.Admin.Logger.KeepLogs", false, 0),
-    IceInternal::Property("Ice.Admin.Logger.KeepTraces", false, 0),
-    IceInternal::Property("Ice.Admin.Logger.Properties", false, 0),
-    IceInternal::Property("Ice.Admin.ServerId", false, 0),
-    IceInternal::Property("Ice.BackgroundLocatorCacheUpdates", false, 0),
-    IceInternal::Property("Ice.BatchAutoFlush", true, 0),
-    IceInternal::Property("Ice.BatchAutoFlushSize", false, 0),
-    IceInternal::Property("Ice.ChangeUser", false, 0),
-    IceInternal::Property("Ice.ClassGraphDepthMax", false, 0),
-    IceInternal::Property("Ice.ClientAccessPolicyProtocol", false, 0),
-    IceInternal::Property("Ice.Compression.Level", false, 0),
-    IceInternal::Property("Ice.Config", false, 0),
-    IceInternal::Property("Ice.Connection.CloseTimeout", false, 0),
-    IceInternal::Property("Ice.Connection.ConnectTimeout", false, 0),
-    IceInternal::Property("Ice.Connection.EnableIdleCheck", false, 0),
-    IceInternal::Property("Ice.Connection.IdleTimeout", false, 0),
-    IceInternal::Property("Ice.Connection.InactivityTimeout", false, 0),
-    IceInternal::Property("Ice.Connection", false, 0),
-    IceInternal::Property("Ice.ConsoleListener", false, 0),
-    IceInternal::Property("Ice.Default.CollocationOptimized", false, 0),
-    IceInternal::Property("Ice.Default.EncodingVersion", false, 0),
-    IceInternal::Property("Ice.Default.EndpointSelection", false, 0),
-    IceInternal::Property("Ice.Default.Host", false, 0),
-    IceInternal::Property("Ice.Default.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("Ice.Default.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("Ice.Default.Locator.PreferSecure", false, 0),
-    IceInternal::Property("Ice.Default.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Ice.Default.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("Ice.Default.Locator.Locator", false, 0),
-    IceInternal::Property("Ice.Default.Locator.Router", false, 0),
-    IceInternal::Property("Ice.Default.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("Ice.Default.Locator.Context.*", false, 0),
-    IceInternal::Property("Ice.Default.Locator", false, 0),
-    IceInternal::Property("Ice.Default.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Ice.Default.InvocationTimeout", false, 0),
-    IceInternal::Property("Ice.Default.Package", false, 0),
-    IceInternal::Property("Ice.Default.PreferSecure", false, 0),
-    IceInternal::Property("Ice.Default.Protocol", false, 0),
-    IceInternal::Property("Ice.Default.Router.EndpointSelection", false, 0),
-    IceInternal::Property("Ice.Default.Router.ConnectionCached", false, 0),
-    IceInternal::Property("Ice.Default.Router.PreferSecure", false, 0),
-    IceInternal::Property("Ice.Default.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Ice.Default.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("Ice.Default.Router.Locator", false, 0),
-    IceInternal::Property("Ice.Default.Router.Router", false, 0),
-    IceInternal::Property("Ice.Default.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("Ice.Default.Router.Context.*", false, 0),
-    IceInternal::Property("Ice.Default.Router", false, 0),
-    IceInternal::Property("Ice.Default.SlicedFormat", false, 0),
-    IceInternal::Property("Ice.Default.SourceAddress", false, 0),
-    IceInternal::Property("Ice.Default.Timeout", false, 0),
-    IceInternal::Property("Ice.EventLog.Source", false, 0),
-    IceInternal::Property("Ice.FactoryAssemblies", false, 0),
-    IceInternal::Property("Ice.HTTPProxyHost", false, 0),
-    IceInternal::Property("Ice.HTTPProxyPort", false, 0),
-    IceInternal::Property("Ice.ImplicitContext", false, 0),
-    IceInternal::Property("Ice.InitPlugins", false, 0),
-    IceInternal::Property("Ice.IPv4", false, 0),
-    IceInternal::Property("Ice.IPv6", false, 0),
-    IceInternal::Property("Ice.LogFile", false, 0),
-    IceInternal::Property("Ice.LogFile.SizeMax", false, 0),
-    IceInternal::Property("Ice.LogStdErr.Convert", false, 0),
-    IceInternal::Property("Ice.MessageSizeMax", false, 0),
-    IceInternal::Property("Ice.Nohup", false, 0),
-    IceInternal::Property("Ice.Override.CloseTimeout", false, 0),
-    IceInternal::Property("Ice.Override.Compress", false, 0),
-    IceInternal::Property("Ice.Override.ConnectTimeout", false, 0),
-    IceInternal::Property("Ice.Override.Timeout", false, 0),
-    IceInternal::Property("Ice.Override.Secure", false, 0),
-    IceInternal::Property("Ice.Package.*", false, 0),
-    IceInternal::Property("Ice.Plugin.*", false, 0),
-    IceInternal::Property("Ice.PluginLoadOrder", false, 0),
-    IceInternal::Property("Ice.PreferIPv6Address", false, 0),
-    IceInternal::Property("Ice.PreloadAssemblies", false, 0),
-    IceInternal::Property("Ice.PrintAdapterReady", false, 0),
-    IceInternal::Property("Ice.PrintProcessId", false, 0),
-    IceInternal::Property("Ice.PrintStackTraces", false, 0),
-    IceInternal::Property("Ice.ProgramName", false, 0),
-    IceInternal::Property("Ice.RetryIntervals", false, 0),
-    IceInternal::Property("Ice.ServerIdleTime", false, 0),
-    IceInternal::Property("Ice.SOCKSProxyHost", false, 0),
-    IceInternal::Property("Ice.SOCKSProxyPort", false, 0),
-    IceInternal::Property("Ice.StdErr", false, 0),
-    IceInternal::Property("Ice.StdOut", false, 0),
-    IceInternal::Property("Ice.SyslogFacility", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Client.Size", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Client.SizeMax", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Client.SizeWarn", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Client.StackSize", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Client.Serialize", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Client.ThreadIdleTime", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Client.ThreadPriority", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Server.Size", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Server.SizeMax", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Server.SizeWarn", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Server.StackSize", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Server.Serialize", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Server.ThreadIdleTime", false, 0),
-    IceInternal::Property("Ice.ThreadPool.Server.ThreadPriority", false, 0),
-    IceInternal::Property("Ice.ThreadPriority", false, 0),
-    IceInternal::Property("Ice.ToStringMode", false, 0),
-    IceInternal::Property("Ice.Trace.Admin.Properties", false, 0),
-    IceInternal::Property("Ice.Trace.Admin.Logger", false, 0),
-    IceInternal::Property("Ice.Trace.Locator", false, 0),
-    IceInternal::Property("Ice.Trace.Network", false, 0),
-    IceInternal::Property("Ice.Trace.Protocol", false, 0),
-    IceInternal::Property("Ice.Trace.Retry", false, 0),
-    IceInternal::Property("Ice.Trace.Slicing", false, 0),
-    IceInternal::Property("Ice.Trace.ThreadPool", false, 0),
-    IceInternal::Property("Ice.UDP.RcvSize", false, 0),
-    IceInternal::Property("Ice.UDP.SndSize", false, 0),
-    IceInternal::Property("Ice.TCP.Backlog", false, 0),
-    IceInternal::Property("Ice.TCP.RcvSize", false, 0),
-    IceInternal::Property("Ice.TCP.SndSize", false, 0),
-    IceInternal::Property("Ice.UseApplicationClassLoader", false, 0),
-    IceInternal::Property("Ice.UseOSLog", false, 0),
-    IceInternal::Property("Ice.UseSyslog", false, 0),
-    IceInternal::Property("Ice.UseSystemdJournal", false, 0),
-    IceInternal::Property("Ice.Warn.AMICallback", false, 0),
-    IceInternal::Property("Ice.Warn.Connections", false, 0),
-    IceInternal::Property("Ice.Warn.Datagrams", false, 0),
-    IceInternal::Property("Ice.Warn.Dispatch", false, 0),
-    IceInternal::Property("Ice.Warn.Endpoints", false, 0),
-    IceInternal::Property("Ice.Warn.UnknownProperties", false, 0),
-    IceInternal::Property("Ice.Warn.UnusedProperties", false, 0),
-    IceInternal::Property("Ice.CacheMessageBuffers", false, 0),
-    IceInternal::Property("Ice.ThreadInterruptSafe", false, 0),
+    IceInternal::Property("Ice.AcceptClassCycles", "", false, nullptr),
+    IceInternal::Property("Ice.ACM.Client", "", true, nullptr),
+    IceInternal::Property("Ice.ACM.Server", "", true, nullptr),
+    IceInternal::Property("Ice.ACM.Timeout", "", false, nullptr),
+    IceInternal::Property("Ice.ACM.Heartbeat", "", false, nullptr),
+    IceInternal::Property("Ice.ACM.Close", "", false, nullptr),
+    IceInternal::Property("Ice.ACM", "", false, nullptr),
+    IceInternal::Property("Ice.ACM.Client.Timeout", "", false, nullptr),
+    IceInternal::Property("Ice.ACM.Client.Heartbeat", "", false, nullptr),
+    IceInternal::Property("Ice.ACM.Client.Close", "", false, nullptr),
+    IceInternal::Property("Ice.ACM.Client", "", false, nullptr),
+    IceInternal::Property("Ice.ACM.Server.Timeout", "", false, nullptr),
+    IceInternal::Property("Ice.ACM.Server.Heartbeat", "", false, nullptr),
+    IceInternal::Property("Ice.ACM.Server.Close", "", false, nullptr),
+    IceInternal::Property("Ice.ACM.Server", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.ACM.Timeout", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.ACM.Heartbeat", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.ACM.Close", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.ACM", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.AdapterId", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.Connection.CloseTimeout", "10", false, nullptr),
+    IceInternal::Property("Ice.Admin.Connection.ConnectTimeout", "10", false, nullptr),
+    IceInternal::Property("Ice.Admin.Connection.EnableIdleCheck", "1", false, nullptr),
+    IceInternal::Property("Ice.Admin.Connection.IdleTimeout", "60", false, nullptr),
+    IceInternal::Property("Ice.Admin.Connection.InactivityTimeout", "300", false, nullptr),
+    IceInternal::Property("Ice.Admin.Connection", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.Endpoints", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.Locator.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.Locator.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.Locator.PreferSecure", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.Locator.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.Locator.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.Locator.Locator", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.Locator.Router", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.Locator.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.Locator.Context.*", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.Locator", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.PublishedEndpoints", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.ReplicaGroupId", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.Router.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.Router.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.Router.PreferSecure", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.Router.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.Router.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.Router.Locator", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.Router.Router", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.Router.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.Router.Context.*", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.Router", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.ProxyOptions", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.ThreadPool.Size", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.ThreadPool.SizeMax", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.ThreadPool.SizeWarn", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.ThreadPool.StackSize", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.ThreadPool.Serialize", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.ThreadPool.ThreadIdleTime", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.ThreadPool.ThreadPriority", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.MessageSizeMax", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.DelayCreation", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.Enabled", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.Facets", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.InstanceName", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.Logger.KeepLogs", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.Logger.KeepTraces", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.Logger.Properties", "", false, nullptr),
+    IceInternal::Property("Ice.Admin.ServerId", "", false, nullptr),
+    IceInternal::Property("Ice.BackgroundLocatorCacheUpdates", "", false, nullptr),
+    IceInternal::Property("Ice.BatchAutoFlush", "", true, nullptr),
+    IceInternal::Property("Ice.BatchAutoFlushSize", "", false, nullptr),
+    IceInternal::Property("Ice.ChangeUser", "", false, nullptr),
+    IceInternal::Property("Ice.ClassGraphDepthMax", "", false, nullptr),
+    IceInternal::Property("Ice.ClientAccessPolicyProtocol", "", false, nullptr),
+    IceInternal::Property("Ice.Compression.Level", "", false, nullptr),
+    IceInternal::Property("Ice.Config", "", false, nullptr),
+    IceInternal::Property("Ice.Connection.CloseTimeout", "10", false, nullptr),
+    IceInternal::Property("Ice.Connection.ConnectTimeout", "10", false, nullptr),
+    IceInternal::Property("Ice.Connection.EnableIdleCheck", "1", false, nullptr),
+    IceInternal::Property("Ice.Connection.IdleTimeout", "60", false, nullptr),
+    IceInternal::Property("Ice.Connection.InactivityTimeout", "300", false, nullptr),
+    IceInternal::Property("Ice.Connection", "", false, nullptr),
+    IceInternal::Property("Ice.ConsoleListener", "", false, nullptr),
+    IceInternal::Property("Ice.Default.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("Ice.Default.EncodingVersion", "", false, nullptr),
+    IceInternal::Property("Ice.Default.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("Ice.Default.Host", "", false, nullptr),
+    IceInternal::Property("Ice.Default.Locator.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("Ice.Default.Locator.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("Ice.Default.Locator.PreferSecure", "", false, nullptr),
+    IceInternal::Property("Ice.Default.Locator.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("Ice.Default.Locator.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("Ice.Default.Locator.Locator", "", false, nullptr),
+    IceInternal::Property("Ice.Default.Locator.Router", "", false, nullptr),
+    IceInternal::Property("Ice.Default.Locator.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("Ice.Default.Locator.Context.*", "", false, nullptr),
+    IceInternal::Property("Ice.Default.Locator", "", false, nullptr),
+    IceInternal::Property("Ice.Default.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("Ice.Default.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("Ice.Default.Package", "", false, nullptr),
+    IceInternal::Property("Ice.Default.PreferSecure", "", false, nullptr),
+    IceInternal::Property("Ice.Default.Protocol", "", false, nullptr),
+    IceInternal::Property("Ice.Default.Router.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("Ice.Default.Router.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("Ice.Default.Router.PreferSecure", "", false, nullptr),
+    IceInternal::Property("Ice.Default.Router.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("Ice.Default.Router.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("Ice.Default.Router.Locator", "", false, nullptr),
+    IceInternal::Property("Ice.Default.Router.Router", "", false, nullptr),
+    IceInternal::Property("Ice.Default.Router.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("Ice.Default.Router.Context.*", "", false, nullptr),
+    IceInternal::Property("Ice.Default.Router", "", false, nullptr),
+    IceInternal::Property("Ice.Default.SlicedFormat", "", false, nullptr),
+    IceInternal::Property("Ice.Default.SourceAddress", "", false, nullptr),
+    IceInternal::Property("Ice.Default.Timeout", "", false, nullptr),
+    IceInternal::Property("Ice.EventLog.Source", "", false, nullptr),
+    IceInternal::Property("Ice.FactoryAssemblies", "", false, nullptr),
+    IceInternal::Property("Ice.HTTPProxyHost", "", false, nullptr),
+    IceInternal::Property("Ice.HTTPProxyPort", "", false, nullptr),
+    IceInternal::Property("Ice.ImplicitContext", "", false, nullptr),
+    IceInternal::Property("Ice.InitPlugins", "", false, nullptr),
+    IceInternal::Property("Ice.IPv4", "", false, nullptr),
+    IceInternal::Property("Ice.IPv6", "", false, nullptr),
+    IceInternal::Property("Ice.LogFile", "", false, nullptr),
+    IceInternal::Property("Ice.LogFile.SizeMax", "", false, nullptr),
+    IceInternal::Property("Ice.LogStdErr.Convert", "", false, nullptr),
+    IceInternal::Property("Ice.MessageSizeMax", "", false, nullptr),
+    IceInternal::Property("Ice.Nohup", "", false, nullptr),
+    IceInternal::Property("Ice.Override.CloseTimeout", "", false, nullptr),
+    IceInternal::Property("Ice.Override.Compress", "", false, nullptr),
+    IceInternal::Property("Ice.Override.ConnectTimeout", "", false, nullptr),
+    IceInternal::Property("Ice.Override.Timeout", "", false, nullptr),
+    IceInternal::Property("Ice.Override.Secure", "", false, nullptr),
+    IceInternal::Property("Ice.Package.*", "", false, nullptr),
+    IceInternal::Property("Ice.Plugin.*", "", false, nullptr),
+    IceInternal::Property("Ice.PluginLoadOrder", "", false, nullptr),
+    IceInternal::Property("Ice.PreferIPv6Address", "", false, nullptr),
+    IceInternal::Property("Ice.PreloadAssemblies", "", false, nullptr),
+    IceInternal::Property("Ice.PrintAdapterReady", "", false, nullptr),
+    IceInternal::Property("Ice.PrintProcessId", "", false, nullptr),
+    IceInternal::Property("Ice.PrintStackTraces", "", false, nullptr),
+    IceInternal::Property("Ice.ProgramName", "", false, nullptr),
+    IceInternal::Property("Ice.RetryIntervals", "0", false, nullptr),
+    IceInternal::Property("Ice.ServerIdleTime", "", false, nullptr),
+    IceInternal::Property("Ice.SOCKSProxyHost", "", false, nullptr),
+    IceInternal::Property("Ice.SOCKSProxyPort", "", false, nullptr),
+    IceInternal::Property("Ice.StdErr", "", false, nullptr),
+    IceInternal::Property("Ice.StdOut", "", false, nullptr),
+    IceInternal::Property("Ice.SyslogFacility", "", false, nullptr),
+    IceInternal::Property("Ice.ThreadPool.Client.Size", "", false, nullptr),
+    IceInternal::Property("Ice.ThreadPool.Client.SizeMax", "", false, nullptr),
+    IceInternal::Property("Ice.ThreadPool.Client.SizeWarn", "", false, nullptr),
+    IceInternal::Property("Ice.ThreadPool.Client.StackSize", "", false, nullptr),
+    IceInternal::Property("Ice.ThreadPool.Client.Serialize", "", false, nullptr),
+    IceInternal::Property("Ice.ThreadPool.Client.ThreadIdleTime", "", false, nullptr),
+    IceInternal::Property("Ice.ThreadPool.Client.ThreadPriority", "", false, nullptr),
+    IceInternal::Property("Ice.ThreadPool.Server.Size", "", false, nullptr),
+    IceInternal::Property("Ice.ThreadPool.Server.SizeMax", "", false, nullptr),
+    IceInternal::Property("Ice.ThreadPool.Server.SizeWarn", "", false, nullptr),
+    IceInternal::Property("Ice.ThreadPool.Server.StackSize", "", false, nullptr),
+    IceInternal::Property("Ice.ThreadPool.Server.Serialize", "", false, nullptr),
+    IceInternal::Property("Ice.ThreadPool.Server.ThreadIdleTime", "", false, nullptr),
+    IceInternal::Property("Ice.ThreadPool.Server.ThreadPriority", "", false, nullptr),
+    IceInternal::Property("Ice.ThreadPriority", "", false, nullptr),
+    IceInternal::Property("Ice.ToStringMode", "Unicode", false, nullptr),
+    IceInternal::Property("Ice.Trace.Admin.Properties", "", false, nullptr),
+    IceInternal::Property("Ice.Trace.Admin.Logger", "", false, nullptr),
+    IceInternal::Property("Ice.Trace.Locator", "", false, nullptr),
+    IceInternal::Property("Ice.Trace.Network", "", false, nullptr),
+    IceInternal::Property("Ice.Trace.Protocol", "", false, nullptr),
+    IceInternal::Property("Ice.Trace.Retry", "", false, nullptr),
+    IceInternal::Property("Ice.Trace.Slicing", "", false, nullptr),
+    IceInternal::Property("Ice.Trace.ThreadPool", "", false, nullptr),
+    IceInternal::Property("Ice.UDP.RcvSize", "", false, nullptr),
+    IceInternal::Property("Ice.UDP.SndSize", "", false, nullptr),
+    IceInternal::Property("Ice.TCP.Backlog", "", false, nullptr),
+    IceInternal::Property("Ice.TCP.RcvSize", "", false, nullptr),
+    IceInternal::Property("Ice.TCP.SndSize", "", false, nullptr),
+    IceInternal::Property("Ice.UseApplicationClassLoader", "", false, nullptr),
+    IceInternal::Property("Ice.UseOSLog", "", false, nullptr),
+    IceInternal::Property("Ice.UseSyslog", "", false, nullptr),
+    IceInternal::Property("Ice.UseSystemdJournal", "", false, nullptr),
+    IceInternal::Property("Ice.Warn.AMICallback", "", false, nullptr),
+    IceInternal::Property("Ice.Warn.Connections", "", false, nullptr),
+    IceInternal::Property("Ice.Warn.Datagrams", "", false, nullptr),
+    IceInternal::Property("Ice.Warn.Dispatch", "", false, nullptr),
+    IceInternal::Property("Ice.Warn.Endpoints", "", false, nullptr),
+    IceInternal::Property("Ice.Warn.UnknownProperties", "", false, nullptr),
+    IceInternal::Property("Ice.Warn.UnusedProperties", "", false, nullptr),
+    IceInternal::Property("Ice.CacheMessageBuffers", "", false, nullptr),
+    IceInternal::Property("Ice.ThreadInterruptSafe", "", false, nullptr),
 };
 
 const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceProps(IcePropsData, sizeof(IcePropsData) / sizeof(IcePropsData[0]));
 
 const IceInternal::Property IceMXPropsData[] = {
-    IceInternal::Property("IceMX.Metrics.*.GroupBy", false, 0),
-    IceInternal::Property("IceMX.Metrics.*.Map", false, 0),
-    IceInternal::Property("IceMX.Metrics.*.RetainDetached", false, 0),
-    IceInternal::Property("IceMX.Metrics.*.Accept", false, 0),
-    IceInternal::Property("IceMX.Metrics.*.Reject", false, 0),
-    IceInternal::Property("IceMX.Metrics.*", false, 0),
+    IceInternal::Property("IceMX.Metrics.*.GroupBy", "", false, nullptr),
+    IceInternal::Property("IceMX.Metrics.*.Map", "", false, nullptr),
+    IceInternal::Property("IceMX.Metrics.*.RetainDetached", "", false, nullptr),
+    IceInternal::Property("IceMX.Metrics.*.Accept", "", false, nullptr),
+    IceInternal::Property("IceMX.Metrics.*.Reject", "", false, nullptr),
+    IceInternal::Property("IceMX.Metrics.*", "", false, nullptr),
 };
 
 const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceMXProps(IceMXPropsData, sizeof(IceMXPropsData) / sizeof(IceMXPropsData[0]));
 
 const IceInternal::Property IceDiscoveryPropsData[] = {
-    IceInternal::Property("IceDiscovery.Multicast.ACM.Timeout", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.ACM.Close", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.ACM", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.AdapterId", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Connection.CloseTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Connection.ConnectTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Connection.EnableIdleCheck", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Connection.IdleTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Connection.InactivityTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Connection", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Endpoints", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Locator.Locator", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Locator.Router", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Locator.Context.*", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Locator", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Router.Locator", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Router.Router", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Router.Context.*", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.Router", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.ProxyOptions", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceDiscovery.Multicast.MessageSizeMax", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.ACM.Timeout", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.ACM.Close", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.ACM", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.AdapterId", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Connection.CloseTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Connection.ConnectTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Connection.EnableIdleCheck", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Connection.IdleTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Connection.InactivityTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Connection", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Endpoints", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Locator.Locator", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Locator.Router", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Locator.Context.*", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Locator", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Router.Locator", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Router.Router", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Router.Context.*", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.Router", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.ProxyOptions", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceDiscovery.Reply.MessageSizeMax", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.ACM.Timeout", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.ACM.Close", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.ACM", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.AdapterId", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Connection.CloseTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Connection.ConnectTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Connection.EnableIdleCheck", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Connection.IdleTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Connection.InactivityTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Connection", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Endpoints", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Locator.Locator", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Locator.Router", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Locator.Context.*", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Locator", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Router.Locator", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Router.Router", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Router.Context.*", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.Router", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.ProxyOptions", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceDiscovery.Locator.MessageSizeMax", false, 0),
-    IceInternal::Property("IceDiscovery.Lookup", false, 0),
-    IceInternal::Property("IceDiscovery.Timeout", false, 0),
-    IceInternal::Property("IceDiscovery.RetryCount", false, 0),
-    IceInternal::Property("IceDiscovery.LatencyMultiplier", false, 0),
-    IceInternal::Property("IceDiscovery.Address", false, 0),
-    IceInternal::Property("IceDiscovery.Port", false, 0),
-    IceInternal::Property("IceDiscovery.Interface", false, 0),
-    IceInternal::Property("IceDiscovery.DomainId", false, 0),
+    IceInternal::Property("IceDiscovery.Multicast.ACM.Timeout", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.ACM.Heartbeat", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.ACM.Close", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.ACM", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.AdapterId", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.Connection.CloseTimeout", "10", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.Connection.ConnectTimeout", "10", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.Connection.EnableIdleCheck", "1", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.Connection.IdleTimeout", "60", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.Connection.InactivityTimeout", "300", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.Connection", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.Endpoints", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.Locator.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.Locator.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.Locator.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.Locator.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.Locator.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.Locator.Locator", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.Locator.Router", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.Locator.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.Locator.Context.*", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.Locator", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.PublishedEndpoints", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.ReplicaGroupId", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.Router.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.Router.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.Router.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.Router.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.Router.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.Router.Locator", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.Router.Router", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.Router.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.Router.Context.*", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.Router", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.ProxyOptions", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.ThreadPool.Size", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.ThreadPool.SizeMax", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.ThreadPool.SizeWarn", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.ThreadPool.StackSize", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.ThreadPool.Serialize", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.ThreadPool.ThreadIdleTime", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.ThreadPool.ThreadPriority", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Multicast.MessageSizeMax", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.ACM.Timeout", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.ACM.Heartbeat", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.ACM.Close", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.ACM", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.AdapterId", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.Connection.CloseTimeout", "10", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.Connection.ConnectTimeout", "10", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.Connection.EnableIdleCheck", "1", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.Connection.IdleTimeout", "60", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.Connection.InactivityTimeout", "300", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.Connection", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.Endpoints", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.Locator.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.Locator.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.Locator.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.Locator.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.Locator.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.Locator.Locator", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.Locator.Router", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.Locator.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.Locator.Context.*", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.Locator", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.PublishedEndpoints", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.ReplicaGroupId", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.Router.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.Router.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.Router.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.Router.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.Router.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.Router.Locator", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.Router.Router", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.Router.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.Router.Context.*", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.Router", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.ProxyOptions", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.ThreadPool.Size", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.ThreadPool.SizeMax", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.ThreadPool.SizeWarn", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.ThreadPool.StackSize", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.ThreadPool.Serialize", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.ThreadPool.ThreadIdleTime", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.ThreadPool.ThreadPriority", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Reply.MessageSizeMax", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.ACM.Timeout", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.ACM.Heartbeat", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.ACM.Close", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.ACM", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.AdapterId", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.Connection.CloseTimeout", "10", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.Connection.ConnectTimeout", "10", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.Connection.EnableIdleCheck", "1", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.Connection.IdleTimeout", "60", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.Connection.InactivityTimeout", "300", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.Connection", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.Endpoints", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.Locator.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.Locator.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.Locator.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.Locator.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.Locator.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.Locator.Locator", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.Locator.Router", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.Locator.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.Locator.Context.*", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.Locator", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.PublishedEndpoints", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.ReplicaGroupId", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.Router.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.Router.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.Router.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.Router.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.Router.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.Router.Locator", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.Router.Router", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.Router.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.Router.Context.*", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.Router", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.ProxyOptions", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.ThreadPool.Size", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.ThreadPool.SizeMax", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.ThreadPool.SizeWarn", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.ThreadPool.StackSize", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.ThreadPool.Serialize", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.ThreadPool.ThreadIdleTime", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.ThreadPool.ThreadPriority", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Locator.MessageSizeMax", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Lookup", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Timeout", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.RetryCount", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.LatencyMultiplier", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Address", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Port", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.Interface", "", false, nullptr),
+    IceInternal::Property("IceDiscovery.DomainId", "", false, nullptr),
 };
 
 const IceInternal::PropertyArray IceInternal::PropertyNames::IceDiscoveryProps(
@@ -359,101 +358,101 @@ const IceInternal::PropertyArray IceInternal::PropertyNames::IceDiscoveryProps(
     sizeof(IceDiscoveryPropsData) / sizeof(IceDiscoveryPropsData[0]));
 
 const IceInternal::Property IceLocatorDiscoveryPropsData[] = {
-    IceInternal::Property("IceLocatorDiscovery.Reply.ACM.Timeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.ACM.Close", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.ACM", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.AdapterId", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Connection.CloseTimeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Connection.ConnectTimeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Connection.EnableIdleCheck", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Connection.IdleTimeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Connection.InactivityTimeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Connection", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Endpoints", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.Locator", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.Router", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.Context.*", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Locator", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Router.Locator", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Router.Router", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Router.Context.*", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.Router", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.ProxyOptions", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Reply.MessageSizeMax", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.ACM.Timeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.ACM.Close", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.ACM", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.AdapterId", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Connection.CloseTimeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Connection.ConnectTimeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Connection.EnableIdleCheck", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Connection.IdleTimeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Connection.InactivityTimeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Connection", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Endpoints", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.Locator", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.Router", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.Context.*", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Locator", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Router.Locator", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Router.Router", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Router.Context.*", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.Router", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.ProxyOptions", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Locator.MessageSizeMax", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Lookup", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Timeout", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.RetryCount", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.RetryDelay", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Address", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Port", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Interface", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.InstanceName", false, 0),
-    IceInternal::Property("IceLocatorDiscovery.Trace.Lookup", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Reply.ACM.Timeout", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.ACM.Heartbeat", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.ACM.Close", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.ACM", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.AdapterId", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Connection.CloseTimeout", "10", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Connection.ConnectTimeout", "10", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Connection.EnableIdleCheck", "1", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Connection.IdleTimeout", "60", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Connection.InactivityTimeout", "300", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Connection", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Endpoints", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.Locator", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.Router", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Locator.Context.*", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Locator", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.PublishedEndpoints", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.ReplicaGroupId", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Router.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Router.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Router.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Router.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Router.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Router.Locator", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Router.Router", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Router.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Router.Context.*", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.Router", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.ProxyOptions", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.ThreadPool.Size", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.ThreadPool.SizeMax", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.ThreadPool.SizeWarn", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.ThreadPool.StackSize", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.ThreadPool.Serialize", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.ThreadPool.ThreadIdleTime", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.ThreadPool.ThreadPriority", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Reply.MessageSizeMax", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.ACM.Timeout", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.ACM.Heartbeat", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.ACM.Close", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.ACM", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.AdapterId", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Connection.CloseTimeout", "10", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Connection.ConnectTimeout", "10", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Connection.EnableIdleCheck", "1", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Connection.IdleTimeout", "60", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Connection.InactivityTimeout", "300", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Connection", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Endpoints", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.Locator", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.Router", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Locator.Context.*", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Locator", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.PublishedEndpoints", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.ReplicaGroupId", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Router.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Router.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Router.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Router.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Router.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Router.Locator", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Router.Router", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Router.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Router.Context.*", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.Router", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.ProxyOptions", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.ThreadPool.Size", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.ThreadPool.SizeMax", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.ThreadPool.SizeWarn", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.ThreadPool.StackSize", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.ThreadPool.Serialize", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.ThreadPool.ThreadIdleTime", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.ThreadPool.ThreadPriority", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Locator.MessageSizeMax", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Lookup", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Timeout", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.RetryCount", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.RetryDelay", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Address", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Port", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Interface", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.InstanceName", "", false, nullptr),
+    IceInternal::Property("IceLocatorDiscovery.Trace.Lookup", "", false, nullptr),
 };
 
 const IceInternal::PropertyArray IceInternal::PropertyNames::IceLocatorDiscoveryProps(
@@ -461,39 +460,39 @@ const IceInternal::PropertyArray IceInternal::PropertyNames::IceLocatorDiscovery
     sizeof(IceLocatorDiscoveryPropsData) / sizeof(IceLocatorDiscoveryPropsData[0]));
 
 const IceInternal::Property IceBoxPropsData[] = {
-    IceInternal::Property("IceBox.InheritProperties", false, 0),
-    IceInternal::Property("IceBox.InstanceName", true, 0),
-    IceInternal::Property("IceBox.LoadOrder", false, 0),
-    IceInternal::Property("IceBox.PrintServicesReady", false, 0),
-    IceInternal::Property("IceBox.Service.*", false, 0),
-    IceInternal::Property("IceBox.ServiceManager.AdapterId", true, 0),
-    IceInternal::Property("IceBox.ServiceManager.Endpoints", true, 0),
-    IceInternal::Property("IceBox.ServiceManager.Locator", true, 0),
-    IceInternal::Property("IceBox.ServiceManager.PublishedEndpoints", true, 0),
-    IceInternal::Property("IceBox.ServiceManager.ReplicaGroupId", true, 0),
-    IceInternal::Property("IceBox.ServiceManager.Router", true, 0),
-    IceInternal::Property("IceBox.ServiceManager.ThreadPool.Size", true, 0),
-    IceInternal::Property("IceBox.ServiceManager.ThreadPool.SizeMax", true, 0),
-    IceInternal::Property("IceBox.ServiceManager.ThreadPool.SizeWarn", true, 0),
-    IceInternal::Property("IceBox.ServiceManager.ThreadPool.StackSize", true, 0),
-    IceInternal::Property("IceBox.Trace.ServiceObserver", false, 0),
-    IceInternal::Property("IceBox.UseSharedCommunicator.*", false, 0),
+    IceInternal::Property("IceBox.InheritProperties", "", false, nullptr),
+    IceInternal::Property("IceBox.InstanceName", "", true, nullptr),
+    IceInternal::Property("IceBox.LoadOrder", "", false, nullptr),
+    IceInternal::Property("IceBox.PrintServicesReady", "", false, nullptr),
+    IceInternal::Property("IceBox.Service.*", "", false, nullptr),
+    IceInternal::Property("IceBox.ServiceManager.AdapterId", "", true, nullptr),
+    IceInternal::Property("IceBox.ServiceManager.Endpoints", "", true, nullptr),
+    IceInternal::Property("IceBox.ServiceManager.Locator", "", true, nullptr),
+    IceInternal::Property("IceBox.ServiceManager.PublishedEndpoints", "", true, nullptr),
+    IceInternal::Property("IceBox.ServiceManager.ReplicaGroupId", "", true, nullptr),
+    IceInternal::Property("IceBox.ServiceManager.Router", "", true, nullptr),
+    IceInternal::Property("IceBox.ServiceManager.ThreadPool.Size", "", true, nullptr),
+    IceInternal::Property("IceBox.ServiceManager.ThreadPool.SizeMax", "", true, nullptr),
+    IceInternal::Property("IceBox.ServiceManager.ThreadPool.SizeWarn", "", true, nullptr),
+    IceInternal::Property("IceBox.ServiceManager.ThreadPool.StackSize", "", true, nullptr),
+    IceInternal::Property("IceBox.Trace.ServiceObserver", "", false, nullptr),
+    IceInternal::Property("IceBox.UseSharedCommunicator.*", "", false, nullptr),
 };
 
 const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceBoxProps(IceBoxPropsData, sizeof(IceBoxPropsData) / sizeof(IceBoxPropsData[0]));
 
 const IceInternal::Property IceBoxAdminPropsData[] = {
-    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.EndpointSelection", false, 0),
-    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.ConnectionCached", false, 0),
-    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.PreferSecure", false, 0),
-    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.InvocationTimeout", false, 0),
-    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.Locator", false, 0),
-    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.Router", false, 0),
-    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.CollocationOptimized", false, 0),
-    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.Context.*", false, 0),
-    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy", false, 0),
+    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.Locator", "", false, nullptr),
+    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.Router", "", false, nullptr),
+    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy.Context.*", "", false, nullptr),
+    IceInternal::Property("IceBoxAdmin.ServiceManager.Proxy", "", false, nullptr),
 };
 
 const IceInternal::PropertyArray IceInternal::PropertyNames::IceBoxAdminProps(
@@ -501,51 +500,51 @@ const IceInternal::PropertyArray IceInternal::PropertyNames::IceBoxAdminProps(
     sizeof(IceBoxAdminPropsData) / sizeof(IceBoxAdminPropsData[0]));
 
 const IceInternal::Property IceBridgePropsData[] = {
-    IceInternal::Property("IceBridge.Source.ACM.Timeout", false, 0),
-    IceInternal::Property("IceBridge.Source.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceBridge.Source.ACM.Close", false, 0),
-    IceInternal::Property("IceBridge.Source.ACM", false, 0),
-    IceInternal::Property("IceBridge.Source.AdapterId", false, 0),
-    IceInternal::Property("IceBridge.Source.Connection.CloseTimeout", false, 0),
-    IceInternal::Property("IceBridge.Source.Connection.ConnectTimeout", false, 0),
-    IceInternal::Property("IceBridge.Source.Connection.EnableIdleCheck", false, 0),
-    IceInternal::Property("IceBridge.Source.Connection.IdleTimeout", false, 0),
-    IceInternal::Property("IceBridge.Source.Connection.InactivityTimeout", false, 0),
-    IceInternal::Property("IceBridge.Source.Connection", false, 0),
-    IceInternal::Property("IceBridge.Source.Endpoints", false, 0),
-    IceInternal::Property("IceBridge.Source.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceBridge.Source.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceBridge.Source.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceBridge.Source.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceBridge.Source.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceBridge.Source.Locator.Locator", false, 0),
-    IceInternal::Property("IceBridge.Source.Locator.Router", false, 0),
-    IceInternal::Property("IceBridge.Source.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceBridge.Source.Locator.Context.*", false, 0),
-    IceInternal::Property("IceBridge.Source.Locator", false, 0),
-    IceInternal::Property("IceBridge.Source.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceBridge.Source.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceBridge.Source.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceBridge.Source.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceBridge.Source.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceBridge.Source.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceBridge.Source.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceBridge.Source.Router.Locator", false, 0),
-    IceInternal::Property("IceBridge.Source.Router.Router", false, 0),
-    IceInternal::Property("IceBridge.Source.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceBridge.Source.Router.Context.*", false, 0),
-    IceInternal::Property("IceBridge.Source.Router", false, 0),
-    IceInternal::Property("IceBridge.Source.ProxyOptions", false, 0),
-    IceInternal::Property("IceBridge.Source.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceBridge.Source.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceBridge.Source.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceBridge.Source.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceBridge.Source.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceBridge.Source.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceBridge.Source.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceBridge.Source.MessageSizeMax", false, 0),
-    IceInternal::Property("IceBridge.Target.Endpoints", false, 0),
-    IceInternal::Property("IceBridge.InstanceName", false, 0),
+    IceInternal::Property("IceBridge.Source.ACM.Timeout", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.ACM.Heartbeat", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.ACM.Close", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.ACM", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.AdapterId", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.Connection.CloseTimeout", "10", false, nullptr),
+    IceInternal::Property("IceBridge.Source.Connection.ConnectTimeout", "10", false, nullptr),
+    IceInternal::Property("IceBridge.Source.Connection.EnableIdleCheck", "1", false, nullptr),
+    IceInternal::Property("IceBridge.Source.Connection.IdleTimeout", "60", false, nullptr),
+    IceInternal::Property("IceBridge.Source.Connection.InactivityTimeout", "300", false, nullptr),
+    IceInternal::Property("IceBridge.Source.Connection", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.Endpoints", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.Locator.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.Locator.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.Locator.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.Locator.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.Locator.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.Locator.Locator", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.Locator.Router", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.Locator.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.Locator.Context.*", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.Locator", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.PublishedEndpoints", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.ReplicaGroupId", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.Router.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.Router.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.Router.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.Router.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.Router.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.Router.Locator", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.Router.Router", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.Router.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.Router.Context.*", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.Router", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.ProxyOptions", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.ThreadPool.Size", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.ThreadPool.SizeMax", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.ThreadPool.SizeWarn", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.ThreadPool.StackSize", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.ThreadPool.Serialize", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.ThreadPool.ThreadIdleTime", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.ThreadPool.ThreadPriority", "", false, nullptr),
+    IceInternal::Property("IceBridge.Source.MessageSizeMax", "", false, nullptr),
+    IceInternal::Property("IceBridge.Target.Endpoints", "", false, nullptr),
+    IceInternal::Property("IceBridge.InstanceName", "", false, nullptr),
 };
 
 const IceInternal::PropertyArray IceInternal::PropertyNames::IceBridgeProps(
@@ -553,148 +552,148 @@ const IceInternal::PropertyArray IceInternal::PropertyNames::IceBridgeProps(
     sizeof(IceBridgePropsData) / sizeof(IceBridgePropsData[0]));
 
 const IceInternal::Property IceGridAdminPropsData[] = {
-    IceInternal::Property("IceGridAdmin.AuthenticateUsingSSL", false, 0),
-    IceInternal::Property("IceGridAdmin.MetricsConfig", false, 0),
-    IceInternal::Property("IceGridAdmin.Username", false, 0),
-    IceInternal::Property("IceGridAdmin.Password", false, 0),
-    IceInternal::Property("IceGridAdmin.Replica", false, 0),
-    IceInternal::Property("IceGridAdmin.Host", false, 0),
-    IceInternal::Property("IceGridAdmin.Port", false, 0),
-    IceInternal::Property("IceGridAdmin.InstanceName", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.ACM.Timeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.ACM.Close", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.ACM", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.AdapterId", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Connection.CloseTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Connection.ConnectTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Connection.EnableIdleCheck", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Connection.IdleTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Connection.InactivityTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Connection", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Endpoints", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Locator.Locator", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Locator.Router", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Locator.Context.*", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Locator", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Router.Locator", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Router.Router", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Router.Context.*", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.Router", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.ProxyOptions", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceGridAdmin.Server.MessageSizeMax", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Address", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Interface", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Lookup", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.ACM.Timeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.ACM.Close", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.ACM", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.AdapterId", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Connection.CloseTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Connection.ConnectTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Connection.EnableIdleCheck", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Connection.IdleTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Connection.InactivityTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Connection", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Endpoints", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator.Locator", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator.Router", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator.Context.*", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router.Locator", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router.Router", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router.Context.*", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.ProxyOptions", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Reply.MessageSizeMax", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.ACM.Timeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.ACM.Close", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.ACM", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.AdapterId", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Connection.CloseTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Connection.ConnectTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Connection.EnableIdleCheck", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Connection.IdleTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Connection.InactivityTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Connection", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Endpoints", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.Locator", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.Router", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.Context.*", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.Locator", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.Router", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.Context.*", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.ProxyOptions", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceGridAdmin.Discovery.Locator.MessageSizeMax", false, 0),
-    IceInternal::Property("IceGridAdmin.Trace.Observers", false, 0),
-    IceInternal::Property("IceGridAdmin.Trace.SaveToRegistry", false, 0),
+    IceInternal::Property("IceGridAdmin.AuthenticateUsingSSL", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.MetricsConfig", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Username", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Password", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Replica", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Host", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Port", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.InstanceName", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.ACM.Timeout", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.ACM.Heartbeat", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.ACM.Close", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.ACM", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.AdapterId", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.Connection.CloseTimeout", "10", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.Connection.ConnectTimeout", "10", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.Connection.EnableIdleCheck", "1", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.Connection.IdleTimeout", "60", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.Connection.InactivityTimeout", "300", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.Connection", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.Endpoints", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.Locator.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.Locator.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.Locator.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.Locator.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.Locator.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.Locator.Locator", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.Locator.Router", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.Locator.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.Locator.Context.*", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.Locator", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.PublishedEndpoints", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.ReplicaGroupId", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.Router.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.Router.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.Router.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.Router.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.Router.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.Router.Locator", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.Router.Router", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.Router.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.Router.Context.*", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.Router", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.ProxyOptions", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.ThreadPool.Size", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.ThreadPool.SizeMax", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.ThreadPool.SizeWarn", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.ThreadPool.StackSize", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.ThreadPool.Serialize", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.ThreadPool.ThreadIdleTime", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.ThreadPool.ThreadPriority", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Server.MessageSizeMax", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Address", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Interface", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Lookup", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.ACM.Timeout", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.ACM.Heartbeat", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.ACM.Close", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.ACM", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.AdapterId", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.Connection.CloseTimeout", "10", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.Connection.ConnectTimeout", "10", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.Connection.EnableIdleCheck", "1", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.Connection.IdleTimeout", "60", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.Connection.InactivityTimeout", "300", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.Connection", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.Endpoints", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator.Locator", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator.Router", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator.Context.*", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.Locator", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.PublishedEndpoints", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.ReplicaGroupId", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router.Locator", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router.Router", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router.Context.*", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.Router", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.ProxyOptions", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.ThreadPool.Size", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.ThreadPool.SizeMax", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.ThreadPool.SizeWarn", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.ThreadPool.StackSize", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.ThreadPool.Serialize", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.ThreadPool.ThreadIdleTime", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.ThreadPool.ThreadPriority", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Reply.MessageSizeMax", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.ACM.Timeout", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.ACM.Heartbeat", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.ACM.Close", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.ACM", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.AdapterId", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Connection.CloseTimeout", "10", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Connection.ConnectTimeout", "10", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Connection.EnableIdleCheck", "1", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Connection.IdleTimeout", "60", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Connection.InactivityTimeout", "300", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Connection", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Endpoints", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.Locator", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.Router", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.Context.*", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.PublishedEndpoints", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.ReplicaGroupId", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.Locator", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.Router", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.Context.*", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.ProxyOptions", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.ThreadPool.Size", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.ThreadPool.SizeMax", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.ThreadPool.SizeWarn", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.ThreadPool.StackSize", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.ThreadPool.Serialize", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.ThreadPool.ThreadIdleTime", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.ThreadPool.ThreadPriority", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.MessageSizeMax", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Trace.Observers", "", false, nullptr),
+    IceInternal::Property("IceGridAdmin.Trace.SaveToRegistry", "", false, nullptr),
 };
 
 const IceInternal::PropertyArray IceInternal::PropertyNames::IceGridAdminProps(
@@ -702,495 +701,495 @@ const IceInternal::PropertyArray IceInternal::PropertyNames::IceGridAdminProps(
     sizeof(IceGridAdminPropsData) / sizeof(IceGridAdminPropsData[0]));
 
 const IceInternal::Property IceGridPropsData[] = {
-    IceInternal::Property("IceGrid.AdminRouter.ACM.Timeout", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.ACM.Close", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.ACM", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.AdapterId", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Connection.CloseTimeout", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Connection.ConnectTimeout", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Connection.EnableIdleCheck", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Connection.IdleTimeout", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Connection.InactivityTimeout", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Connection", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Endpoints", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Locator.Locator", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Locator.Router", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Locator.Context.*", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Locator", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Router.Locator", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Router.Router", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Router.Context.*", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.Router", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.ProxyOptions", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceGrid.AdminRouter.MessageSizeMax", false, 0),
-    IceInternal::Property("IceGrid.InstanceName", false, 0),
-    IceInternal::Property("IceGrid.Node.ACM.Timeout", false, 0),
-    IceInternal::Property("IceGrid.Node.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceGrid.Node.ACM.Close", false, 0),
-    IceInternal::Property("IceGrid.Node.ACM", false, 0),
-    IceInternal::Property("IceGrid.Node.AdapterId", false, 0),
-    IceInternal::Property("IceGrid.Node.Connection.CloseTimeout", false, 0),
-    IceInternal::Property("IceGrid.Node.Connection.ConnectTimeout", false, 0),
-    IceInternal::Property("IceGrid.Node.Connection.EnableIdleCheck", false, 0),
-    IceInternal::Property("IceGrid.Node.Connection.IdleTimeout", false, 0),
-    IceInternal::Property("IceGrid.Node.Connection.InactivityTimeout", false, 0),
-    IceInternal::Property("IceGrid.Node.Connection", false, 0),
-    IceInternal::Property("IceGrid.Node.Endpoints", false, 0),
-    IceInternal::Property("IceGrid.Node.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Node.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Node.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Node.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Node.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Node.Locator.Locator", false, 0),
-    IceInternal::Property("IceGrid.Node.Locator.Router", false, 0),
-    IceInternal::Property("IceGrid.Node.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Node.Locator.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Node.Locator", false, 0),
-    IceInternal::Property("IceGrid.Node.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGrid.Node.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceGrid.Node.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Node.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Node.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Node.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Node.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Node.Router.Locator", false, 0),
-    IceInternal::Property("IceGrid.Node.Router.Router", false, 0),
-    IceInternal::Property("IceGrid.Node.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Node.Router.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Node.Router", false, 0),
-    IceInternal::Property("IceGrid.Node.ProxyOptions", false, 0),
-    IceInternal::Property("IceGrid.Node.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGrid.Node.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGrid.Node.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGrid.Node.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGrid.Node.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceGrid.Node.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceGrid.Node.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceGrid.Node.MessageSizeMax", false, 0),
-    IceInternal::Property("IceGrid.Node.AllowRunningServersAsRoot", false, 0),
-    IceInternal::Property("IceGrid.Node.AllowEndpointsOverride", false, 0),
-    IceInternal::Property("IceGrid.Node.CollocateRegistry", false, 0),
-    IceInternal::Property("IceGrid.Node.Data", false, 0),
-    IceInternal::Property("IceGrid.Node.DisableOnFailure", false, 0),
-    IceInternal::Property("IceGrid.Node.Name", false, 0),
-    IceInternal::Property("IceGrid.Node.Output", false, 0),
-    IceInternal::Property("IceGrid.Node.ProcessorSocketCount", false, 0),
-    IceInternal::Property("IceGrid.Node.PrintServersReady", false, 0),
-    IceInternal::Property("IceGrid.Node.PropertiesOverride", false, 0),
-    IceInternal::Property("IceGrid.Node.RedirectErrToOut", false, 0),
-    IceInternal::Property("IceGrid.Node.Trace.Activator", false, 0),
-    IceInternal::Property("IceGrid.Node.Trace.Adapter", false, 0),
-    IceInternal::Property("IceGrid.Node.Trace.Admin", false, 0),
-    IceInternal::Property("IceGrid.Node.Trace.Patch", false, 0),
-    IceInternal::Property("IceGrid.Node.Trace.Replica", false, 0),
-    IceInternal::Property("IceGrid.Node.Trace.Server", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccounts", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper.Locator", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper.Router", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Node.UserAccountMapper", false, 0),
-    IceInternal::Property("IceGrid.Node.WaitTime", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminCryptPasswords", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionFilters", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ACM.Timeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ACM.Close", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ACM", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.AdapterId", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Connection.CloseTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Connection.ConnectTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Connection.EnableIdleCheck", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Connection.IdleTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Connection.InactivityTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Connection", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Endpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ProxyOptions", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSessionManager.MessageSizeMax", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ACM.Timeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ACM.Close", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ACM", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.AdapterId", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Connection.CloseTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Connection.ConnectTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Connection.EnableIdleCheck", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Connection.IdleTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Connection.InactivityTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Connection", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Endpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Locator.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Locator.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Locator.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Router.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Router.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Router.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ProxyOptions", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceGrid.Registry.Client.MessageSizeMax", false, 0),
-    IceInternal::Property("IceGrid.Registry.CryptPasswords", false, 0),
-    IceInternal::Property("IceGrid.Registry.DefaultTemplates", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.ACM.Timeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.ACM.Close", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.ACM", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.AdapterId", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Connection.CloseTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Connection.ConnectTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Connection.EnableIdleCheck", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Connection.IdleTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Connection.InactivityTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Connection", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Endpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Locator.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Locator.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Locator.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Router.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Router.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Router.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.ProxyOptions", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.MessageSizeMax", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Enabled", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Address", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Port", false, 0),
-    IceInternal::Property("IceGrid.Registry.Discovery.Interface", false, 0),
-    IceInternal::Property("IceGrid.Registry.DynamicRegistration", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ACM.Timeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ACM.Close", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ACM", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.AdapterId", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Connection.CloseTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Connection.ConnectTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Connection.EnableIdleCheck", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Connection.IdleTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Connection.InactivityTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Connection", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Endpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Locator.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Locator.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Locator.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Router.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Router.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Router.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ProxyOptions", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceGrid.Registry.Internal.MessageSizeMax", false, 0),
-    IceInternal::Property("IceGrid.Registry.LMDB.MapSize", false, 0),
-    IceInternal::Property("IceGrid.Registry.LMDB.Path", false, 0),
-    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.PermissionsVerifier", false, 0),
-    IceInternal::Property("IceGrid.Registry.ReplicaName", false, 0),
-    IceInternal::Property("IceGrid.Registry.RequireNodeCertCN", false, 0),
-    IceInternal::Property("IceGrid.Registry.RequireReplicaCertCN", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ACM.Timeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ACM.Close", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ACM", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.AdapterId", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Connection.CloseTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Connection.ConnectTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Connection.EnableIdleCheck", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Connection.IdleTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Connection.InactivityTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Connection", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Endpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Locator.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Locator.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Locator.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Router.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Router.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Router.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ProxyOptions", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceGrid.Registry.Server.MessageSizeMax", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionFilters", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ACM.Timeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ACM.Heartbeat", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ACM.Close", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ACM", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.AdapterId", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Connection.CloseTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Connection.ConnectTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Connection.EnableIdleCheck", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Connection.IdleTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Connection.InactivityTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Connection", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Endpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Locator.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Locator.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Locator.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Locator.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.PublishedEndpoints", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ReplicaGroupId", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Router.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Router.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Router.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Router.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Router.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Router.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ProxyOptions", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.Size", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("IceGrid.Registry.SessionManager.MessageSizeMax", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.EndpointSelection", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.ConnectionCached", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.PreferSecure", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.InvocationTimeout", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.Router", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.CollocationOptimized", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.Context.*", false, 0),
-    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Admin", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Application", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Adapter", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Discovery", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Locator", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Node", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Object", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Patch", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Replica", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Server", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Session", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Subscriber", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.Topic", false, 0),
-    IceInternal::Property("IceGrid.Registry.Trace.TopicManager", false, 0),
-    IceInternal::Property("IceGrid.Registry.UserAccounts", false, 0),
+    IceInternal::Property("IceGrid.AdminRouter.ACM.Timeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.ACM.Heartbeat", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.ACM.Close", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.ACM", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.AdapterId", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.Connection.CloseTimeout", "10", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.Connection.ConnectTimeout", "10", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.Connection.EnableIdleCheck", "1", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.Connection.IdleTimeout", "60", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.Connection.InactivityTimeout", "300", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.Connection", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.Endpoints", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.Locator.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.Locator.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.Locator.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.Locator.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.Locator.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.Locator.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.Locator.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.Locator.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.Locator.Context.*", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.PublishedEndpoints", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.ReplicaGroupId", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.Router.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.Router.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.Router.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.Router.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.Router.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.Router.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.Router.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.Router.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.Router.Context.*", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.ProxyOptions", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.ThreadPool.Size", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.ThreadPool.SizeMax", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.ThreadPool.SizeWarn", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.ThreadPool.StackSize", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.ThreadPool.Serialize", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.ThreadPool.ThreadIdleTime", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.ThreadPool.ThreadPriority", "", false, nullptr),
+    IceInternal::Property("IceGrid.AdminRouter.MessageSizeMax", "", false, nullptr),
+    IceInternal::Property("IceGrid.InstanceName", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.ACM.Timeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.ACM.Heartbeat", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.ACM.Close", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.ACM", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.AdapterId", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Connection.CloseTimeout", "10", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Connection.ConnectTimeout", "10", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Connection.EnableIdleCheck", "1", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Connection.IdleTimeout", "60", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Connection.InactivityTimeout", "300", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Connection", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Endpoints", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Locator.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Locator.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Locator.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Locator.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Locator.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Locator.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Locator.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Locator.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Locator.Context.*", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.PublishedEndpoints", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.ReplicaGroupId", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Router.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Router.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Router.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Router.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Router.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Router.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Router.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Router.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Router.Context.*", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.ProxyOptions", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.ThreadPool.Size", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.ThreadPool.SizeMax", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.ThreadPool.SizeWarn", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.ThreadPool.StackSize", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.ThreadPool.Serialize", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.ThreadPool.ThreadIdleTime", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.ThreadPool.ThreadPriority", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.MessageSizeMax", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.AllowRunningServersAsRoot", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.AllowEndpointsOverride", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.CollocateRegistry", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Data", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.DisableOnFailure", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Name", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Output", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.ProcessorSocketCount", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.PrintServersReady", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.PropertiesOverride", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.RedirectErrToOut", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Trace.Activator", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Trace.Adapter", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Trace.Admin", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Trace.Patch", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Trace.Replica", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.Trace.Server", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.UserAccounts", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.UserAccountMapper.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.UserAccountMapper.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.UserAccountMapper.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.UserAccountMapper.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.UserAccountMapper.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.UserAccountMapper.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.UserAccountMapper.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.UserAccountMapper.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.UserAccountMapper.Context.*", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.UserAccountMapper", "", false, nullptr),
+    IceInternal::Property("IceGrid.Node.WaitTime", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminCryptPasswords", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier.Context.*", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminPermissionsVerifier", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionFilters", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ACM.Timeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ACM.Heartbeat", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ACM.Close", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ACM", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.AdapterId", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Connection.CloseTimeout", "10", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Connection.ConnectTimeout", "10", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Connection.EnableIdleCheck", "1", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Connection.IdleTimeout", "60", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Connection.InactivityTimeout", "300", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Connection", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Endpoints", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator.Context.*", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.PublishedEndpoints", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ReplicaGroupId", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router.Context.*", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ProxyOptions", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ThreadPool.Size", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ThreadPool.SizeMax", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ThreadPool.SizeWarn", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ThreadPool.StackSize", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ThreadPool.Serialize", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ThreadPool.ThreadIdleTime", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.ThreadPool.ThreadPriority", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSessionManager.MessageSizeMax", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier.Context.*", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.AdminSSLPermissionsVerifier", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.ACM.Timeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.ACM.Heartbeat", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.ACM.Close", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.ACM", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.AdapterId", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.Connection.CloseTimeout", "10", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.Connection.ConnectTimeout", "10", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.Connection.EnableIdleCheck", "1", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.Connection.IdleTimeout", "60", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.Connection.InactivityTimeout", "300", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.Connection", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.Endpoints", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.Locator.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.Locator.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.Locator.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.Locator.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.Locator.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.Locator.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.Locator.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.Locator.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.Locator.Context.*", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.PublishedEndpoints", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.ReplicaGroupId", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.Router.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.Router.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.Router.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.Router.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.Router.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.Router.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.Router.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.Router.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.Router.Context.*", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.ProxyOptions", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.Size", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.SizeMax", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.SizeWarn", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.StackSize", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.Serialize", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.ThreadIdleTime", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.ThreadPool.ThreadPriority", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Client.MessageSizeMax", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.CryptPasswords", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.DefaultTemplates", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.ACM.Timeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.ACM.Heartbeat", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.ACM.Close", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.ACM", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.AdapterId", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Connection.CloseTimeout", "10", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Connection.ConnectTimeout", "10", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Connection.EnableIdleCheck", "1", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Connection.IdleTimeout", "60", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Connection.InactivityTimeout", "300", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Connection", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Endpoints", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Locator.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Locator.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Locator.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Locator.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Locator.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Locator.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Locator.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Locator.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Locator.Context.*", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.PublishedEndpoints", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.ReplicaGroupId", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Router.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Router.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Router.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Router.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Router.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Router.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Router.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Router.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Router.Context.*", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.ProxyOptions", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.ThreadPool.Size", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.ThreadPool.SizeMax", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.ThreadPool.SizeWarn", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.ThreadPool.StackSize", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.ThreadPool.Serialize", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.ThreadPool.ThreadIdleTime", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.ThreadPool.ThreadPriority", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.MessageSizeMax", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Enabled", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Address", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Port", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Discovery.Interface", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.DynamicRegistration", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.ACM.Timeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.ACM.Heartbeat", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.ACM.Close", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.ACM", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.AdapterId", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.Connection.CloseTimeout", "10", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.Connection.ConnectTimeout", "10", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.Connection.EnableIdleCheck", "1", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.Connection.IdleTimeout", "60", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.Connection.InactivityTimeout", "300", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.Connection", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.Endpoints", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.Locator.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.Locator.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.Locator.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.Locator.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.Locator.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.Locator.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.Locator.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.Locator.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.Locator.Context.*", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.PublishedEndpoints", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.ReplicaGroupId", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.Router.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.Router.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.Router.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.Router.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.Router.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.Router.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.Router.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.Router.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.Router.Context.*", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.ProxyOptions", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.Size", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.SizeMax", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.SizeWarn", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.StackSize", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.Serialize", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.ThreadIdleTime", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.ThreadPriority", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Internal.MessageSizeMax", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.LMDB.MapSize", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.LMDB.Path", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.PermissionsVerifier.Context.*", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.PermissionsVerifier", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.ReplicaName", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.RequireNodeCertCN", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.RequireReplicaCertCN", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.ACM.Timeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.ACM.Heartbeat", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.ACM.Close", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.ACM", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.AdapterId", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.Connection.CloseTimeout", "10", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.Connection.ConnectTimeout", "10", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.Connection.EnableIdleCheck", "1", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.Connection.IdleTimeout", "60", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.Connection.InactivityTimeout", "300", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.Connection", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.Endpoints", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.Locator.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.Locator.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.Locator.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.Locator.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.Locator.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.Locator.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.Locator.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.Locator.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.Locator.Context.*", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.PublishedEndpoints", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.ReplicaGroupId", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.Router.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.Router.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.Router.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.Router.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.Router.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.Router.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.Router.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.Router.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.Router.Context.*", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.ProxyOptions", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.Size", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.SizeMax", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.SizeWarn", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.StackSize", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.Serialize", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.ThreadIdleTime", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.ThreadPool.ThreadPriority", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Server.MessageSizeMax", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionFilters", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.ACM.Timeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.ACM.Heartbeat", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.ACM.Close", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.ACM", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.AdapterId", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.Connection.CloseTimeout", "10", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.Connection.ConnectTimeout", "10", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.Connection.EnableIdleCheck", "1", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.Connection.IdleTimeout", "60", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.Connection.InactivityTimeout", "300", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.Connection", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.Endpoints", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.Locator.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.Locator.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.Locator.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.Locator.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.Locator.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.Locator.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.Locator.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.Locator.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.Locator.Context.*", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.PublishedEndpoints", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.ReplicaGroupId", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.Router.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.Router.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.Router.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.Router.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.Router.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.Router.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.Router.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.Router.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.Router.Context.*", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.ProxyOptions", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.Size", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.SizeMax", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.SizeWarn", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.StackSize", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.Serialize", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.ThreadIdleTime", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.ThreadPool.ThreadPriority", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SessionManager.MessageSizeMax", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.PreferSecure", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.Router", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.Context.*", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Trace.Admin", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Trace.Application", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Trace.Adapter", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Trace.Discovery", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Trace.Locator", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Trace.Node", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Trace.Object", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Trace.Patch", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Trace.Replica", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Trace.Server", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Trace.Session", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Trace.Subscriber", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Trace.Topic", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.Trace.TopicManager", "", false, nullptr),
+    IceInternal::Property("IceGrid.Registry.UserAccounts", "", false, nullptr),
 };
 
 const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceGridProps(IceGridPropsData, sizeof(IceGridPropsData) / sizeof(IceGridPropsData[0]));
 
 const IceInternal::Property IceSSLPropsData[] = {
-    IceInternal::Property("IceSSL.Alias", false, 0),
-    IceInternal::Property("IceSSL.CAs", false, 0),
-    IceInternal::Property("IceSSL.CertStore", false, 0),
-    IceInternal::Property("IceSSL.CertStoreLocation", false, 0),
-    IceInternal::Property("IceSSL.CertFile", false, 0),
-    IceInternal::Property("IceSSL.CheckCertName", false, 0),
-    IceInternal::Property("IceSSL.CheckCRL", false, 0),
-    IceInternal::Property("IceSSL.CertificateRevocationListFiles", false, 0),
-    IceInternal::Property("IceSSL.DefaultDir", false, 0),
-    IceInternal::Property("IceSSL.FindCert", false, 0),
-    IceInternal::Property("IceSSL.KeyFile", false, 0),
-    IceInternal::Property("IceSSL.Keychain", false, 0),
-    IceInternal::Property("IceSSL.KeychainPassword", false, 0),
-    IceInternal::Property("IceSSL.Keystore", false, 0),
-    IceInternal::Property("IceSSL.KeystorePassword", false, 0),
-    IceInternal::Property("IceSSL.KeystoreType", false, 0),
-    IceInternal::Property("IceSSL.Password", false, 0),
-    IceInternal::Property("IceSSL.RevocationCheck", false, 0),
-    IceInternal::Property("IceSSL.RevocationCheckCacheOnly", false, 0),
-    IceInternal::Property("IceSSL.SchannelStrongCrypto", false, 0),
-    IceInternal::Property("IceSSL.Trace.Security", false, 0),
-    IceInternal::Property("IceSSL.TrustOnly", false, 0),
-    IceInternal::Property("IceSSL.TrustOnly.Client", false, 0),
-    IceInternal::Property("IceSSL.TrustOnly.Server", false, 0),
-    IceInternal::Property("IceSSL.TrustOnly.Server.*", false, 0),
-    IceInternal::Property("IceSSL.Truststore", false, 0),
-    IceInternal::Property("IceSSL.TruststorePassword", false, 0),
-    IceInternal::Property("IceSSL.TruststoreType", false, 0),
-    IceInternal::Property("IceSSL.UsePlatformCAs", false, 0),
-    IceInternal::Property("IceSSL.VerifyPeer", false, 0),
+    IceInternal::Property("IceSSL.Alias", "", false, nullptr),
+    IceInternal::Property("IceSSL.CAs", "", false, nullptr),
+    IceInternal::Property("IceSSL.CertStore", "", false, nullptr),
+    IceInternal::Property("IceSSL.CertStoreLocation", "", false, nullptr),
+    IceInternal::Property("IceSSL.CertFile", "", false, nullptr),
+    IceInternal::Property("IceSSL.CheckCertName", "", false, nullptr),
+    IceInternal::Property("IceSSL.CheckCRL", "", false, nullptr),
+    IceInternal::Property("IceSSL.CertificateRevocationListFiles", "", false, nullptr),
+    IceInternal::Property("IceSSL.DefaultDir", "", false, nullptr),
+    IceInternal::Property("IceSSL.FindCert", "", false, nullptr),
+    IceInternal::Property("IceSSL.KeyFile", "", false, nullptr),
+    IceInternal::Property("IceSSL.Keychain", "", false, nullptr),
+    IceInternal::Property("IceSSL.KeychainPassword", "", false, nullptr),
+    IceInternal::Property("IceSSL.Keystore", "", false, nullptr),
+    IceInternal::Property("IceSSL.KeystorePassword", "", false, nullptr),
+    IceInternal::Property("IceSSL.KeystoreType", "", false, nullptr),
+    IceInternal::Property("IceSSL.Password", "", false, nullptr),
+    IceInternal::Property("IceSSL.RevocationCheck", "", false, nullptr),
+    IceInternal::Property("IceSSL.RevocationCheckCacheOnly", "", false, nullptr),
+    IceInternal::Property("IceSSL.SchannelStrongCrypto", "", false, nullptr),
+    IceInternal::Property("IceSSL.Trace.Security", "", false, nullptr),
+    IceInternal::Property("IceSSL.TrustOnly", "", false, nullptr),
+    IceInternal::Property("IceSSL.TrustOnly.Client", "", false, nullptr),
+    IceInternal::Property("IceSSL.TrustOnly.Server", "", false, nullptr),
+    IceInternal::Property("IceSSL.TrustOnly.Server.*", "", false, nullptr),
+    IceInternal::Property("IceSSL.Truststore", "", false, nullptr),
+    IceInternal::Property("IceSSL.TruststorePassword", "", false, nullptr),
+    IceInternal::Property("IceSSL.TruststoreType", "", false, nullptr),
+    IceInternal::Property("IceSSL.UsePlatformCAs", "", false, nullptr),
+    IceInternal::Property("IceSSL.VerifyPeer", "", false, nullptr),
 };
 
 const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceSSLProps(IceSSLPropsData, sizeof(IceSSLPropsData) / sizeof(IceSSLPropsData[0]));
 
 const IceInternal::Property IceStormAdminPropsData[] = {
-    IceInternal::Property("IceStormAdmin.TopicManager.*", false, 0),
-    IceInternal::Property("IceStormAdmin.Host", false, 0),
-    IceInternal::Property("IceStormAdmin.Port", false, 0),
+    IceInternal::Property("IceStormAdmin.TopicManager.*", "", false, nullptr),
+    IceInternal::Property("IceStormAdmin.Host", "", false, nullptr),
+    IceInternal::Property("IceStormAdmin.Port", "", false, nullptr),
 };
 
 const IceInternal::PropertyArray IceInternal::PropertyNames::IceStormAdminProps(
@@ -1198,165 +1197,165 @@ const IceInternal::PropertyArray IceInternal::PropertyNames::IceStormAdminProps(
     sizeof(IceStormAdminPropsData) / sizeof(IceStormAdminPropsData[0]));
 
 const IceInternal::Property IceBTPropsData[] = {
-    IceInternal::Property("IceBT.RcvSize", false, 0),
-    IceInternal::Property("IceBT.SndSize", false, 0),
+    IceInternal::Property("IceBT.RcvSize", "", false, nullptr),
+    IceInternal::Property("IceBT.SndSize", "", false, nullptr),
 };
 
 const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceBTProps(IceBTPropsData, sizeof(IceBTPropsData) / sizeof(IceBTPropsData[0]));
 
 const IceInternal::Property Glacier2PropsData[] = {
-    IceInternal::Property("Glacier2.AddConnectionContext", false, 0),
-    IceInternal::Property("Glacier2.Client.ACM.Timeout", false, 0),
-    IceInternal::Property("Glacier2.Client.ACM.Heartbeat", false, 0),
-    IceInternal::Property("Glacier2.Client.ACM.Close", false, 0),
-    IceInternal::Property("Glacier2.Client.ACM", false, 0),
-    IceInternal::Property("Glacier2.Client.AdapterId", false, 0),
-    IceInternal::Property("Glacier2.Client.Connection.CloseTimeout", false, 0),
-    IceInternal::Property("Glacier2.Client.Connection.ConnectTimeout", false, 0),
-    IceInternal::Property("Glacier2.Client.Connection.EnableIdleCheck", false, 0),
-    IceInternal::Property("Glacier2.Client.Connection.IdleTimeout", false, 0),
-    IceInternal::Property("Glacier2.Client.Connection.InactivityTimeout", false, 0),
-    IceInternal::Property("Glacier2.Client.Connection", false, 0),
-    IceInternal::Property("Glacier2.Client.Endpoints", false, 0),
-    IceInternal::Property("Glacier2.Client.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("Glacier2.Client.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("Glacier2.Client.Locator.PreferSecure", false, 0),
-    IceInternal::Property("Glacier2.Client.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Glacier2.Client.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("Glacier2.Client.Locator.Locator", false, 0),
-    IceInternal::Property("Glacier2.Client.Locator.Router", false, 0),
-    IceInternal::Property("Glacier2.Client.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("Glacier2.Client.Locator.Context.*", false, 0),
-    IceInternal::Property("Glacier2.Client.Locator", false, 0),
-    IceInternal::Property("Glacier2.Client.PublishedEndpoints", false, 0),
-    IceInternal::Property("Glacier2.Client.ReplicaGroupId", false, 0),
-    IceInternal::Property("Glacier2.Client.Router.EndpointSelection", false, 0),
-    IceInternal::Property("Glacier2.Client.Router.ConnectionCached", false, 0),
-    IceInternal::Property("Glacier2.Client.Router.PreferSecure", false, 0),
-    IceInternal::Property("Glacier2.Client.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Glacier2.Client.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("Glacier2.Client.Router.Locator", false, 0),
-    IceInternal::Property("Glacier2.Client.Router.Router", false, 0),
-    IceInternal::Property("Glacier2.Client.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("Glacier2.Client.Router.Context.*", false, 0),
-    IceInternal::Property("Glacier2.Client.Router", false, 0),
-    IceInternal::Property("Glacier2.Client.ProxyOptions", false, 0),
-    IceInternal::Property("Glacier2.Client.ThreadPool.Size", false, 0),
-    IceInternal::Property("Glacier2.Client.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("Glacier2.Client.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("Glacier2.Client.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("Glacier2.Client.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("Glacier2.Client.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("Glacier2.Client.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("Glacier2.Client.MessageSizeMax", false, 0),
-    IceInternal::Property("Glacier2.Client.Buffered", false, 0),
-    IceInternal::Property("Glacier2.Client.ForwardContext", false, 0),
-    IceInternal::Property("Glacier2.Client.SleepTime", false, 0),
-    IceInternal::Property("Glacier2.Client.Trace.Override", false, 0),
-    IceInternal::Property("Glacier2.Client.Trace.Reject", false, 0),
-    IceInternal::Property("Glacier2.Client.Trace.Request", false, 0),
-    IceInternal::Property("Glacier2.CryptPasswords", false, 0),
-    IceInternal::Property("Glacier2.Filter.Address.Reject", false, 0),
-    IceInternal::Property("Glacier2.Filter.Address.Accept", false, 0),
-    IceInternal::Property("Glacier2.Filter.ProxySizeMax", false, 0),
-    IceInternal::Property("Glacier2.Filter.Category.Accept", false, 0),
-    IceInternal::Property("Glacier2.Filter.Category.AcceptUser", false, 0),
-    IceInternal::Property("Glacier2.Filter.AdapterId.Accept", false, 0),
-    IceInternal::Property("Glacier2.Filter.Identity.Accept", false, 0),
-    IceInternal::Property("Glacier2.InstanceName", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier.EndpointSelection", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier.ConnectionCached", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier.PreferSecure", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier.InvocationTimeout", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier.Locator", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier.Router", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier.CollocationOptimized", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier.Context.*", false, 0),
-    IceInternal::Property("Glacier2.PermissionsVerifier", false, 0),
-    IceInternal::Property("Glacier2.ReturnClientProxy", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier.EndpointSelection", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier.ConnectionCached", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier.PreferSecure", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier.InvocationTimeout", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier.Locator", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier.Router", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier.CollocationOptimized", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier.Context.*", false, 0),
-    IceInternal::Property("Glacier2.SSLPermissionsVerifier", false, 0),
-    IceInternal::Property("Glacier2.RoutingTable.MaxSize", false, 0),
-    IceInternal::Property("Glacier2.Server.ACM.Timeout", false, 0),
-    IceInternal::Property("Glacier2.Server.ACM.Heartbeat", false, 0),
-    IceInternal::Property("Glacier2.Server.ACM.Close", false, 0),
-    IceInternal::Property("Glacier2.Server.ACM", false, 0),
-    IceInternal::Property("Glacier2.Server.AdapterId", false, 0),
-    IceInternal::Property("Glacier2.Server.Connection.CloseTimeout", false, 0),
-    IceInternal::Property("Glacier2.Server.Connection.ConnectTimeout", false, 0),
-    IceInternal::Property("Glacier2.Server.Connection.EnableIdleCheck", false, 0),
-    IceInternal::Property("Glacier2.Server.Connection.IdleTimeout", false, 0),
-    IceInternal::Property("Glacier2.Server.Connection.InactivityTimeout", false, 0),
-    IceInternal::Property("Glacier2.Server.Connection", false, 0),
-    IceInternal::Property("Glacier2.Server.Endpoints", false, 0),
-    IceInternal::Property("Glacier2.Server.Locator.EndpointSelection", false, 0),
-    IceInternal::Property("Glacier2.Server.Locator.ConnectionCached", false, 0),
-    IceInternal::Property("Glacier2.Server.Locator.PreferSecure", false, 0),
-    IceInternal::Property("Glacier2.Server.Locator.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Glacier2.Server.Locator.InvocationTimeout", false, 0),
-    IceInternal::Property("Glacier2.Server.Locator.Locator", false, 0),
-    IceInternal::Property("Glacier2.Server.Locator.Router", false, 0),
-    IceInternal::Property("Glacier2.Server.Locator.CollocationOptimized", false, 0),
-    IceInternal::Property("Glacier2.Server.Locator.Context.*", false, 0),
-    IceInternal::Property("Glacier2.Server.Locator", false, 0),
-    IceInternal::Property("Glacier2.Server.PublishedEndpoints", false, 0),
-    IceInternal::Property("Glacier2.Server.ReplicaGroupId", false, 0),
-    IceInternal::Property("Glacier2.Server.Router.EndpointSelection", false, 0),
-    IceInternal::Property("Glacier2.Server.Router.ConnectionCached", false, 0),
-    IceInternal::Property("Glacier2.Server.Router.PreferSecure", false, 0),
-    IceInternal::Property("Glacier2.Server.Router.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Glacier2.Server.Router.InvocationTimeout", false, 0),
-    IceInternal::Property("Glacier2.Server.Router.Locator", false, 0),
-    IceInternal::Property("Glacier2.Server.Router.Router", false, 0),
-    IceInternal::Property("Glacier2.Server.Router.CollocationOptimized", false, 0),
-    IceInternal::Property("Glacier2.Server.Router.Context.*", false, 0),
-    IceInternal::Property("Glacier2.Server.Router", false, 0),
-    IceInternal::Property("Glacier2.Server.ProxyOptions", false, 0),
-    IceInternal::Property("Glacier2.Server.ThreadPool.Size", false, 0),
-    IceInternal::Property("Glacier2.Server.ThreadPool.SizeMax", false, 0),
-    IceInternal::Property("Glacier2.Server.ThreadPool.SizeWarn", false, 0),
-    IceInternal::Property("Glacier2.Server.ThreadPool.StackSize", false, 0),
-    IceInternal::Property("Glacier2.Server.ThreadPool.Serialize", false, 0),
-    IceInternal::Property("Glacier2.Server.ThreadPool.ThreadIdleTime", false, 0),
-    IceInternal::Property("Glacier2.Server.ThreadPool.ThreadPriority", false, 0),
-    IceInternal::Property("Glacier2.Server.MessageSizeMax", false, 0),
-    IceInternal::Property("Glacier2.Server.Buffered", false, 0),
-    IceInternal::Property("Glacier2.Server.ForwardContext", false, 0),
-    IceInternal::Property("Glacier2.Server.SleepTime", false, 0),
-    IceInternal::Property("Glacier2.Server.Trace.Override", false, 0),
-    IceInternal::Property("Glacier2.Server.Trace.Request", false, 0),
-    IceInternal::Property("Glacier2.SessionManager.EndpointSelection", false, 0),
-    IceInternal::Property("Glacier2.SessionManager.ConnectionCached", false, 0),
-    IceInternal::Property("Glacier2.SessionManager.PreferSecure", false, 0),
-    IceInternal::Property("Glacier2.SessionManager.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Glacier2.SessionManager.InvocationTimeout", false, 0),
-    IceInternal::Property("Glacier2.SessionManager.Locator", false, 0),
-    IceInternal::Property("Glacier2.SessionManager.Router", false, 0),
-    IceInternal::Property("Glacier2.SessionManager.CollocationOptimized", false, 0),
-    IceInternal::Property("Glacier2.SessionManager.Context.*", false, 0),
-    IceInternal::Property("Glacier2.SessionManager", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager.EndpointSelection", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager.ConnectionCached", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager.PreferSecure", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager.LocatorCacheTimeout", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager.InvocationTimeout", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager.Locator", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager.Router", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager.CollocationOptimized", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager.Context.*", false, 0),
-    IceInternal::Property("Glacier2.SSLSessionManager", false, 0),
-    IceInternal::Property("Glacier2.Trace.RoutingTable", false, 0),
-    IceInternal::Property("Glacier2.Trace.Session", false, 0),
+    IceInternal::Property("Glacier2.AddConnectionContext", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.ACM.Timeout", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.ACM.Heartbeat", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.ACM.Close", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.ACM", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.AdapterId", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Connection.CloseTimeout", "10", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Connection.ConnectTimeout", "10", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Connection.EnableIdleCheck", "1", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Connection.IdleTimeout", "60", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Connection.InactivityTimeout", "300", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Connection", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Endpoints", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Locator.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Locator.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Locator.PreferSecure", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Locator.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Locator.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Locator.Locator", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Locator.Router", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Locator.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Locator.Context.*", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Locator", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.PublishedEndpoints", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.ReplicaGroupId", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Router.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Router.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Router.PreferSecure", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Router.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Router.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Router.Locator", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Router.Router", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Router.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Router.Context.*", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Router", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.ProxyOptions", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.ThreadPool.Size", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.ThreadPool.SizeMax", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.ThreadPool.SizeWarn", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.ThreadPool.StackSize", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.ThreadPool.Serialize", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.ThreadPool.ThreadIdleTime", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.ThreadPool.ThreadPriority", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.MessageSizeMax", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Buffered", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.ForwardContext", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.SleepTime", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Trace.Override", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Trace.Reject", "", false, nullptr),
+    IceInternal::Property("Glacier2.Client.Trace.Request", "", false, nullptr),
+    IceInternal::Property("Glacier2.CryptPasswords", "", false, nullptr),
+    IceInternal::Property("Glacier2.Filter.Address.Reject", "", false, nullptr),
+    IceInternal::Property("Glacier2.Filter.Address.Accept", "", false, nullptr),
+    IceInternal::Property("Glacier2.Filter.ProxySizeMax", "", false, nullptr),
+    IceInternal::Property("Glacier2.Filter.Category.Accept", "", false, nullptr),
+    IceInternal::Property("Glacier2.Filter.Category.AcceptUser", "", false, nullptr),
+    IceInternal::Property("Glacier2.Filter.AdapterId.Accept", "", false, nullptr),
+    IceInternal::Property("Glacier2.Filter.Identity.Accept", "", false, nullptr),
+    IceInternal::Property("Glacier2.InstanceName", "", false, nullptr),
+    IceInternal::Property("Glacier2.PermissionsVerifier.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("Glacier2.PermissionsVerifier.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("Glacier2.PermissionsVerifier.PreferSecure", "", false, nullptr),
+    IceInternal::Property("Glacier2.PermissionsVerifier.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("Glacier2.PermissionsVerifier.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("Glacier2.PermissionsVerifier.Locator", "", false, nullptr),
+    IceInternal::Property("Glacier2.PermissionsVerifier.Router", "", false, nullptr),
+    IceInternal::Property("Glacier2.PermissionsVerifier.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("Glacier2.PermissionsVerifier.Context.*", "", false, nullptr),
+    IceInternal::Property("Glacier2.PermissionsVerifier", "", false, nullptr),
+    IceInternal::Property("Glacier2.ReturnClientProxy", "", false, nullptr),
+    IceInternal::Property("Glacier2.SSLPermissionsVerifier.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("Glacier2.SSLPermissionsVerifier.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("Glacier2.SSLPermissionsVerifier.PreferSecure", "", false, nullptr),
+    IceInternal::Property("Glacier2.SSLPermissionsVerifier.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("Glacier2.SSLPermissionsVerifier.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("Glacier2.SSLPermissionsVerifier.Locator", "", false, nullptr),
+    IceInternal::Property("Glacier2.SSLPermissionsVerifier.Router", "", false, nullptr),
+    IceInternal::Property("Glacier2.SSLPermissionsVerifier.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("Glacier2.SSLPermissionsVerifier.Context.*", "", false, nullptr),
+    IceInternal::Property("Glacier2.SSLPermissionsVerifier", "", false, nullptr),
+    IceInternal::Property("Glacier2.RoutingTable.MaxSize", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.ACM.Timeout", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.ACM.Heartbeat", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.ACM.Close", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.ACM", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.AdapterId", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Connection.CloseTimeout", "10", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Connection.ConnectTimeout", "10", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Connection.EnableIdleCheck", "1", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Connection.IdleTimeout", "60", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Connection.InactivityTimeout", "300", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Connection", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Endpoints", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Locator.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Locator.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Locator.PreferSecure", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Locator.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Locator.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Locator.Locator", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Locator.Router", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Locator.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Locator.Context.*", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Locator", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.PublishedEndpoints", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.ReplicaGroupId", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Router.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Router.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Router.PreferSecure", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Router.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Router.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Router.Locator", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Router.Router", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Router.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Router.Context.*", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Router", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.ProxyOptions", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.ThreadPool.Size", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.ThreadPool.SizeMax", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.ThreadPool.SizeWarn", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.ThreadPool.StackSize", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.ThreadPool.Serialize", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.ThreadPool.ThreadIdleTime", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.ThreadPool.ThreadPriority", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.MessageSizeMax", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Buffered", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.ForwardContext", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.SleepTime", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Trace.Override", "", false, nullptr),
+    IceInternal::Property("Glacier2.Server.Trace.Request", "", false, nullptr),
+    IceInternal::Property("Glacier2.SessionManager.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("Glacier2.SessionManager.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("Glacier2.SessionManager.PreferSecure", "", false, nullptr),
+    IceInternal::Property("Glacier2.SessionManager.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("Glacier2.SessionManager.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("Glacier2.SessionManager.Locator", "", false, nullptr),
+    IceInternal::Property("Glacier2.SessionManager.Router", "", false, nullptr),
+    IceInternal::Property("Glacier2.SessionManager.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("Glacier2.SessionManager.Context.*", "", false, nullptr),
+    IceInternal::Property("Glacier2.SessionManager", "", false, nullptr),
+    IceInternal::Property("Glacier2.SSLSessionManager.EndpointSelection", "", false, nullptr),
+    IceInternal::Property("Glacier2.SSLSessionManager.ConnectionCached", "", false, nullptr),
+    IceInternal::Property("Glacier2.SSLSessionManager.PreferSecure", "", false, nullptr),
+    IceInternal::Property("Glacier2.SSLSessionManager.LocatorCacheTimeout", "", false, nullptr),
+    IceInternal::Property("Glacier2.SSLSessionManager.InvocationTimeout", "", false, nullptr),
+    IceInternal::Property("Glacier2.SSLSessionManager.Locator", "", false, nullptr),
+    IceInternal::Property("Glacier2.SSLSessionManager.Router", "", false, nullptr),
+    IceInternal::Property("Glacier2.SSLSessionManager.CollocationOptimized", "", false, nullptr),
+    IceInternal::Property("Glacier2.SSLSessionManager.Context.*", "", false, nullptr),
+    IceInternal::Property("Glacier2.SSLSessionManager", "", false, nullptr),
+    IceInternal::Property("Glacier2.Trace.RoutingTable", "", false, nullptr),
+    IceInternal::Property("Glacier2.Trace.Session", "", false, nullptr),
 };
 
 const IceInternal::PropertyArray IceInternal::PropertyNames::Glacier2Props(
@@ -1364,8 +1363,8 @@ const IceInternal::PropertyArray IceInternal::PropertyNames::Glacier2Props(
     sizeof(Glacier2PropsData) / sizeof(Glacier2PropsData[0]));
 
 const IceInternal::Property Glacier2CryptPermissionsVerifierPropsData[] = {
-    IceInternal::Property("Glacier2CryptPermissionsVerifier.*.PermissionsVerifier", false, 0),
-    IceInternal::Property("Glacier2CryptPermissionsVerifier.*.AdminPermissionsVerifier", false, 0),
+    IceInternal::Property("Glacier2CryptPermissionsVerifier.*.PermissionsVerifier", "", false, nullptr),
+    IceInternal::Property("Glacier2CryptPermissionsVerifier.*.AdminPermissionsVerifier", "", false, nullptr),
 };
 
 const IceInternal::PropertyArray IceInternal::PropertyNames::Glacier2CryptPermissionsVerifierProps(
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index 5dc9e0e754e..fc7fad51ca3 100644
--- a/cpp/src/Ice/PropertyNames.h
+++ b/cpp/src/Ice/PropertyNames.h
@@ -1,7 +1,6 @@
-//
 // Copyright (c) ZeroC, Inc. All rights reserved.
-//
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Apr 26 11:24:58 2024
+
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Thu May  2 12:34:29 2024
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -16,12 +15,19 @@ namespace IceInternal
     struct Property
     {
         const char* pattern;
+        const char* defaultValue;
         bool deprecated;
         const char* deprecatedBy;
 
-        Property(const char* n, bool d, const char* b) : pattern(n), deprecated(d), deprecatedBy(b) {}
+        Property(const char* n, const char* dv, bool d, const char* b)
+            : pattern(n),
+              defaultValue(dv),
+              deprecated(d),
+              deprecatedBy(b)
+        {
+        }
 
-        Property() : pattern(0), deprecated(false), deprecatedBy(0) {}
+        Property() = delete;
     };
 
     struct PropertyArray
diff --git a/cpp/src/IceUtil/StringUtil.cpp b/cpp/src/IceUtil/StringUtil.cpp
index 55421f249f0..7578eb8b176 100644
--- a/cpp/src/IceUtil/StringUtil.cpp
+++ b/cpp/src/IceUtil/StringUtil.cpp
@@ -628,7 +628,7 @@ IceUtilInternal::unescapeString(const string& s, string::size_type start, string
 }
 
 bool
-IceUtilInternal::splitString(const string& str, const string& delim, vector<string>& result)
+IceUtilInternal::splitString(string_view str, string_view delim, vector<string>& result)
 {
     string::size_type pos = 0;
     string::size_type length = str.length();
diff --git a/cpp/test/Ice/properties/Client.cpp b/cpp/test/Ice/properties/Client.cpp
index 81aed767d9d..ab2d88acd81 100644
--- a/cpp/test/Ice/properties/Client.cpp
+++ b/cpp/test/Ice/properties/Client.cpp
@@ -111,6 +111,45 @@ Client::run(int, char**)
         }
         cout << "ok" << endl;
     }
+
+    {
+        cout << "testing ice properties with set default values... " << flush;
+        Ice::PropertiesPtr properties = Ice::createProperties();
+        string toStringMode = properties->getIceProperty("Ice.ToStringMode");
+        test(toStringMode == "Unicode");
+        int32_t closeTimeout = properties->getIcePropertyAsInt("Ice.Connection.CloseTimeout");
+        test(closeTimeout == 10);
+        vector<string> retryIntervals = properties->getIcePropertyAsList("Ice.RetryIntervals");
+        test(retryIntervals.size() == 1);
+        test(retryIntervals[0] == "0");
+        cout << "ok" << endl;
+    }
+
+    {
+        cout << "testing ice properties with unset default values... " << flush;
+        Ice::PropertiesPtr properties = Ice::createProperties();
+        string stringValue = properties->getIceProperty("Ice.Admin.Router");
+        test(stringValue == "");
+        int32_t intValue = properties->getIcePropertyAsInt("Ice.Admin.Router");
+        test(intValue == 0);
+        vector<string> listValue = properties->getIcePropertyAsList("Ice.Admin.Router");
+        test(listValue.size() == 0);
+        cout << "ok" << endl;
+    }
+
+    {
+        cout << "testing that getting an unknown Ice property throws an exception... " << flush;
+        try
+        {
+            Ice::PropertiesPtr properties = Ice::createProperties();
+            properties->getIceProperty("Ice.UnknownProperty");
+            test(false);
+        }
+        catch (const std::invalid_argument&)
+        {
+        }
+        cout << "ok" << endl;
+    }
 }
 
 DEFINE_TEST(Client)
diff --git a/csharp/src/Ice/Internal/Property.cs b/csharp/src/Ice/Internal/Property.cs
index 012774a55cf..0e02c2c3274 100644
--- a/csharp/src/Ice/Internal/Property.cs
+++ b/csharp/src/Ice/Internal/Property.cs
@@ -4,9 +4,10 @@ namespace Ice.Internal;
 
 public sealed class Property
 {
-    public Property(string pattern, bool deprecated, string deprecatedBy)
+    public Property(string pattern, string defaultValue, bool deprecated, string deprecatedBy)
     {
         _pattern = pattern;
+        _defaultValue = defaultValue;
         _deprecated = deprecated;
         _deprecatedBy = deprecatedBy;
     }
@@ -17,6 +18,12 @@ public string
         return _pattern;
     }
 
+    public string
+    defaultValue()
+    {
+        return _defaultValue;
+    }
+
     public bool
     deprecated()
     {
@@ -30,6 +37,7 @@ public string
     }
 
     private string _pattern;
+    private string _defaultValue;
     private bool _deprecated;
     private string _deprecatedBy;
 }
diff --git a/csharp/src/Ice/Internal/PropertyNames.cs b/csharp/src/Ice/Internal/PropertyNames.cs
index df870318741..6d4454c8bcf 100644
--- a/csharp/src/Ice/Internal/PropertyNames.cs
+++ b/csharp/src/Ice/Internal/PropertyNames.cs
@@ -1,7 +1,6 @@
-//
 // Copyright (c) ZeroC, Inc. All rights reserved.
-//
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Apr 26 11:24:58 2024
+
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Thu May  2 13:32:35 2024
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -11,1366 +10,1366 @@ public sealed class PropertyNames
 {
     public static Property[] IceProps =
     {
-             new Property(@"^Ice\.AcceptClassCycles$", false, null),
-             new Property(@"^Ice\.ACM\.Client$", true, null),
-             new Property(@"^Ice\.ACM\.Server$", true, null),
-             new Property(@"^Ice\.ACM\.Timeout$", false, null),
-             new Property(@"^Ice\.ACM\.Heartbeat$", false, null),
-             new Property(@"^Ice\.ACM\.Close$", false, null),
-             new Property(@"^Ice\.ACM$", false, null),
-             new Property(@"^Ice\.ACM\.Client\.Timeout$", false, null),
-             new Property(@"^Ice\.ACM\.Client\.Heartbeat$", false, null),
-             new Property(@"^Ice\.ACM\.Client\.Close$", false, null),
-             new Property(@"^Ice\.ACM\.Client$", false, null),
-             new Property(@"^Ice\.ACM\.Server\.Timeout$", false, null),
-             new Property(@"^Ice\.ACM\.Server\.Heartbeat$", false, null),
-             new Property(@"^Ice\.ACM\.Server\.Close$", false, null),
-             new Property(@"^Ice\.ACM\.Server$", false, null),
-             new Property(@"^Ice\.Admin\.ACM\.Timeout$", false, null),
-             new Property(@"^Ice\.Admin\.ACM\.Heartbeat$", false, null),
-             new Property(@"^Ice\.Admin\.ACM\.Close$", false, null),
-             new Property(@"^Ice\.Admin\.ACM$", false, null),
-             new Property(@"^Ice\.Admin\.AdapterId$", false, null),
-             new Property(@"^Ice\.Admin\.Connection\.CloseTimeout$", false, null),
-             new Property(@"^Ice\.Admin\.Connection\.ConnectTimeout$", false, null),
-             new Property(@"^Ice\.Admin\.Connection\.EnableIdleCheck$", false, null),
-             new Property(@"^Ice\.Admin\.Connection\.IdleTimeout$", false, null),
-             new Property(@"^Ice\.Admin\.Connection\.InactivityTimeout$", false, null),
-             new Property(@"^Ice\.Admin\.Connection$", false, null),
-             new Property(@"^Ice\.Admin\.Endpoints$", false, null),
-             new Property(@"^Ice\.Admin\.Locator\.EndpointSelection$", false, null),
-             new Property(@"^Ice\.Admin\.Locator\.ConnectionCached$", false, null),
-             new Property(@"^Ice\.Admin\.Locator\.PreferSecure$", false, null),
-             new Property(@"^Ice\.Admin\.Locator\.LocatorCacheTimeout$", false, null),
-             new Property(@"^Ice\.Admin\.Locator\.InvocationTimeout$", false, null),
-             new Property(@"^Ice\.Admin\.Locator\.Locator$", false, null),
-             new Property(@"^Ice\.Admin\.Locator\.Router$", false, null),
-             new Property(@"^Ice\.Admin\.Locator\.CollocationOptimized$", false, null),
-             new Property(@"^Ice\.Admin\.Locator\.Context\.[^\s]+$", false, null),
-             new Property(@"^Ice\.Admin\.Locator$", false, null),
-             new Property(@"^Ice\.Admin\.PublishedEndpoints$", false, null),
-             new Property(@"^Ice\.Admin\.ReplicaGroupId$", false, null),
-             new Property(@"^Ice\.Admin\.Router\.EndpointSelection$", false, null),
-             new Property(@"^Ice\.Admin\.Router\.ConnectionCached$", false, null),
-             new Property(@"^Ice\.Admin\.Router\.PreferSecure$", false, null),
-             new Property(@"^Ice\.Admin\.Router\.LocatorCacheTimeout$", false, null),
-             new Property(@"^Ice\.Admin\.Router\.InvocationTimeout$", false, null),
-             new Property(@"^Ice\.Admin\.Router\.Locator$", false, null),
-             new Property(@"^Ice\.Admin\.Router\.Router$", false, null),
-             new Property(@"^Ice\.Admin\.Router\.CollocationOptimized$", false, null),
-             new Property(@"^Ice\.Admin\.Router\.Context\.[^\s]+$", false, null),
-             new Property(@"^Ice\.Admin\.Router$", false, null),
-             new Property(@"^Ice\.Admin\.ProxyOptions$", false, null),
-             new Property(@"^Ice\.Admin\.ThreadPool\.Size$", false, null),
-             new Property(@"^Ice\.Admin\.ThreadPool\.SizeMax$", false, null),
-             new Property(@"^Ice\.Admin\.ThreadPool\.SizeWarn$", false, null),
-             new Property(@"^Ice\.Admin\.ThreadPool\.StackSize$", false, null),
-             new Property(@"^Ice\.Admin\.ThreadPool\.Serialize$", false, null),
-             new Property(@"^Ice\.Admin\.ThreadPool\.ThreadIdleTime$", false, null),
-             new Property(@"^Ice\.Admin\.ThreadPool\.ThreadPriority$", false, null),
-             new Property(@"^Ice\.Admin\.MessageSizeMax$", false, null),
-             new Property(@"^Ice\.Admin\.DelayCreation$", false, null),
-             new Property(@"^Ice\.Admin\.Enabled$", false, null),
-             new Property(@"^Ice\.Admin\.Facets$", false, null),
-             new Property(@"^Ice\.Admin\.InstanceName$", false, null),
-             new Property(@"^Ice\.Admin\.Logger\.KeepLogs$", false, null),
-             new Property(@"^Ice\.Admin\.Logger\.KeepTraces$", false, null),
-             new Property(@"^Ice\.Admin\.Logger\.Properties$", false, null),
-             new Property(@"^Ice\.Admin\.ServerId$", false, null),
-             new Property(@"^Ice\.BackgroundLocatorCacheUpdates$", false, null),
-             new Property(@"^Ice\.BatchAutoFlush$", true, null),
-             new Property(@"^Ice\.BatchAutoFlushSize$", false, null),
-             new Property(@"^Ice\.ChangeUser$", false, null),
-             new Property(@"^Ice\.ClassGraphDepthMax$", false, null),
-             new Property(@"^Ice\.ClientAccessPolicyProtocol$", false, null),
-             new Property(@"^Ice\.Compression\.Level$", false, null),
-             new Property(@"^Ice\.Config$", false, null),
-             new Property(@"^Ice\.Connection\.CloseTimeout$", false, null),
-             new Property(@"^Ice\.Connection\.ConnectTimeout$", false, null),
-             new Property(@"^Ice\.Connection\.EnableIdleCheck$", false, null),
-             new Property(@"^Ice\.Connection\.IdleTimeout$", false, null),
-             new Property(@"^Ice\.Connection\.InactivityTimeout$", false, null),
-             new Property(@"^Ice\.Connection$", false, null),
-             new Property(@"^Ice\.ConsoleListener$", false, null),
-             new Property(@"^Ice\.Default\.CollocationOptimized$", false, null),
-             new Property(@"^Ice\.Default\.EncodingVersion$", false, null),
-             new Property(@"^Ice\.Default\.EndpointSelection$", false, null),
-             new Property(@"^Ice\.Default\.Host$", false, null),
-             new Property(@"^Ice\.Default\.Locator\.EndpointSelection$", false, null),
-             new Property(@"^Ice\.Default\.Locator\.ConnectionCached$", false, null),
-             new Property(@"^Ice\.Default\.Locator\.PreferSecure$", false, null),
-             new Property(@"^Ice\.Default\.Locator\.LocatorCacheTimeout$", false, null),
-             new Property(@"^Ice\.Default\.Locator\.InvocationTimeout$", false, null),
-             new Property(@"^Ice\.Default\.Locator\.Locator$", false, null),
-             new Property(@"^Ice\.Default\.Locator\.Router$", false, null),
-             new Property(@"^Ice\.Default\.Locator\.CollocationOptimized$", false, null),
-             new Property(@"^Ice\.Default\.Locator\.Context\.[^\s]+$", false, null),
-             new Property(@"^Ice\.Default\.Locator$", false, null),
-             new Property(@"^Ice\.Default\.LocatorCacheTimeout$", false, null),
-             new Property(@"^Ice\.Default\.InvocationTimeout$", false, null),
-             new Property(@"^Ice\.Default\.Package$", false, null),
-             new Property(@"^Ice\.Default\.PreferSecure$", false, null),
-             new Property(@"^Ice\.Default\.Protocol$", false, null),
-             new Property(@"^Ice\.Default\.Router\.EndpointSelection$", false, null),
-             new Property(@"^Ice\.Default\.Router\.ConnectionCached$", false, null),
-             new Property(@"^Ice\.Default\.Router\.PreferSecure$", false, null),
-             new Property(@"^Ice\.Default\.Router\.LocatorCacheTimeout$", false, null),
-             new Property(@"^Ice\.Default\.Router\.InvocationTimeout$", false, null),
-             new Property(@"^Ice\.Default\.Router\.Locator$", false, null),
-             new Property(@"^Ice\.Default\.Router\.Router$", false, null),
-             new Property(@"^Ice\.Default\.Router\.CollocationOptimized$", false, null),
-             new Property(@"^Ice\.Default\.Router\.Context\.[^\s]+$", false, null),
-             new Property(@"^Ice\.Default\.Router$", false, null),
-             new Property(@"^Ice\.Default\.SlicedFormat$", false, null),
-             new Property(@"^Ice\.Default\.SourceAddress$", false, null),
-             new Property(@"^Ice\.Default\.Timeout$", false, null),
-             new Property(@"^Ice\.EventLog\.Source$", false, null),
-             new Property(@"^Ice\.FactoryAssemblies$", false, null),
-             new Property(@"^Ice\.HTTPProxyHost$", false, null),
-             new Property(@"^Ice\.HTTPProxyPort$", false, null),
-             new Property(@"^Ice\.ImplicitContext$", false, null),
-             new Property(@"^Ice\.InitPlugins$", false, null),
-             new Property(@"^Ice\.IPv4$", false, null),
-             new Property(@"^Ice\.IPv6$", false, null),
-             new Property(@"^Ice\.LogFile$", false, null),
-             new Property(@"^Ice\.LogFile\.SizeMax$", false, null),
-             new Property(@"^Ice\.LogStdErr\.Convert$", false, null),
-             new Property(@"^Ice\.MessageSizeMax$", false, null),
-             new Property(@"^Ice\.Nohup$", false, null),
-             new Property(@"^Ice\.Override\.CloseTimeout$", false, null),
-             new Property(@"^Ice\.Override\.Compress$", false, null),
-             new Property(@"^Ice\.Override\.ConnectTimeout$", false, null),
-             new Property(@"^Ice\.Override\.Timeout$", false, null),
-             new Property(@"^Ice\.Override\.Secure$", false, null),
-             new Property(@"^Ice\.Package\.[^\s]+$", false, null),
-             new Property(@"^Ice\.Plugin\.[^\s]+$", false, null),
-             new Property(@"^Ice\.PluginLoadOrder$", false, null),
-             new Property(@"^Ice\.PreferIPv6Address$", false, null),
-             new Property(@"^Ice\.PreloadAssemblies$", false, null),
-             new Property(@"^Ice\.PrintAdapterReady$", false, null),
-             new Property(@"^Ice\.PrintProcessId$", false, null),
-             new Property(@"^Ice\.PrintStackTraces$", false, null),
-             new Property(@"^Ice\.ProgramName$", false, null),
-             new Property(@"^Ice\.RetryIntervals$", false, null),
-             new Property(@"^Ice\.ServerIdleTime$", false, null),
-             new Property(@"^Ice\.SOCKSProxyHost$", false, null),
-             new Property(@"^Ice\.SOCKSProxyPort$", false, null),
-             new Property(@"^Ice\.StdErr$", false, null),
-             new Property(@"^Ice\.StdOut$", false, null),
-             new Property(@"^Ice\.SyslogFacility$", false, null),
-             new Property(@"^Ice\.ThreadPool\.Client\.Size$", false, null),
-             new Property(@"^Ice\.ThreadPool\.Client\.SizeMax$", false, null),
-             new Property(@"^Ice\.ThreadPool\.Client\.SizeWarn$", false, null),
-             new Property(@"^Ice\.ThreadPool\.Client\.StackSize$", false, null),
-             new Property(@"^Ice\.ThreadPool\.Client\.Serialize$", false, null),
-             new Property(@"^Ice\.ThreadPool\.Client\.ThreadIdleTime$", false, null),
-             new Property(@"^Ice\.ThreadPool\.Client\.ThreadPriority$", false, null),
-             new Property(@"^Ice\.ThreadPool\.Server\.Size$", false, null),
-             new Property(@"^Ice\.ThreadPool\.Server\.SizeMax$", false, null),
-             new Property(@"^Ice\.ThreadPool\.Server\.SizeWarn$", false, null),
-             new Property(@"^Ice\.ThreadPool\.Server\.StackSize$", false, null),
-             new Property(@"^Ice\.ThreadPool\.Server\.Serialize$", false, null),
-             new Property(@"^Ice\.ThreadPool\.Server\.ThreadIdleTime$", false, null),
-             new Property(@"^Ice\.ThreadPool\.Server\.ThreadPriority$", false, null),
-             new Property(@"^Ice\.ThreadPriority$", false, null),
-             new Property(@"^Ice\.ToStringMode$", false, null),
-             new Property(@"^Ice\.Trace\.Admin\.Properties$", false, null),
-             new Property(@"^Ice\.Trace\.Admin\.Logger$", false, null),
-             new Property(@"^Ice\.Trace\.Locator$", false, null),
-             new Property(@"^Ice\.Trace\.Network$", false, null),
-             new Property(@"^Ice\.Trace\.Protocol$", false, null),
-             new Property(@"^Ice\.Trace\.Retry$", false, null),
-             new Property(@"^Ice\.Trace\.Slicing$", false, null),
-             new Property(@"^Ice\.Trace\.ThreadPool$", false, null),
-             new Property(@"^Ice\.UDP\.RcvSize$", false, null),
-             new Property(@"^Ice\.UDP\.SndSize$", false, null),
-             new Property(@"^Ice\.TCP\.Backlog$", false, null),
-             new Property(@"^Ice\.TCP\.RcvSize$", false, null),
-             new Property(@"^Ice\.TCP\.SndSize$", false, null),
-             new Property(@"^Ice\.UseApplicationClassLoader$", false, null),
-             new Property(@"^Ice\.UseOSLog$", false, null),
-             new Property(@"^Ice\.UseSyslog$", false, null),
-             new Property(@"^Ice\.UseSystemdJournal$", false, null),
-             new Property(@"^Ice\.Warn\.AMICallback$", false, null),
-             new Property(@"^Ice\.Warn\.Connections$", false, null),
-             new Property(@"^Ice\.Warn\.Datagrams$", false, null),
-             new Property(@"^Ice\.Warn\.Dispatch$", false, null),
-             new Property(@"^Ice\.Warn\.Endpoints$", false, null),
-             new Property(@"^Ice\.Warn\.UnknownProperties$", false, null),
-             new Property(@"^Ice\.Warn\.UnusedProperties$", false, null),
-             new Property(@"^Ice\.CacheMessageBuffers$", false, null),
-             new Property(@"^Ice\.ThreadInterruptSafe$", false, null),
-        };
+         new Property(@"^Ice\.AcceptClassCycles$", "", false, null),
+         new Property(@"^Ice\.ACM\.Client$", "", true, null),
+         new Property(@"^Ice\.ACM\.Server$", "", true, null),
+         new Property(@"^Ice\.ACM\.Timeout$", "", false, null),
+         new Property(@"^Ice\.ACM\.Heartbeat$", "", false, null),
+         new Property(@"^Ice\.ACM\.Close$", "", false, null),
+         new Property(@"^Ice\.ACM$", "", false, null),
+         new Property(@"^Ice\.ACM\.Client\.Timeout$", "", false, null),
+         new Property(@"^Ice\.ACM\.Client\.Heartbeat$", "", false, null),
+         new Property(@"^Ice\.ACM\.Client\.Close$", "", false, null),
+         new Property(@"^Ice\.ACM\.Client$", "", false, null),
+         new Property(@"^Ice\.ACM\.Server\.Timeout$", "", false, null),
+         new Property(@"^Ice\.ACM\.Server\.Heartbeat$", "", false, null),
+         new Property(@"^Ice\.ACM\.Server\.Close$", "", false, null),
+         new Property(@"^Ice\.ACM\.Server$", "", false, null),
+         new Property(@"^Ice\.Admin\.ACM\.Timeout$", "", false, null),
+         new Property(@"^Ice\.Admin\.ACM\.Heartbeat$", "", false, null),
+         new Property(@"^Ice\.Admin\.ACM\.Close$", "", false, null),
+         new Property(@"^Ice\.Admin\.ACM$", "", false, null),
+         new Property(@"^Ice\.Admin\.AdapterId$", "", false, null),
+         new Property(@"^Ice\.Admin\.Connection\.CloseTimeout$", "10", false, null),
+         new Property(@"^Ice\.Admin\.Connection\.ConnectTimeout$", "10", false, null),
+         new Property(@"^Ice\.Admin\.Connection\.EnableIdleCheck$", "1", false, null),
+         new Property(@"^Ice\.Admin\.Connection\.IdleTimeout$", "60", false, null),
+         new Property(@"^Ice\.Admin\.Connection\.InactivityTimeout$", "300", false, null),
+         new Property(@"^Ice\.Admin\.Connection$", "", false, null),
+         new Property(@"^Ice\.Admin\.Endpoints$", "", false, null),
+         new Property(@"^Ice\.Admin\.Locator\.EndpointSelection$", "", false, null),
+         new Property(@"^Ice\.Admin\.Locator\.ConnectionCached$", "", false, null),
+         new Property(@"^Ice\.Admin\.Locator\.PreferSecure$", "", false, null),
+         new Property(@"^Ice\.Admin\.Locator\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^Ice\.Admin\.Locator\.InvocationTimeout$", "", false, null),
+         new Property(@"^Ice\.Admin\.Locator\.Locator$", "", false, null),
+         new Property(@"^Ice\.Admin\.Locator\.Router$", "", false, null),
+         new Property(@"^Ice\.Admin\.Locator\.CollocationOptimized$", "", false, null),
+         new Property(@"^Ice\.Admin\.Locator\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^Ice\.Admin\.Locator$", "", false, null),
+         new Property(@"^Ice\.Admin\.PublishedEndpoints$", "", false, null),
+         new Property(@"^Ice\.Admin\.ReplicaGroupId$", "", false, null),
+         new Property(@"^Ice\.Admin\.Router\.EndpointSelection$", "", false, null),
+         new Property(@"^Ice\.Admin\.Router\.ConnectionCached$", "", false, null),
+         new Property(@"^Ice\.Admin\.Router\.PreferSecure$", "", false, null),
+         new Property(@"^Ice\.Admin\.Router\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^Ice\.Admin\.Router\.InvocationTimeout$", "", false, null),
+         new Property(@"^Ice\.Admin\.Router\.Locator$", "", false, null),
+         new Property(@"^Ice\.Admin\.Router\.Router$", "", false, null),
+         new Property(@"^Ice\.Admin\.Router\.CollocationOptimized$", "", false, null),
+         new Property(@"^Ice\.Admin\.Router\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^Ice\.Admin\.Router$", "", false, null),
+         new Property(@"^Ice\.Admin\.ProxyOptions$", "", false, null),
+         new Property(@"^Ice\.Admin\.ThreadPool\.Size$", "", false, null),
+         new Property(@"^Ice\.Admin\.ThreadPool\.SizeMax$", "", false, null),
+         new Property(@"^Ice\.Admin\.ThreadPool\.SizeWarn$", "", false, null),
+         new Property(@"^Ice\.Admin\.ThreadPool\.StackSize$", "", false, null),
+         new Property(@"^Ice\.Admin\.ThreadPool\.Serialize$", "", false, null),
+         new Property(@"^Ice\.Admin\.ThreadPool\.ThreadIdleTime$", "", false, null),
+         new Property(@"^Ice\.Admin\.ThreadPool\.ThreadPriority$", "", false, null),
+         new Property(@"^Ice\.Admin\.MessageSizeMax$", "", false, null),
+         new Property(@"^Ice\.Admin\.DelayCreation$", "", false, null),
+         new Property(@"^Ice\.Admin\.Enabled$", "", false, null),
+         new Property(@"^Ice\.Admin\.Facets$", "", false, null),
+         new Property(@"^Ice\.Admin\.InstanceName$", "", false, null),
+         new Property(@"^Ice\.Admin\.Logger\.KeepLogs$", "", false, null),
+         new Property(@"^Ice\.Admin\.Logger\.KeepTraces$", "", false, null),
+         new Property(@"^Ice\.Admin\.Logger\.Properties$", "", false, null),
+         new Property(@"^Ice\.Admin\.ServerId$", "", false, null),
+         new Property(@"^Ice\.BackgroundLocatorCacheUpdates$", "", false, null),
+         new Property(@"^Ice\.BatchAutoFlush$", "", true, null),
+         new Property(@"^Ice\.BatchAutoFlushSize$", "", false, null),
+         new Property(@"^Ice\.ChangeUser$", "", false, null),
+         new Property(@"^Ice\.ClassGraphDepthMax$", "", false, null),
+         new Property(@"^Ice\.ClientAccessPolicyProtocol$", "", false, null),
+         new Property(@"^Ice\.Compression\.Level$", "", false, null),
+         new Property(@"^Ice\.Config$", "", false, null),
+         new Property(@"^Ice\.Connection\.CloseTimeout$", "10", false, null),
+         new Property(@"^Ice\.Connection\.ConnectTimeout$", "10", false, null),
+         new Property(@"^Ice\.Connection\.EnableIdleCheck$", "1", false, null),
+         new Property(@"^Ice\.Connection\.IdleTimeout$", "60", false, null),
+         new Property(@"^Ice\.Connection\.InactivityTimeout$", "300", false, null),
+         new Property(@"^Ice\.Connection$", "", false, null),
+         new Property(@"^Ice\.ConsoleListener$", "", false, null),
+         new Property(@"^Ice\.Default\.CollocationOptimized$", "", false, null),
+         new Property(@"^Ice\.Default\.EncodingVersion$", "", false, null),
+         new Property(@"^Ice\.Default\.EndpointSelection$", "", false, null),
+         new Property(@"^Ice\.Default\.Host$", "", false, null),
+         new Property(@"^Ice\.Default\.Locator\.EndpointSelection$", "", false, null),
+         new Property(@"^Ice\.Default\.Locator\.ConnectionCached$", "", false, null),
+         new Property(@"^Ice\.Default\.Locator\.PreferSecure$", "", false, null),
+         new Property(@"^Ice\.Default\.Locator\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^Ice\.Default\.Locator\.InvocationTimeout$", "", false, null),
+         new Property(@"^Ice\.Default\.Locator\.Locator$", "", false, null),
+         new Property(@"^Ice\.Default\.Locator\.Router$", "", false, null),
+         new Property(@"^Ice\.Default\.Locator\.CollocationOptimized$", "", false, null),
+         new Property(@"^Ice\.Default\.Locator\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^Ice\.Default\.Locator$", "", false, null),
+         new Property(@"^Ice\.Default\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^Ice\.Default\.InvocationTimeout$", "", false, null),
+         new Property(@"^Ice\.Default\.Package$", "", false, null),
+         new Property(@"^Ice\.Default\.PreferSecure$", "", false, null),
+         new Property(@"^Ice\.Default\.Protocol$", "", false, null),
+         new Property(@"^Ice\.Default\.Router\.EndpointSelection$", "", false, null),
+         new Property(@"^Ice\.Default\.Router\.ConnectionCached$", "", false, null),
+         new Property(@"^Ice\.Default\.Router\.PreferSecure$", "", false, null),
+         new Property(@"^Ice\.Default\.Router\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^Ice\.Default\.Router\.InvocationTimeout$", "", false, null),
+         new Property(@"^Ice\.Default\.Router\.Locator$", "", false, null),
+         new Property(@"^Ice\.Default\.Router\.Router$", "", false, null),
+         new Property(@"^Ice\.Default\.Router\.CollocationOptimized$", "", false, null),
+         new Property(@"^Ice\.Default\.Router\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^Ice\.Default\.Router$", "", false, null),
+         new Property(@"^Ice\.Default\.SlicedFormat$", "", false, null),
+         new Property(@"^Ice\.Default\.SourceAddress$", "", false, null),
+         new Property(@"^Ice\.Default\.Timeout$", "", false, null),
+         new Property(@"^Ice\.EventLog\.Source$", "", false, null),
+         new Property(@"^Ice\.FactoryAssemblies$", "", false, null),
+         new Property(@"^Ice\.HTTPProxyHost$", "", false, null),
+         new Property(@"^Ice\.HTTPProxyPort$", "", false, null),
+         new Property(@"^Ice\.ImplicitContext$", "", false, null),
+         new Property(@"^Ice\.InitPlugins$", "", false, null),
+         new Property(@"^Ice\.IPv4$", "", false, null),
+         new Property(@"^Ice\.IPv6$", "", false, null),
+         new Property(@"^Ice\.LogFile$", "", false, null),
+         new Property(@"^Ice\.LogFile\.SizeMax$", "", false, null),
+         new Property(@"^Ice\.LogStdErr\.Convert$", "", false, null),
+         new Property(@"^Ice\.MessageSizeMax$", "", false, null),
+         new Property(@"^Ice\.Nohup$", "", false, null),
+         new Property(@"^Ice\.Override\.CloseTimeout$", "", false, null),
+         new Property(@"^Ice\.Override\.Compress$", "", false, null),
+         new Property(@"^Ice\.Override\.ConnectTimeout$", "", false, null),
+         new Property(@"^Ice\.Override\.Timeout$", "", false, null),
+         new Property(@"^Ice\.Override\.Secure$", "", false, null),
+         new Property(@"^Ice\.Package\.[^\s]+$", "", false, null),
+         new Property(@"^Ice\.Plugin\.[^\s]+$", "", false, null),
+         new Property(@"^Ice\.PluginLoadOrder$", "", false, null),
+         new Property(@"^Ice\.PreferIPv6Address$", "", false, null),
+         new Property(@"^Ice\.PreloadAssemblies$", "", false, null),
+         new Property(@"^Ice\.PrintAdapterReady$", "", false, null),
+         new Property(@"^Ice\.PrintProcessId$", "", false, null),
+         new Property(@"^Ice\.PrintStackTraces$", "", false, null),
+         new Property(@"^Ice\.ProgramName$", "", false, null),
+         new Property(@"^Ice\.RetryIntervals$", "0", false, null),
+         new Property(@"^Ice\.ServerIdleTime$", "", false, null),
+         new Property(@"^Ice\.SOCKSProxyHost$", "", false, null),
+         new Property(@"^Ice\.SOCKSProxyPort$", "", false, null),
+         new Property(@"^Ice\.StdErr$", "", false, null),
+         new Property(@"^Ice\.StdOut$", "", false, null),
+         new Property(@"^Ice\.SyslogFacility$", "", false, null),
+         new Property(@"^Ice\.ThreadPool\.Client\.Size$", "", false, null),
+         new Property(@"^Ice\.ThreadPool\.Client\.SizeMax$", "", false, null),
+         new Property(@"^Ice\.ThreadPool\.Client\.SizeWarn$", "", false, null),
+         new Property(@"^Ice\.ThreadPool\.Client\.StackSize$", "", false, null),
+         new Property(@"^Ice\.ThreadPool\.Client\.Serialize$", "", false, null),
+         new Property(@"^Ice\.ThreadPool\.Client\.ThreadIdleTime$", "", false, null),
+         new Property(@"^Ice\.ThreadPool\.Client\.ThreadPriority$", "", false, null),
+         new Property(@"^Ice\.ThreadPool\.Server\.Size$", "", false, null),
+         new Property(@"^Ice\.ThreadPool\.Server\.SizeMax$", "", false, null),
+         new Property(@"^Ice\.ThreadPool\.Server\.SizeWarn$", "", false, null),
+         new Property(@"^Ice\.ThreadPool\.Server\.StackSize$", "", false, null),
+         new Property(@"^Ice\.ThreadPool\.Server\.Serialize$", "", false, null),
+         new Property(@"^Ice\.ThreadPool\.Server\.ThreadIdleTime$", "", false, null),
+         new Property(@"^Ice\.ThreadPool\.Server\.ThreadPriority$", "", false, null),
+         new Property(@"^Ice\.ThreadPriority$", "", false, null),
+         new Property(@"^Ice\.ToStringMode$", "Unicode", false, null),
+         new Property(@"^Ice\.Trace\.Admin\.Properties$", "", false, null),
+         new Property(@"^Ice\.Trace\.Admin\.Logger$", "", false, null),
+         new Property(@"^Ice\.Trace\.Locator$", "", false, null),
+         new Property(@"^Ice\.Trace\.Network$", "", false, null),
+         new Property(@"^Ice\.Trace\.Protocol$", "", false, null),
+         new Property(@"^Ice\.Trace\.Retry$", "", false, null),
+         new Property(@"^Ice\.Trace\.Slicing$", "", false, null),
+         new Property(@"^Ice\.Trace\.ThreadPool$", "", false, null),
+         new Property(@"^Ice\.UDP\.RcvSize$", "", false, null),
+         new Property(@"^Ice\.UDP\.SndSize$", "", false, null),
+         new Property(@"^Ice\.TCP\.Backlog$", "", false, null),
+         new Property(@"^Ice\.TCP\.RcvSize$", "", false, null),
+         new Property(@"^Ice\.TCP\.SndSize$", "", false, null),
+         new Property(@"^Ice\.UseApplicationClassLoader$", "", false, null),
+         new Property(@"^Ice\.UseOSLog$", "", false, null),
+         new Property(@"^Ice\.UseSyslog$", "", false, null),
+         new Property(@"^Ice\.UseSystemdJournal$", "", false, null),
+         new Property(@"^Ice\.Warn\.AMICallback$", "", false, null),
+         new Property(@"^Ice\.Warn\.Connections$", "", false, null),
+         new Property(@"^Ice\.Warn\.Datagrams$", "", false, null),
+         new Property(@"^Ice\.Warn\.Dispatch$", "", false, null),
+         new Property(@"^Ice\.Warn\.Endpoints$", "", false, null),
+         new Property(@"^Ice\.Warn\.UnknownProperties$", "", false, null),
+         new Property(@"^Ice\.Warn\.UnusedProperties$", "", false, null),
+         new Property(@"^Ice\.CacheMessageBuffers$", "", false, null),
+         new Property(@"^Ice\.ThreadInterruptSafe$", "", false, null),
+    };
 
     public static Property[] IceMXProps =
     {
-             new Property(@"^IceMX\.Metrics\.[^\s]+\.GroupBy$", false, null),
-             new Property(@"^IceMX\.Metrics\.[^\s]+\.Map$", false, null),
-             new Property(@"^IceMX\.Metrics\.[^\s]+\.RetainDetached$", false, null),
-             new Property(@"^IceMX\.Metrics\.[^\s]+\.Accept$", false, null),
-             new Property(@"^IceMX\.Metrics\.[^\s]+\.Reject$", false, null),
-             new Property(@"^IceMX\.Metrics\.[^\s]+$", false, null),
-        };
+         new Property(@"^IceMX\.Metrics\.[^\s]+\.GroupBy$", "", false, null),
+         new Property(@"^IceMX\.Metrics\.[^\s]+\.Map$", "", false, null),
+         new Property(@"^IceMX\.Metrics\.[^\s]+\.RetainDetached$", "", false, null),
+         new Property(@"^IceMX\.Metrics\.[^\s]+\.Accept$", "", false, null),
+         new Property(@"^IceMX\.Metrics\.[^\s]+\.Reject$", "", false, null),
+         new Property(@"^IceMX\.Metrics\.[^\s]+$", "", false, null),
+    };
 
     public static Property[] IceDiscoveryProps =
     {
-             new Property(@"^IceDiscovery\.Multicast\.ACM\.Timeout$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.ACM\.Heartbeat$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.ACM\.Close$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.ACM$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.AdapterId$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.Connection\.CloseTimeout$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.Connection\.ConnectTimeout$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.Connection\.EnableIdleCheck$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.Connection\.IdleTimeout$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.Connection\.InactivityTimeout$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.Connection$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.Endpoints$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.Locator\.EndpointSelection$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.Locator\.ConnectionCached$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.Locator\.PreferSecure$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.Locator\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.Locator\.InvocationTimeout$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.Locator\.Locator$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.Locator\.Router$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.Locator\.CollocationOptimized$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.Locator\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.Locator$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.PublishedEndpoints$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.ReplicaGroupId$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.Router\.EndpointSelection$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.Router\.ConnectionCached$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.Router\.PreferSecure$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.Router\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.Router\.InvocationTimeout$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.Router\.Locator$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.Router\.Router$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.Router\.CollocationOptimized$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.Router\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.Router$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.ProxyOptions$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.ThreadPool\.Size$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.ThreadPool\.SizeMax$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.ThreadPool\.SizeWarn$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.ThreadPool\.StackSize$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.ThreadPool\.Serialize$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.ThreadPool\.ThreadIdleTime$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.ThreadPool\.ThreadPriority$", false, null),
-             new Property(@"^IceDiscovery\.Multicast\.MessageSizeMax$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.ACM\.Timeout$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.ACM\.Heartbeat$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.ACM\.Close$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.ACM$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.AdapterId$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.Connection\.CloseTimeout$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.Connection\.ConnectTimeout$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.Connection\.EnableIdleCheck$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.Connection\.IdleTimeout$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.Connection\.InactivityTimeout$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.Connection$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.Endpoints$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.Locator\.EndpointSelection$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.Locator\.ConnectionCached$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.Locator\.PreferSecure$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.Locator\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.Locator\.InvocationTimeout$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.Locator\.Locator$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.Locator\.Router$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.Locator\.CollocationOptimized$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.Locator\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.Locator$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.PublishedEndpoints$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.ReplicaGroupId$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.Router\.EndpointSelection$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.Router\.ConnectionCached$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.Router\.PreferSecure$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.Router\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.Router\.InvocationTimeout$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.Router\.Locator$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.Router\.Router$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.Router\.CollocationOptimized$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.Router\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.Router$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.ProxyOptions$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.ThreadPool\.Size$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.ThreadPool\.SizeMax$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.ThreadPool\.SizeWarn$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.ThreadPool\.StackSize$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.ThreadPool\.Serialize$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.ThreadPool\.ThreadIdleTime$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.ThreadPool\.ThreadPriority$", false, null),
-             new Property(@"^IceDiscovery\.Reply\.MessageSizeMax$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.ACM\.Timeout$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.ACM\.Heartbeat$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.ACM\.Close$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.ACM$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.AdapterId$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.Connection\.CloseTimeout$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.Connection\.ConnectTimeout$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.Connection\.EnableIdleCheck$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.Connection\.IdleTimeout$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.Connection\.InactivityTimeout$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.Connection$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.Endpoints$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.Locator\.EndpointSelection$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.Locator\.ConnectionCached$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.Locator\.PreferSecure$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.Locator\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.Locator\.InvocationTimeout$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.Locator\.Locator$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.Locator\.Router$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.Locator\.CollocationOptimized$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.Locator\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.Locator$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.PublishedEndpoints$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.ReplicaGroupId$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.Router\.EndpointSelection$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.Router\.ConnectionCached$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.Router\.PreferSecure$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.Router\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.Router\.InvocationTimeout$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.Router\.Locator$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.Router\.Router$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.Router\.CollocationOptimized$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.Router\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.Router$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.ProxyOptions$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.ThreadPool\.Size$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.ThreadPool\.SizeMax$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.ThreadPool\.SizeWarn$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.ThreadPool\.StackSize$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.ThreadPool\.Serialize$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.ThreadPool\.ThreadIdleTime$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.ThreadPool\.ThreadPriority$", false, null),
-             new Property(@"^IceDiscovery\.Locator\.MessageSizeMax$", false, null),
-             new Property(@"^IceDiscovery\.Lookup$", false, null),
-             new Property(@"^IceDiscovery\.Timeout$", false, null),
-             new Property(@"^IceDiscovery\.RetryCount$", false, null),
-             new Property(@"^IceDiscovery\.LatencyMultiplier$", false, null),
-             new Property(@"^IceDiscovery\.Address$", false, null),
-             new Property(@"^IceDiscovery\.Port$", false, null),
-             new Property(@"^IceDiscovery\.Interface$", false, null),
-             new Property(@"^IceDiscovery\.DomainId$", false, null),
-        };
+         new Property(@"^IceDiscovery\.Multicast\.ACM\.Timeout$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.ACM\.Heartbeat$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.ACM\.Close$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.ACM$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.AdapterId$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.Connection\.CloseTimeout$", "10", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.Connection\.ConnectTimeout$", "10", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.Connection\.EnableIdleCheck$", "1", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.Connection\.IdleTimeout$", "60", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.Connection\.InactivityTimeout$", "300", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.Connection$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.Endpoints$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.Locator\.EndpointSelection$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.Locator\.ConnectionCached$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.Locator\.PreferSecure$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.Locator\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.Locator\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.Locator\.Locator$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.Locator\.Router$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.Locator\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.Locator\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.Locator$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.PublishedEndpoints$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.ReplicaGroupId$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.Router\.EndpointSelection$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.Router\.ConnectionCached$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.Router\.PreferSecure$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.Router\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.Router\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.Router\.Locator$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.Router\.Router$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.Router\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.Router\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.Router$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.ProxyOptions$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.ThreadPool\.Size$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.ThreadPool\.SizeMax$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.ThreadPool\.SizeWarn$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.ThreadPool\.StackSize$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.ThreadPool\.Serialize$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.ThreadPool\.ThreadIdleTime$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.ThreadPool\.ThreadPriority$", "", false, null),
+         new Property(@"^IceDiscovery\.Multicast\.MessageSizeMax$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.ACM\.Timeout$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.ACM\.Heartbeat$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.ACM\.Close$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.ACM$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.AdapterId$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.Connection\.CloseTimeout$", "10", false, null),
+         new Property(@"^IceDiscovery\.Reply\.Connection\.ConnectTimeout$", "10", false, null),
+         new Property(@"^IceDiscovery\.Reply\.Connection\.EnableIdleCheck$", "1", false, null),
+         new Property(@"^IceDiscovery\.Reply\.Connection\.IdleTimeout$", "60", false, null),
+         new Property(@"^IceDiscovery\.Reply\.Connection\.InactivityTimeout$", "300", false, null),
+         new Property(@"^IceDiscovery\.Reply\.Connection$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.Endpoints$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.Locator\.EndpointSelection$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.Locator\.ConnectionCached$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.Locator\.PreferSecure$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.Locator\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.Locator\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.Locator\.Locator$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.Locator\.Router$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.Locator\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.Locator\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.Locator$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.PublishedEndpoints$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.ReplicaGroupId$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.Router\.EndpointSelection$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.Router\.ConnectionCached$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.Router\.PreferSecure$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.Router\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.Router\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.Router\.Locator$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.Router\.Router$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.Router\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.Router\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.Router$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.ProxyOptions$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.ThreadPool\.Size$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.ThreadPool\.SizeMax$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.ThreadPool\.SizeWarn$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.ThreadPool\.StackSize$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.ThreadPool\.Serialize$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.ThreadPool\.ThreadIdleTime$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.ThreadPool\.ThreadPriority$", "", false, null),
+         new Property(@"^IceDiscovery\.Reply\.MessageSizeMax$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.ACM\.Timeout$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.ACM\.Heartbeat$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.ACM\.Close$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.ACM$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.AdapterId$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.Connection\.CloseTimeout$", "10", false, null),
+         new Property(@"^IceDiscovery\.Locator\.Connection\.ConnectTimeout$", "10", false, null),
+         new Property(@"^IceDiscovery\.Locator\.Connection\.EnableIdleCheck$", "1", false, null),
+         new Property(@"^IceDiscovery\.Locator\.Connection\.IdleTimeout$", "60", false, null),
+         new Property(@"^IceDiscovery\.Locator\.Connection\.InactivityTimeout$", "300", false, null),
+         new Property(@"^IceDiscovery\.Locator\.Connection$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.Endpoints$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.Locator\.EndpointSelection$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.Locator\.ConnectionCached$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.Locator\.PreferSecure$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.Locator\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.Locator\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.Locator\.Locator$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.Locator\.Router$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.Locator\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.Locator\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.Locator$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.PublishedEndpoints$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.ReplicaGroupId$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.Router\.EndpointSelection$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.Router\.ConnectionCached$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.Router\.PreferSecure$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.Router\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.Router\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.Router\.Locator$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.Router\.Router$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.Router\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.Router\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.Router$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.ProxyOptions$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.ThreadPool\.Size$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.ThreadPool\.SizeMax$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.ThreadPool\.SizeWarn$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.ThreadPool\.StackSize$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.ThreadPool\.Serialize$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.ThreadPool\.ThreadIdleTime$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.ThreadPool\.ThreadPriority$", "", false, null),
+         new Property(@"^IceDiscovery\.Locator\.MessageSizeMax$", "", false, null),
+         new Property(@"^IceDiscovery\.Lookup$", "", false, null),
+         new Property(@"^IceDiscovery\.Timeout$", "", false, null),
+         new Property(@"^IceDiscovery\.RetryCount$", "", false, null),
+         new Property(@"^IceDiscovery\.LatencyMultiplier$", "", false, null),
+         new Property(@"^IceDiscovery\.Address$", "", false, null),
+         new Property(@"^IceDiscovery\.Port$", "", false, null),
+         new Property(@"^IceDiscovery\.Interface$", "", false, null),
+         new Property(@"^IceDiscovery\.DomainId$", "", false, null),
+    };
 
     public static Property[] IceLocatorDiscoveryProps =
     {
-             new Property(@"^IceLocatorDiscovery\.Reply\.ACM\.Timeout$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.ACM\.Heartbeat$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.ACM\.Close$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.ACM$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.AdapterId$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.Connection\.CloseTimeout$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.Connection\.ConnectTimeout$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.Connection\.EnableIdleCheck$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.Connection\.IdleTimeout$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.Connection\.InactivityTimeout$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.Connection$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.Endpoints$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.Locator\.EndpointSelection$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.Locator\.ConnectionCached$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.Locator\.PreferSecure$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.Locator\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.Locator\.InvocationTimeout$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.Locator\.Locator$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.Locator\.Router$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.Locator\.CollocationOptimized$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.Locator\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.Locator$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.PublishedEndpoints$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.ReplicaGroupId$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.Router\.EndpointSelection$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.Router\.ConnectionCached$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.Router\.PreferSecure$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.Router\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.Router\.InvocationTimeout$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.Router\.Locator$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.Router\.Router$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.Router\.CollocationOptimized$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.Router\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.Router$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.ProxyOptions$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.ThreadPool\.Size$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.ThreadPool\.SizeMax$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.ThreadPool\.SizeWarn$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.ThreadPool\.StackSize$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.ThreadPool\.Serialize$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.ThreadPool\.ThreadIdleTime$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.ThreadPool\.ThreadPriority$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Reply\.MessageSizeMax$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.ACM\.Timeout$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.ACM\.Heartbeat$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.ACM\.Close$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.ACM$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.AdapterId$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.Connection\.CloseTimeout$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.Connection\.ConnectTimeout$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.Connection\.EnableIdleCheck$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.Connection\.IdleTimeout$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.Connection\.InactivityTimeout$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.Connection$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.Endpoints$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.Locator\.EndpointSelection$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.Locator\.ConnectionCached$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.Locator\.PreferSecure$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.Locator\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.Locator\.InvocationTimeout$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.Locator\.Locator$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.Locator\.Router$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.Locator\.CollocationOptimized$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.Locator\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.Locator$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.PublishedEndpoints$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.ReplicaGroupId$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.Router\.EndpointSelection$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.Router\.ConnectionCached$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.Router\.PreferSecure$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.Router\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.Router\.InvocationTimeout$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.Router\.Locator$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.Router\.Router$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.Router\.CollocationOptimized$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.Router\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.Router$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.ProxyOptions$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.ThreadPool\.Size$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.ThreadPool\.SizeMax$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.ThreadPool\.SizeWarn$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.ThreadPool\.StackSize$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.ThreadPool\.Serialize$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.ThreadPool\.ThreadIdleTime$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.ThreadPool\.ThreadPriority$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Locator\.MessageSizeMax$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Lookup$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Timeout$", false, null),
-             new Property(@"^IceLocatorDiscovery\.RetryCount$", false, null),
-             new Property(@"^IceLocatorDiscovery\.RetryDelay$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Address$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Port$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Interface$", false, null),
-             new Property(@"^IceLocatorDiscovery\.InstanceName$", false, null),
-             new Property(@"^IceLocatorDiscovery\.Trace\.Lookup$", false, null),
-        };
+         new Property(@"^IceLocatorDiscovery\.Reply\.ACM\.Timeout$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.ACM\.Heartbeat$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.ACM\.Close$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.ACM$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.AdapterId$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.Connection\.CloseTimeout$", "10", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.Connection\.ConnectTimeout$", "10", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.Connection\.EnableIdleCheck$", "1", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.Connection\.IdleTimeout$", "60", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.Connection\.InactivityTimeout$", "300", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.Connection$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.Endpoints$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.Locator\.EndpointSelection$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.Locator\.ConnectionCached$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.Locator\.PreferSecure$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.Locator\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.Locator\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.Locator\.Locator$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.Locator\.Router$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.Locator\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.Locator\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.Locator$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.PublishedEndpoints$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.ReplicaGroupId$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.Router\.EndpointSelection$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.Router\.ConnectionCached$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.Router\.PreferSecure$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.Router\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.Router\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.Router\.Locator$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.Router\.Router$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.Router\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.Router\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.Router$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.ProxyOptions$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.ThreadPool\.Size$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.ThreadPool\.SizeMax$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.ThreadPool\.SizeWarn$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.ThreadPool\.StackSize$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.ThreadPool\.Serialize$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.ThreadPool\.ThreadIdleTime$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.ThreadPool\.ThreadPriority$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Reply\.MessageSizeMax$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.ACM\.Timeout$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.ACM\.Heartbeat$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.ACM\.Close$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.ACM$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.AdapterId$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.Connection\.CloseTimeout$", "10", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.Connection\.ConnectTimeout$", "10", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.Connection\.EnableIdleCheck$", "1", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.Connection\.IdleTimeout$", "60", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.Connection\.InactivityTimeout$", "300", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.Connection$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.Endpoints$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.Locator\.EndpointSelection$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.Locator\.ConnectionCached$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.Locator\.PreferSecure$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.Locator\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.Locator\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.Locator\.Locator$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.Locator\.Router$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.Locator\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.Locator\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.Locator$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.PublishedEndpoints$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.ReplicaGroupId$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.Router\.EndpointSelection$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.Router\.ConnectionCached$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.Router\.PreferSecure$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.Router\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.Router\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.Router\.Locator$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.Router\.Router$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.Router\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.Router\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.Router$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.ProxyOptions$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.ThreadPool\.Size$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.ThreadPool\.SizeMax$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.ThreadPool\.SizeWarn$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.ThreadPool\.StackSize$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.ThreadPool\.Serialize$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.ThreadPool\.ThreadIdleTime$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.ThreadPool\.ThreadPriority$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Locator\.MessageSizeMax$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Lookup$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Timeout$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.RetryCount$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.RetryDelay$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Address$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Port$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Interface$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.InstanceName$", "", false, null),
+         new Property(@"^IceLocatorDiscovery\.Trace\.Lookup$", "", false, null),
+    };
 
     public static Property[] IceBoxProps =
     {
-             new Property(@"^IceBox\.InheritProperties$", false, null),
-             new Property(@"^IceBox\.InstanceName$", true, null),
-             new Property(@"^IceBox\.LoadOrder$", false, null),
-             new Property(@"^IceBox\.PrintServicesReady$", false, null),
-             new Property(@"^IceBox\.Service\.[^\s]+$", false, null),
-             new Property(@"^IceBox\.ServiceManager\.AdapterId$", true, null),
-             new Property(@"^IceBox\.ServiceManager\.Endpoints$", true, null),
-             new Property(@"^IceBox\.ServiceManager\.Locator$", true, null),
-             new Property(@"^IceBox\.ServiceManager\.PublishedEndpoints$", true, null),
-             new Property(@"^IceBox\.ServiceManager\.ReplicaGroupId$", true, null),
-             new Property(@"^IceBox\.ServiceManager\.Router$", true, null),
-             new Property(@"^IceBox\.ServiceManager\.ThreadPool\.Size$", true, null),
-             new Property(@"^IceBox\.ServiceManager\.ThreadPool\.SizeMax$", true, null),
-             new Property(@"^IceBox\.ServiceManager\.ThreadPool\.SizeWarn$", true, null),
-             new Property(@"^IceBox\.ServiceManager\.ThreadPool\.StackSize$", true, null),
-             new Property(@"^IceBox\.Trace\.ServiceObserver$", false, null),
-             new Property(@"^IceBox\.UseSharedCommunicator\.[^\s]+$", false, null),
-        };
+         new Property(@"^IceBox\.InheritProperties$", "", false, null),
+         new Property(@"^IceBox\.InstanceName$", "", true, null),
+         new Property(@"^IceBox\.LoadOrder$", "", false, null),
+         new Property(@"^IceBox\.PrintServicesReady$", "", false, null),
+         new Property(@"^IceBox\.Service\.[^\s]+$", "", false, null),
+         new Property(@"^IceBox\.ServiceManager\.AdapterId$", "", true, null),
+         new Property(@"^IceBox\.ServiceManager\.Endpoints$", "", true, null),
+         new Property(@"^IceBox\.ServiceManager\.Locator$", "", true, null),
+         new Property(@"^IceBox\.ServiceManager\.PublishedEndpoints$", "", true, null),
+         new Property(@"^IceBox\.ServiceManager\.ReplicaGroupId$", "", true, null),
+         new Property(@"^IceBox\.ServiceManager\.Router$", "", true, null),
+         new Property(@"^IceBox\.ServiceManager\.ThreadPool\.Size$", "", true, null),
+         new Property(@"^IceBox\.ServiceManager\.ThreadPool\.SizeMax$", "", true, null),
+         new Property(@"^IceBox\.ServiceManager\.ThreadPool\.SizeWarn$", "", true, null),
+         new Property(@"^IceBox\.ServiceManager\.ThreadPool\.StackSize$", "", true, null),
+         new Property(@"^IceBox\.Trace\.ServiceObserver$", "", false, null),
+         new Property(@"^IceBox\.UseSharedCommunicator\.[^\s]+$", "", false, null),
+    };
 
     public static Property[] IceBoxAdminProps =
     {
-             new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy\.EndpointSelection$", false, null),
-             new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy\.ConnectionCached$", false, null),
-             new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy\.PreferSecure$", false, null),
-             new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy\.InvocationTimeout$", false, null),
-             new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy\.Locator$", false, null),
-             new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy\.Router$", false, null),
-             new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy\.CollocationOptimized$", false, null),
-             new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy$", false, null),
-        };
+         new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy\.EndpointSelection$", "", false, null),
+         new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy\.ConnectionCached$", "", false, null),
+         new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy\.PreferSecure$", "", false, null),
+         new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy\.Locator$", "", false, null),
+         new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy\.Router$", "", false, null),
+         new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceBoxAdmin\.ServiceManager\.Proxy$", "", false, null),
+    };
 
     public static Property[] IceBridgeProps =
     {
-             new Property(@"^IceBridge\.Source\.ACM\.Timeout$", false, null),
-             new Property(@"^IceBridge\.Source\.ACM\.Heartbeat$", false, null),
-             new Property(@"^IceBridge\.Source\.ACM\.Close$", false, null),
-             new Property(@"^IceBridge\.Source\.ACM$", false, null),
-             new Property(@"^IceBridge\.Source\.AdapterId$", false, null),
-             new Property(@"^IceBridge\.Source\.Connection\.CloseTimeout$", false, null),
-             new Property(@"^IceBridge\.Source\.Connection\.ConnectTimeout$", false, null),
-             new Property(@"^IceBridge\.Source\.Connection\.EnableIdleCheck$", false, null),
-             new Property(@"^IceBridge\.Source\.Connection\.IdleTimeout$", false, null),
-             new Property(@"^IceBridge\.Source\.Connection\.InactivityTimeout$", false, null),
-             new Property(@"^IceBridge\.Source\.Connection$", false, null),
-             new Property(@"^IceBridge\.Source\.Endpoints$", false, null),
-             new Property(@"^IceBridge\.Source\.Locator\.EndpointSelection$", false, null),
-             new Property(@"^IceBridge\.Source\.Locator\.ConnectionCached$", false, null),
-             new Property(@"^IceBridge\.Source\.Locator\.PreferSecure$", false, null),
-             new Property(@"^IceBridge\.Source\.Locator\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceBridge\.Source\.Locator\.InvocationTimeout$", false, null),
-             new Property(@"^IceBridge\.Source\.Locator\.Locator$", false, null),
-             new Property(@"^IceBridge\.Source\.Locator\.Router$", false, null),
-             new Property(@"^IceBridge\.Source\.Locator\.CollocationOptimized$", false, null),
-             new Property(@"^IceBridge\.Source\.Locator\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceBridge\.Source\.Locator$", false, null),
-             new Property(@"^IceBridge\.Source\.PublishedEndpoints$", false, null),
-             new Property(@"^IceBridge\.Source\.ReplicaGroupId$", false, null),
-             new Property(@"^IceBridge\.Source\.Router\.EndpointSelection$", false, null),
-             new Property(@"^IceBridge\.Source\.Router\.ConnectionCached$", false, null),
-             new Property(@"^IceBridge\.Source\.Router\.PreferSecure$", false, null),
-             new Property(@"^IceBridge\.Source\.Router\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceBridge\.Source\.Router\.InvocationTimeout$", false, null),
-             new Property(@"^IceBridge\.Source\.Router\.Locator$", false, null),
-             new Property(@"^IceBridge\.Source\.Router\.Router$", false, null),
-             new Property(@"^IceBridge\.Source\.Router\.CollocationOptimized$", false, null),
-             new Property(@"^IceBridge\.Source\.Router\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceBridge\.Source\.Router$", false, null),
-             new Property(@"^IceBridge\.Source\.ProxyOptions$", false, null),
-             new Property(@"^IceBridge\.Source\.ThreadPool\.Size$", false, null),
-             new Property(@"^IceBridge\.Source\.ThreadPool\.SizeMax$", false, null),
-             new Property(@"^IceBridge\.Source\.ThreadPool\.SizeWarn$", false, null),
-             new Property(@"^IceBridge\.Source\.ThreadPool\.StackSize$", false, null),
-             new Property(@"^IceBridge\.Source\.ThreadPool\.Serialize$", false, null),
-             new Property(@"^IceBridge\.Source\.ThreadPool\.ThreadIdleTime$", false, null),
-             new Property(@"^IceBridge\.Source\.ThreadPool\.ThreadPriority$", false, null),
-             new Property(@"^IceBridge\.Source\.MessageSizeMax$", false, null),
-             new Property(@"^IceBridge\.Target\.Endpoints$", false, null),
-             new Property(@"^IceBridge\.InstanceName$", false, null),
-        };
+         new Property(@"^IceBridge\.Source\.ACM\.Timeout$", "", false, null),
+         new Property(@"^IceBridge\.Source\.ACM\.Heartbeat$", "", false, null),
+         new Property(@"^IceBridge\.Source\.ACM\.Close$", "", false, null),
+         new Property(@"^IceBridge\.Source\.ACM$", "", false, null),
+         new Property(@"^IceBridge\.Source\.AdapterId$", "", false, null),
+         new Property(@"^IceBridge\.Source\.Connection\.CloseTimeout$", "10", false, null),
+         new Property(@"^IceBridge\.Source\.Connection\.ConnectTimeout$", "10", false, null),
+         new Property(@"^IceBridge\.Source\.Connection\.EnableIdleCheck$", "1", false, null),
+         new Property(@"^IceBridge\.Source\.Connection\.IdleTimeout$", "60", false, null),
+         new Property(@"^IceBridge\.Source\.Connection\.InactivityTimeout$", "300", false, null),
+         new Property(@"^IceBridge\.Source\.Connection$", "", false, null),
+         new Property(@"^IceBridge\.Source\.Endpoints$", "", false, null),
+         new Property(@"^IceBridge\.Source\.Locator\.EndpointSelection$", "", false, null),
+         new Property(@"^IceBridge\.Source\.Locator\.ConnectionCached$", "", false, null),
+         new Property(@"^IceBridge\.Source\.Locator\.PreferSecure$", "", false, null),
+         new Property(@"^IceBridge\.Source\.Locator\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceBridge\.Source\.Locator\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceBridge\.Source\.Locator\.Locator$", "", false, null),
+         new Property(@"^IceBridge\.Source\.Locator\.Router$", "", false, null),
+         new Property(@"^IceBridge\.Source\.Locator\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceBridge\.Source\.Locator\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceBridge\.Source\.Locator$", "", false, null),
+         new Property(@"^IceBridge\.Source\.PublishedEndpoints$", "", false, null),
+         new Property(@"^IceBridge\.Source\.ReplicaGroupId$", "", false, null),
+         new Property(@"^IceBridge\.Source\.Router\.EndpointSelection$", "", false, null),
+         new Property(@"^IceBridge\.Source\.Router\.ConnectionCached$", "", false, null),
+         new Property(@"^IceBridge\.Source\.Router\.PreferSecure$", "", false, null),
+         new Property(@"^IceBridge\.Source\.Router\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceBridge\.Source\.Router\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceBridge\.Source\.Router\.Locator$", "", false, null),
+         new Property(@"^IceBridge\.Source\.Router\.Router$", "", false, null),
+         new Property(@"^IceBridge\.Source\.Router\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceBridge\.Source\.Router\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceBridge\.Source\.Router$", "", false, null),
+         new Property(@"^IceBridge\.Source\.ProxyOptions$", "", false, null),
+         new Property(@"^IceBridge\.Source\.ThreadPool\.Size$", "", false, null),
+         new Property(@"^IceBridge\.Source\.ThreadPool\.SizeMax$", "", false, null),
+         new Property(@"^IceBridge\.Source\.ThreadPool\.SizeWarn$", "", false, null),
+         new Property(@"^IceBridge\.Source\.ThreadPool\.StackSize$", "", false, null),
+         new Property(@"^IceBridge\.Source\.ThreadPool\.Serialize$", "", false, null),
+         new Property(@"^IceBridge\.Source\.ThreadPool\.ThreadIdleTime$", "", false, null),
+         new Property(@"^IceBridge\.Source\.ThreadPool\.ThreadPriority$", "", false, null),
+         new Property(@"^IceBridge\.Source\.MessageSizeMax$", "", false, null),
+         new Property(@"^IceBridge\.Target\.Endpoints$", "", false, null),
+         new Property(@"^IceBridge\.InstanceName$", "", false, null),
+    };
 
     public static Property[] IceGridAdminProps =
     {
-             new Property(@"^IceGridAdmin\.AuthenticateUsingSSL$", false, null),
-             new Property(@"^IceGridAdmin\.MetricsConfig$", false, null),
-             new Property(@"^IceGridAdmin\.Username$", false, null),
-             new Property(@"^IceGridAdmin\.Password$", false, null),
-             new Property(@"^IceGridAdmin\.Replica$", false, null),
-             new Property(@"^IceGridAdmin\.Host$", false, null),
-             new Property(@"^IceGridAdmin\.Port$", false, null),
-             new Property(@"^IceGridAdmin\.InstanceName$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.ACM\.Timeout$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.ACM\.Heartbeat$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.ACM\.Close$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.ACM$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.AdapterId$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.Connection\.CloseTimeout$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.Connection\.ConnectTimeout$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.Connection\.EnableIdleCheck$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.Connection\.IdleTimeout$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.Connection\.InactivityTimeout$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.Connection$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.Endpoints$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.Locator\.EndpointSelection$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.Locator\.ConnectionCached$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.Locator\.PreferSecure$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.Locator\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.Locator\.InvocationTimeout$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.Locator\.Locator$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.Locator\.Router$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.Locator\.CollocationOptimized$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.Locator\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.Locator$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.PublishedEndpoints$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.ReplicaGroupId$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.Router\.EndpointSelection$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.Router\.ConnectionCached$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.Router\.PreferSecure$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.Router\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.Router\.InvocationTimeout$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.Router\.Locator$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.Router\.Router$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.Router\.CollocationOptimized$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.Router\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.Router$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.ProxyOptions$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.ThreadPool\.Size$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.ThreadPool\.SizeMax$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.ThreadPool\.SizeWarn$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.ThreadPool\.StackSize$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.ThreadPool\.Serialize$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.ThreadPool\.ThreadIdleTime$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.ThreadPool\.ThreadPriority$", false, null),
-             new Property(@"^IceGridAdmin\.Server\.MessageSizeMax$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Address$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Interface$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Lookup$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.ACM\.Timeout$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.ACM\.Heartbeat$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.ACM\.Close$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.ACM$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.AdapterId$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.Connection\.CloseTimeout$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.Connection\.ConnectTimeout$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.Connection\.EnableIdleCheck$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.Connection\.IdleTimeout$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.Connection\.InactivityTimeout$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.Connection$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.Endpoints$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.Locator\.EndpointSelection$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.Locator\.ConnectionCached$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.Locator\.PreferSecure$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.Locator\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.Locator\.InvocationTimeout$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.Locator\.Locator$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.Locator\.Router$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.Locator\.CollocationOptimized$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.Locator\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.Locator$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.PublishedEndpoints$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.ReplicaGroupId$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.Router\.EndpointSelection$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.Router\.ConnectionCached$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.Router\.PreferSecure$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.Router\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.Router\.InvocationTimeout$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.Router\.Locator$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.Router\.Router$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.Router\.CollocationOptimized$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.Router\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.Router$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.ProxyOptions$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.ThreadPool\.Size$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.ThreadPool\.SizeMax$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.ThreadPool\.SizeWarn$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.ThreadPool\.StackSize$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.ThreadPool\.Serialize$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.ThreadPool\.ThreadIdleTime$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.ThreadPool\.ThreadPriority$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Reply\.MessageSizeMax$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.ACM\.Timeout$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.ACM\.Heartbeat$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.ACM\.Close$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.ACM$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.AdapterId$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.Connection\.CloseTimeout$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.Connection\.ConnectTimeout$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.Connection\.EnableIdleCheck$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.Connection\.IdleTimeout$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.Connection\.InactivityTimeout$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.Connection$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.Endpoints$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.Locator\.EndpointSelection$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.Locator\.ConnectionCached$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.Locator\.PreferSecure$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.Locator\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.Locator\.InvocationTimeout$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.Locator\.Locator$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.Locator\.Router$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.Locator\.CollocationOptimized$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.Locator\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.Locator$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.PublishedEndpoints$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.ReplicaGroupId$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.Router\.EndpointSelection$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.Router\.ConnectionCached$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.Router\.PreferSecure$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.Router\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.Router\.InvocationTimeout$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.Router\.Locator$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.Router\.Router$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.Router\.CollocationOptimized$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.Router\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.Router$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.ProxyOptions$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.ThreadPool\.Size$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.ThreadPool\.SizeMax$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.ThreadPool\.SizeWarn$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.ThreadPool\.StackSize$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.ThreadPool\.Serialize$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.ThreadPool\.ThreadIdleTime$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.ThreadPool\.ThreadPriority$", false, null),
-             new Property(@"^IceGridAdmin\.Discovery\.Locator\.MessageSizeMax$", false, null),
-             new Property(@"^IceGridAdmin\.Trace\.Observers$", false, null),
-             new Property(@"^IceGridAdmin\.Trace\.SaveToRegistry$", false, null),
-        };
+         new Property(@"^IceGridAdmin\.AuthenticateUsingSSL$", "", false, null),
+         new Property(@"^IceGridAdmin\.MetricsConfig$", "", false, null),
+         new Property(@"^IceGridAdmin\.Username$", "", false, null),
+         new Property(@"^IceGridAdmin\.Password$", "", false, null),
+         new Property(@"^IceGridAdmin\.Replica$", "", false, null),
+         new Property(@"^IceGridAdmin\.Host$", "", false, null),
+         new Property(@"^IceGridAdmin\.Port$", "", false, null),
+         new Property(@"^IceGridAdmin\.InstanceName$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.ACM\.Timeout$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.ACM\.Heartbeat$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.ACM\.Close$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.ACM$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.AdapterId$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.Connection\.CloseTimeout$", "10", false, null),
+         new Property(@"^IceGridAdmin\.Server\.Connection\.ConnectTimeout$", "10", false, null),
+         new Property(@"^IceGridAdmin\.Server\.Connection\.EnableIdleCheck$", "1", false, null),
+         new Property(@"^IceGridAdmin\.Server\.Connection\.IdleTimeout$", "60", false, null),
+         new Property(@"^IceGridAdmin\.Server\.Connection\.InactivityTimeout$", "300", false, null),
+         new Property(@"^IceGridAdmin\.Server\.Connection$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.Endpoints$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.Locator\.EndpointSelection$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.Locator\.ConnectionCached$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.Locator\.PreferSecure$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.Locator\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.Locator\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.Locator\.Locator$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.Locator\.Router$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.Locator\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.Locator\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.Locator$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.PublishedEndpoints$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.ReplicaGroupId$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.Router\.EndpointSelection$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.Router\.ConnectionCached$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.Router\.PreferSecure$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.Router\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.Router\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.Router\.Locator$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.Router\.Router$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.Router\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.Router\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.Router$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.ProxyOptions$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.ThreadPool\.Size$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.ThreadPool\.SizeMax$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.ThreadPool\.SizeWarn$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.ThreadPool\.StackSize$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.ThreadPool\.Serialize$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.ThreadPool\.ThreadIdleTime$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.ThreadPool\.ThreadPriority$", "", false, null),
+         new Property(@"^IceGridAdmin\.Server\.MessageSizeMax$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Address$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Interface$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Lookup$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.ACM\.Timeout$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.ACM\.Heartbeat$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.ACM\.Close$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.ACM$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.AdapterId$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.Connection\.CloseTimeout$", "10", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.Connection\.ConnectTimeout$", "10", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.Connection\.EnableIdleCheck$", "1", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.Connection\.IdleTimeout$", "60", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.Connection\.InactivityTimeout$", "300", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.Connection$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.Endpoints$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.Locator\.EndpointSelection$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.Locator\.ConnectionCached$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.Locator\.PreferSecure$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.Locator\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.Locator\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.Locator\.Locator$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.Locator\.Router$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.Locator\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.Locator\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.Locator$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.PublishedEndpoints$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.ReplicaGroupId$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.Router\.EndpointSelection$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.Router\.ConnectionCached$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.Router\.PreferSecure$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.Router\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.Router\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.Router\.Locator$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.Router\.Router$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.Router\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.Router\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.Router$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.ProxyOptions$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.ThreadPool\.Size$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.ThreadPool\.SizeMax$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.ThreadPool\.SizeWarn$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.ThreadPool\.StackSize$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.ThreadPool\.Serialize$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.ThreadPool\.ThreadIdleTime$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.ThreadPool\.ThreadPriority$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Reply\.MessageSizeMax$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.ACM\.Timeout$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.ACM\.Heartbeat$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.ACM\.Close$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.ACM$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.AdapterId$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.Connection\.CloseTimeout$", "10", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.Connection\.ConnectTimeout$", "10", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.Connection\.EnableIdleCheck$", "1", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.Connection\.IdleTimeout$", "60", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.Connection\.InactivityTimeout$", "300", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.Connection$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.Endpoints$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.Locator\.EndpointSelection$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.Locator\.ConnectionCached$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.Locator\.PreferSecure$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.Locator\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.Locator\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.Locator\.Locator$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.Locator\.Router$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.Locator\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.Locator\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.Locator$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.PublishedEndpoints$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.ReplicaGroupId$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.Router\.EndpointSelection$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.Router\.ConnectionCached$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.Router\.PreferSecure$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.Router\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.Router\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.Router\.Locator$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.Router\.Router$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.Router\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.Router\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.Router$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.ProxyOptions$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.ThreadPool\.Size$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.ThreadPool\.SizeMax$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.ThreadPool\.SizeWarn$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.ThreadPool\.StackSize$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.ThreadPool\.Serialize$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.ThreadPool\.ThreadIdleTime$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.ThreadPool\.ThreadPriority$", "", false, null),
+         new Property(@"^IceGridAdmin\.Discovery\.Locator\.MessageSizeMax$", "", false, null),
+         new Property(@"^IceGridAdmin\.Trace\.Observers$", "", false, null),
+         new Property(@"^IceGridAdmin\.Trace\.SaveToRegistry$", "", false, null),
+    };
 
     public static Property[] IceGridProps =
     {
-             new Property(@"^IceGrid\.AdminRouter\.ACM\.Timeout$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.ACM\.Heartbeat$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.ACM\.Close$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.ACM$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.AdapterId$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.Connection\.CloseTimeout$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.Connection\.ConnectTimeout$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.Connection\.EnableIdleCheck$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.Connection\.IdleTimeout$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.Connection\.InactivityTimeout$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.Connection$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.Endpoints$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.Locator\.EndpointSelection$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.Locator\.ConnectionCached$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.Locator\.PreferSecure$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.Locator\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.Locator\.InvocationTimeout$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.Locator\.Locator$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.Locator\.Router$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.Locator\.CollocationOptimized$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.Locator\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.Locator$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.PublishedEndpoints$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.ReplicaGroupId$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.Router\.EndpointSelection$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.Router\.ConnectionCached$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.Router\.PreferSecure$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.Router\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.Router\.InvocationTimeout$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.Router\.Locator$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.Router\.Router$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.Router\.CollocationOptimized$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.Router\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.Router$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.ProxyOptions$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.ThreadPool\.Size$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.ThreadPool\.SizeMax$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.ThreadPool\.SizeWarn$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.ThreadPool\.StackSize$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.ThreadPool\.Serialize$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.ThreadPool\.ThreadIdleTime$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.ThreadPool\.ThreadPriority$", false, null),
-             new Property(@"^IceGrid\.AdminRouter\.MessageSizeMax$", false, null),
-             new Property(@"^IceGrid\.InstanceName$", false, null),
-             new Property(@"^IceGrid\.Node\.ACM\.Timeout$", false, null),
-             new Property(@"^IceGrid\.Node\.ACM\.Heartbeat$", false, null),
-             new Property(@"^IceGrid\.Node\.ACM\.Close$", false, null),
-             new Property(@"^IceGrid\.Node\.ACM$", false, null),
-             new Property(@"^IceGrid\.Node\.AdapterId$", false, null),
-             new Property(@"^IceGrid\.Node\.Connection\.CloseTimeout$", false, null),
-             new Property(@"^IceGrid\.Node\.Connection\.ConnectTimeout$", false, null),
-             new Property(@"^IceGrid\.Node\.Connection\.EnableIdleCheck$", false, null),
-             new Property(@"^IceGrid\.Node\.Connection\.IdleTimeout$", false, null),
-             new Property(@"^IceGrid\.Node\.Connection\.InactivityTimeout$", false, null),
-             new Property(@"^IceGrid\.Node\.Connection$", false, null),
-             new Property(@"^IceGrid\.Node\.Endpoints$", false, null),
-             new Property(@"^IceGrid\.Node\.Locator\.EndpointSelection$", false, null),
-             new Property(@"^IceGrid\.Node\.Locator\.ConnectionCached$", false, null),
-             new Property(@"^IceGrid\.Node\.Locator\.PreferSecure$", false, null),
-             new Property(@"^IceGrid\.Node\.Locator\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGrid\.Node\.Locator\.InvocationTimeout$", false, null),
-             new Property(@"^IceGrid\.Node\.Locator\.Locator$", false, null),
-             new Property(@"^IceGrid\.Node\.Locator\.Router$", false, null),
-             new Property(@"^IceGrid\.Node\.Locator\.CollocationOptimized$", false, null),
-             new Property(@"^IceGrid\.Node\.Locator\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGrid\.Node\.Locator$", false, null),
-             new Property(@"^IceGrid\.Node\.PublishedEndpoints$", false, null),
-             new Property(@"^IceGrid\.Node\.ReplicaGroupId$", false, null),
-             new Property(@"^IceGrid\.Node\.Router\.EndpointSelection$", false, null),
-             new Property(@"^IceGrid\.Node\.Router\.ConnectionCached$", false, null),
-             new Property(@"^IceGrid\.Node\.Router\.PreferSecure$", false, null),
-             new Property(@"^IceGrid\.Node\.Router\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGrid\.Node\.Router\.InvocationTimeout$", false, null),
-             new Property(@"^IceGrid\.Node\.Router\.Locator$", false, null),
-             new Property(@"^IceGrid\.Node\.Router\.Router$", false, null),
-             new Property(@"^IceGrid\.Node\.Router\.CollocationOptimized$", false, null),
-             new Property(@"^IceGrid\.Node\.Router\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGrid\.Node\.Router$", false, null),
-             new Property(@"^IceGrid\.Node\.ProxyOptions$", false, null),
-             new Property(@"^IceGrid\.Node\.ThreadPool\.Size$", false, null),
-             new Property(@"^IceGrid\.Node\.ThreadPool\.SizeMax$", false, null),
-             new Property(@"^IceGrid\.Node\.ThreadPool\.SizeWarn$", false, null),
-             new Property(@"^IceGrid\.Node\.ThreadPool\.StackSize$", false, null),
-             new Property(@"^IceGrid\.Node\.ThreadPool\.Serialize$", false, null),
-             new Property(@"^IceGrid\.Node\.ThreadPool\.ThreadIdleTime$", false, null),
-             new Property(@"^IceGrid\.Node\.ThreadPool\.ThreadPriority$", false, null),
-             new Property(@"^IceGrid\.Node\.MessageSizeMax$", false, null),
-             new Property(@"^IceGrid\.Node\.AllowRunningServersAsRoot$", false, null),
-             new Property(@"^IceGrid\.Node\.AllowEndpointsOverride$", false, null),
-             new Property(@"^IceGrid\.Node\.CollocateRegistry$", false, null),
-             new Property(@"^IceGrid\.Node\.Data$", false, null),
-             new Property(@"^IceGrid\.Node\.DisableOnFailure$", false, null),
-             new Property(@"^IceGrid\.Node\.Name$", false, null),
-             new Property(@"^IceGrid\.Node\.Output$", false, null),
-             new Property(@"^IceGrid\.Node\.ProcessorSocketCount$", false, null),
-             new Property(@"^IceGrid\.Node\.PrintServersReady$", false, null),
-             new Property(@"^IceGrid\.Node\.PropertiesOverride$", false, null),
-             new Property(@"^IceGrid\.Node\.RedirectErrToOut$", false, null),
-             new Property(@"^IceGrid\.Node\.Trace\.Activator$", false, null),
-             new Property(@"^IceGrid\.Node\.Trace\.Adapter$", false, null),
-             new Property(@"^IceGrid\.Node\.Trace\.Admin$", false, null),
-             new Property(@"^IceGrid\.Node\.Trace\.Patch$", false, null),
-             new Property(@"^IceGrid\.Node\.Trace\.Replica$", false, null),
-             new Property(@"^IceGrid\.Node\.Trace\.Server$", false, null),
-             new Property(@"^IceGrid\.Node\.UserAccounts$", false, null),
-             new Property(@"^IceGrid\.Node\.UserAccountMapper\.EndpointSelection$", false, null),
-             new Property(@"^IceGrid\.Node\.UserAccountMapper\.ConnectionCached$", false, null),
-             new Property(@"^IceGrid\.Node\.UserAccountMapper\.PreferSecure$", false, null),
-             new Property(@"^IceGrid\.Node\.UserAccountMapper\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGrid\.Node\.UserAccountMapper\.InvocationTimeout$", false, null),
-             new Property(@"^IceGrid\.Node\.UserAccountMapper\.Locator$", false, null),
-             new Property(@"^IceGrid\.Node\.UserAccountMapper\.Router$", false, null),
-             new Property(@"^IceGrid\.Node\.UserAccountMapper\.CollocationOptimized$", false, null),
-             new Property(@"^IceGrid\.Node\.UserAccountMapper\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGrid\.Node\.UserAccountMapper$", false, null),
-             new Property(@"^IceGrid\.Node\.WaitTime$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminCryptPasswords$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminPermissionsVerifier\.EndpointSelection$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminPermissionsVerifier\.ConnectionCached$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminPermissionsVerifier\.PreferSecure$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminPermissionsVerifier\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminPermissionsVerifier\.InvocationTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminPermissionsVerifier\.Locator$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminPermissionsVerifier\.Router$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminPermissionsVerifier\.CollocationOptimized$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminPermissionsVerifier\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminPermissionsVerifier$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionFilters$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.ACM\.Timeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.ACM\.Heartbeat$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.ACM\.Close$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.ACM$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.AdapterId$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Connection\.CloseTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Connection\.ConnectTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Connection\.EnableIdleCheck$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Connection\.IdleTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Connection\.InactivityTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Connection$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Endpoints$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Locator\.EndpointSelection$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Locator\.ConnectionCached$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Locator\.PreferSecure$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Locator\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Locator\.InvocationTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Locator\.Locator$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Locator\.Router$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Locator\.CollocationOptimized$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Locator\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Locator$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.PublishedEndpoints$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.ReplicaGroupId$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Router\.EndpointSelection$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Router\.ConnectionCached$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Router\.PreferSecure$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Router\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Router\.InvocationTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Router\.Locator$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Router\.Router$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Router\.CollocationOptimized$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Router\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Router$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.ProxyOptions$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.ThreadPool\.Size$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.ThreadPool\.SizeMax$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.ThreadPool\.SizeWarn$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.ThreadPool\.StackSize$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.ThreadPool\.Serialize$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.ThreadPool\.ThreadIdleTime$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.ThreadPool\.ThreadPriority$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSessionManager\.MessageSizeMax$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSSLPermissionsVerifier\.EndpointSelection$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSSLPermissionsVerifier\.ConnectionCached$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSSLPermissionsVerifier\.PreferSecure$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSSLPermissionsVerifier\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSSLPermissionsVerifier\.InvocationTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSSLPermissionsVerifier\.Locator$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSSLPermissionsVerifier\.Router$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSSLPermissionsVerifier\.CollocationOptimized$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSSLPermissionsVerifier\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGrid\.Registry\.AdminSSLPermissionsVerifier$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.ACM\.Timeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.ACM\.Heartbeat$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.ACM\.Close$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.ACM$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.AdapterId$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.Connection\.CloseTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.Connection\.ConnectTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.Connection\.EnableIdleCheck$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.Connection\.IdleTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.Connection\.InactivityTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.Connection$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.Endpoints$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.Locator\.EndpointSelection$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.Locator\.ConnectionCached$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.Locator\.PreferSecure$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.Locator\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.Locator\.InvocationTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.Locator\.Locator$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.Locator\.Router$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.Locator\.CollocationOptimized$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.Locator\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.Locator$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.PublishedEndpoints$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.ReplicaGroupId$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.Router\.EndpointSelection$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.Router\.ConnectionCached$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.Router\.PreferSecure$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.Router\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.Router\.InvocationTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.Router\.Locator$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.Router\.Router$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.Router\.CollocationOptimized$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.Router\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.Router$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.ProxyOptions$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.ThreadPool\.Size$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.ThreadPool\.SizeMax$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.ThreadPool\.SizeWarn$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.ThreadPool\.StackSize$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.ThreadPool\.Serialize$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.ThreadPool\.ThreadIdleTime$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.ThreadPool\.ThreadPriority$", false, null),
-             new Property(@"^IceGrid\.Registry\.Client\.MessageSizeMax$", false, null),
-             new Property(@"^IceGrid\.Registry\.CryptPasswords$", false, null),
-             new Property(@"^IceGrid\.Registry\.DefaultTemplates$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.ACM\.Timeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.ACM\.Heartbeat$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.ACM\.Close$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.ACM$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.AdapterId$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Connection\.CloseTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Connection\.ConnectTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Connection\.EnableIdleCheck$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Connection\.IdleTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Connection\.InactivityTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Connection$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Endpoints$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Locator\.EndpointSelection$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Locator\.ConnectionCached$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Locator\.PreferSecure$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Locator\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Locator\.InvocationTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Locator\.Locator$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Locator\.Router$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Locator\.CollocationOptimized$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Locator\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Locator$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.PublishedEndpoints$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.ReplicaGroupId$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Router\.EndpointSelection$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Router\.ConnectionCached$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Router\.PreferSecure$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Router\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Router\.InvocationTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Router\.Locator$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Router\.Router$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Router\.CollocationOptimized$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Router\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Router$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.ProxyOptions$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.ThreadPool\.Size$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.ThreadPool\.SizeMax$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.ThreadPool\.SizeWarn$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.ThreadPool\.StackSize$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.ThreadPool\.Serialize$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.ThreadPool\.ThreadIdleTime$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.ThreadPool\.ThreadPriority$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.MessageSizeMax$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Enabled$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Address$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Port$", false, null),
-             new Property(@"^IceGrid\.Registry\.Discovery\.Interface$", false, null),
-             new Property(@"^IceGrid\.Registry\.DynamicRegistration$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.ACM\.Timeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.ACM\.Heartbeat$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.ACM\.Close$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.ACM$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.AdapterId$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.Connection\.CloseTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.Connection\.ConnectTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.Connection\.EnableIdleCheck$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.Connection\.IdleTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.Connection\.InactivityTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.Connection$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.Endpoints$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.Locator\.EndpointSelection$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.Locator\.ConnectionCached$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.Locator\.PreferSecure$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.Locator\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.Locator\.InvocationTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.Locator\.Locator$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.Locator\.Router$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.Locator\.CollocationOptimized$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.Locator\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.Locator$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.PublishedEndpoints$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.ReplicaGroupId$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.Router\.EndpointSelection$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.Router\.ConnectionCached$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.Router\.PreferSecure$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.Router\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.Router\.InvocationTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.Router\.Locator$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.Router\.Router$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.Router\.CollocationOptimized$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.Router\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.Router$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.ProxyOptions$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.ThreadPool\.Size$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.ThreadPool\.SizeMax$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.ThreadPool\.SizeWarn$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.ThreadPool\.StackSize$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.ThreadPool\.Serialize$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.ThreadPool\.ThreadIdleTime$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.ThreadPool\.ThreadPriority$", false, null),
-             new Property(@"^IceGrid\.Registry\.Internal\.MessageSizeMax$", false, null),
-             new Property(@"^IceGrid\.Registry\.LMDB\.MapSize$", false, null),
-             new Property(@"^IceGrid\.Registry\.LMDB\.Path$", false, null),
-             new Property(@"^IceGrid\.Registry\.PermissionsVerifier\.EndpointSelection$", false, null),
-             new Property(@"^IceGrid\.Registry\.PermissionsVerifier\.ConnectionCached$", false, null),
-             new Property(@"^IceGrid\.Registry\.PermissionsVerifier\.PreferSecure$", false, null),
-             new Property(@"^IceGrid\.Registry\.PermissionsVerifier\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.PermissionsVerifier\.InvocationTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.PermissionsVerifier\.Locator$", false, null),
-             new Property(@"^IceGrid\.Registry\.PermissionsVerifier\.Router$", false, null),
-             new Property(@"^IceGrid\.Registry\.PermissionsVerifier\.CollocationOptimized$", false, null),
-             new Property(@"^IceGrid\.Registry\.PermissionsVerifier\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGrid\.Registry\.PermissionsVerifier$", false, null),
-             new Property(@"^IceGrid\.Registry\.ReplicaName$", false, null),
-             new Property(@"^IceGrid\.Registry\.RequireNodeCertCN$", false, null),
-             new Property(@"^IceGrid\.Registry\.RequireReplicaCertCN$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.ACM\.Timeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.ACM\.Heartbeat$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.ACM\.Close$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.ACM$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.AdapterId$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.Connection\.CloseTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.Connection\.ConnectTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.Connection\.EnableIdleCheck$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.Connection\.IdleTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.Connection\.InactivityTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.Connection$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.Endpoints$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.Locator\.EndpointSelection$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.Locator\.ConnectionCached$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.Locator\.PreferSecure$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.Locator\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.Locator\.InvocationTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.Locator\.Locator$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.Locator\.Router$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.Locator\.CollocationOptimized$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.Locator\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.Locator$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.PublishedEndpoints$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.ReplicaGroupId$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.Router\.EndpointSelection$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.Router\.ConnectionCached$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.Router\.PreferSecure$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.Router\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.Router\.InvocationTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.Router\.Locator$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.Router\.Router$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.Router\.CollocationOptimized$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.Router\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.Router$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.ProxyOptions$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.ThreadPool\.Size$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.ThreadPool\.SizeMax$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.ThreadPool\.SizeWarn$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.ThreadPool\.StackSize$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.ThreadPool\.Serialize$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.ThreadPool\.ThreadIdleTime$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.ThreadPool\.ThreadPriority$", false, null),
-             new Property(@"^IceGrid\.Registry\.Server\.MessageSizeMax$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionFilters$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.ACM\.Timeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.ACM\.Heartbeat$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.ACM\.Close$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.ACM$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.AdapterId$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.Connection\.CloseTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.Connection\.ConnectTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.Connection\.EnableIdleCheck$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.Connection\.IdleTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.Connection\.InactivityTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.Connection$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.Endpoints$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.Locator\.EndpointSelection$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.Locator\.ConnectionCached$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.Locator\.PreferSecure$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.Locator\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.Locator\.InvocationTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.Locator\.Locator$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.Locator\.Router$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.Locator\.CollocationOptimized$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.Locator\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.Locator$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.PublishedEndpoints$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.ReplicaGroupId$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.Router\.EndpointSelection$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.Router\.ConnectionCached$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.Router\.PreferSecure$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.Router\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.Router\.InvocationTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.Router\.Locator$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.Router\.Router$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.Router\.CollocationOptimized$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.Router\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.Router$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.ProxyOptions$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.ThreadPool\.Size$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.ThreadPool\.SizeMax$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.ThreadPool\.SizeWarn$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.ThreadPool\.StackSize$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.ThreadPool\.Serialize$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.ThreadPool\.ThreadIdleTime$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.ThreadPool\.ThreadPriority$", false, null),
-             new Property(@"^IceGrid\.Registry\.SessionManager\.MessageSizeMax$", false, null),
-             new Property(@"^IceGrid\.Registry\.SSLPermissionsVerifier\.EndpointSelection$", false, null),
-             new Property(@"^IceGrid\.Registry\.SSLPermissionsVerifier\.ConnectionCached$", false, null),
-             new Property(@"^IceGrid\.Registry\.SSLPermissionsVerifier\.PreferSecure$", false, null),
-             new Property(@"^IceGrid\.Registry\.SSLPermissionsVerifier\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.SSLPermissionsVerifier\.InvocationTimeout$", false, null),
-             new Property(@"^IceGrid\.Registry\.SSLPermissionsVerifier\.Locator$", false, null),
-             new Property(@"^IceGrid\.Registry\.SSLPermissionsVerifier\.Router$", false, null),
-             new Property(@"^IceGrid\.Registry\.SSLPermissionsVerifier\.CollocationOptimized$", false, null),
-             new Property(@"^IceGrid\.Registry\.SSLPermissionsVerifier\.Context\.[^\s]+$", false, null),
-             new Property(@"^IceGrid\.Registry\.SSLPermissionsVerifier$", false, null),
-             new Property(@"^IceGrid\.Registry\.Trace\.Admin$", false, null),
-             new Property(@"^IceGrid\.Registry\.Trace\.Application$", false, null),
-             new Property(@"^IceGrid\.Registry\.Trace\.Adapter$", false, null),
-             new Property(@"^IceGrid\.Registry\.Trace\.Discovery$", false, null),
-             new Property(@"^IceGrid\.Registry\.Trace\.Locator$", false, null),
-             new Property(@"^IceGrid\.Registry\.Trace\.Node$", false, null),
-             new Property(@"^IceGrid\.Registry\.Trace\.Object$", false, null),
-             new Property(@"^IceGrid\.Registry\.Trace\.Patch$", false, null),
-             new Property(@"^IceGrid\.Registry\.Trace\.Replica$", false, null),
-             new Property(@"^IceGrid\.Registry\.Trace\.Server$", false, null),
-             new Property(@"^IceGrid\.Registry\.Trace\.Session$", false, null),
-             new Property(@"^IceGrid\.Registry\.Trace\.Subscriber$", false, null),
-             new Property(@"^IceGrid\.Registry\.Trace\.Topic$", false, null),
-             new Property(@"^IceGrid\.Registry\.Trace\.TopicManager$", false, null),
-             new Property(@"^IceGrid\.Registry\.UserAccounts$", false, null),
-        };
+         new Property(@"^IceGrid\.AdminRouter\.ACM\.Timeout$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.ACM\.Heartbeat$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.ACM\.Close$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.ACM$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.AdapterId$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.Connection\.CloseTimeout$", "10", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.Connection\.ConnectTimeout$", "10", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.Connection\.EnableIdleCheck$", "1", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.Connection\.IdleTimeout$", "60", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.Connection\.InactivityTimeout$", "300", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.Connection$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.Endpoints$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.Locator\.EndpointSelection$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.Locator\.ConnectionCached$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.Locator\.PreferSecure$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.Locator\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.Locator\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.Locator\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.Locator\.Router$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.Locator\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.Locator\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.PublishedEndpoints$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.ReplicaGroupId$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.Router\.EndpointSelection$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.Router\.ConnectionCached$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.Router\.PreferSecure$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.Router\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.Router\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.Router\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.Router\.Router$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.Router\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.Router\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.Router$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.ProxyOptions$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.ThreadPool\.Size$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.ThreadPool\.SizeMax$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.ThreadPool\.SizeWarn$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.ThreadPool\.StackSize$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.ThreadPool\.Serialize$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.ThreadPool\.ThreadIdleTime$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.ThreadPool\.ThreadPriority$", "", false, null),
+         new Property(@"^IceGrid\.AdminRouter\.MessageSizeMax$", "", false, null),
+         new Property(@"^IceGrid\.InstanceName$", "", false, null),
+         new Property(@"^IceGrid\.Node\.ACM\.Timeout$", "", false, null),
+         new Property(@"^IceGrid\.Node\.ACM\.Heartbeat$", "", false, null),
+         new Property(@"^IceGrid\.Node\.ACM\.Close$", "", false, null),
+         new Property(@"^IceGrid\.Node\.ACM$", "", false, null),
+         new Property(@"^IceGrid\.Node\.AdapterId$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Connection\.CloseTimeout$", "10", false, null),
+         new Property(@"^IceGrid\.Node\.Connection\.ConnectTimeout$", "10", false, null),
+         new Property(@"^IceGrid\.Node\.Connection\.EnableIdleCheck$", "1", false, null),
+         new Property(@"^IceGrid\.Node\.Connection\.IdleTimeout$", "60", false, null),
+         new Property(@"^IceGrid\.Node\.Connection\.InactivityTimeout$", "300", false, null),
+         new Property(@"^IceGrid\.Node\.Connection$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Endpoints$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Locator\.EndpointSelection$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Locator\.ConnectionCached$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Locator\.PreferSecure$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Locator\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Locator\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Locator\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Locator\.Router$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Locator\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Locator\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.Node\.PublishedEndpoints$", "", false, null),
+         new Property(@"^IceGrid\.Node\.ReplicaGroupId$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Router\.EndpointSelection$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Router\.ConnectionCached$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Router\.PreferSecure$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Router\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Router\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Router\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Router\.Router$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Router\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Router\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Router$", "", false, null),
+         new Property(@"^IceGrid\.Node\.ProxyOptions$", "", false, null),
+         new Property(@"^IceGrid\.Node\.ThreadPool\.Size$", "", false, null),
+         new Property(@"^IceGrid\.Node\.ThreadPool\.SizeMax$", "", false, null),
+         new Property(@"^IceGrid\.Node\.ThreadPool\.SizeWarn$", "", false, null),
+         new Property(@"^IceGrid\.Node\.ThreadPool\.StackSize$", "", false, null),
+         new Property(@"^IceGrid\.Node\.ThreadPool\.Serialize$", "", false, null),
+         new Property(@"^IceGrid\.Node\.ThreadPool\.ThreadIdleTime$", "", false, null),
+         new Property(@"^IceGrid\.Node\.ThreadPool\.ThreadPriority$", "", false, null),
+         new Property(@"^IceGrid\.Node\.MessageSizeMax$", "", false, null),
+         new Property(@"^IceGrid\.Node\.AllowRunningServersAsRoot$", "", false, null),
+         new Property(@"^IceGrid\.Node\.AllowEndpointsOverride$", "", false, null),
+         new Property(@"^IceGrid\.Node\.CollocateRegistry$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Data$", "", false, null),
+         new Property(@"^IceGrid\.Node\.DisableOnFailure$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Name$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Output$", "", false, null),
+         new Property(@"^IceGrid\.Node\.ProcessorSocketCount$", "", false, null),
+         new Property(@"^IceGrid\.Node\.PrintServersReady$", "", false, null),
+         new Property(@"^IceGrid\.Node\.PropertiesOverride$", "", false, null),
+         new Property(@"^IceGrid\.Node\.RedirectErrToOut$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Trace\.Activator$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Trace\.Adapter$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Trace\.Admin$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Trace\.Patch$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Trace\.Replica$", "", false, null),
+         new Property(@"^IceGrid\.Node\.Trace\.Server$", "", false, null),
+         new Property(@"^IceGrid\.Node\.UserAccounts$", "", false, null),
+         new Property(@"^IceGrid\.Node\.UserAccountMapper\.EndpointSelection$", "", false, null),
+         new Property(@"^IceGrid\.Node\.UserAccountMapper\.ConnectionCached$", "", false, null),
+         new Property(@"^IceGrid\.Node\.UserAccountMapper\.PreferSecure$", "", false, null),
+         new Property(@"^IceGrid\.Node\.UserAccountMapper\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Node\.UserAccountMapper\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Node\.UserAccountMapper\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.Node\.UserAccountMapper\.Router$", "", false, null),
+         new Property(@"^IceGrid\.Node\.UserAccountMapper\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceGrid\.Node\.UserAccountMapper\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceGrid\.Node\.UserAccountMapper$", "", false, null),
+         new Property(@"^IceGrid\.Node\.WaitTime$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminCryptPasswords$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminPermissionsVerifier\.EndpointSelection$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminPermissionsVerifier\.ConnectionCached$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminPermissionsVerifier\.PreferSecure$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminPermissionsVerifier\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminPermissionsVerifier\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminPermissionsVerifier\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminPermissionsVerifier\.Router$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminPermissionsVerifier\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminPermissionsVerifier\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminPermissionsVerifier$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionFilters$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.ACM\.Timeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.ACM\.Heartbeat$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.ACM\.Close$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.ACM$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.AdapterId$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Connection\.CloseTimeout$", "10", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Connection\.ConnectTimeout$", "10", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Connection\.EnableIdleCheck$", "1", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Connection\.IdleTimeout$", "60", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Connection\.InactivityTimeout$", "300", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Connection$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Endpoints$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Locator\.EndpointSelection$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Locator\.ConnectionCached$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Locator\.PreferSecure$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Locator\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Locator\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Locator\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Locator\.Router$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Locator\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Locator\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.PublishedEndpoints$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.ReplicaGroupId$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Router\.EndpointSelection$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Router\.ConnectionCached$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Router\.PreferSecure$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Router\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Router\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Router\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Router\.Router$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Router\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Router\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.Router$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.ProxyOptions$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.ThreadPool\.Size$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.ThreadPool\.SizeMax$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.ThreadPool\.SizeWarn$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.ThreadPool\.StackSize$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.ThreadPool\.Serialize$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.ThreadPool\.ThreadIdleTime$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.ThreadPool\.ThreadPriority$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSessionManager\.MessageSizeMax$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSSLPermissionsVerifier\.EndpointSelection$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSSLPermissionsVerifier\.ConnectionCached$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSSLPermissionsVerifier\.PreferSecure$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSSLPermissionsVerifier\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSSLPermissionsVerifier\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSSLPermissionsVerifier\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSSLPermissionsVerifier\.Router$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSSLPermissionsVerifier\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSSLPermissionsVerifier\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.AdminSSLPermissionsVerifier$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.ACM\.Timeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.ACM\.Heartbeat$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.ACM\.Close$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.ACM$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.AdapterId$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.Connection\.CloseTimeout$", "10", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.Connection\.ConnectTimeout$", "10", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.Connection\.EnableIdleCheck$", "1", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.Connection\.IdleTimeout$", "60", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.Connection\.InactivityTimeout$", "300", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.Connection$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.Endpoints$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.Locator\.EndpointSelection$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.Locator\.ConnectionCached$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.Locator\.PreferSecure$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.Locator\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.Locator\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.Locator\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.Locator\.Router$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.Locator\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.Locator\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.PublishedEndpoints$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.ReplicaGroupId$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.Router\.EndpointSelection$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.Router\.ConnectionCached$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.Router\.PreferSecure$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.Router\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.Router\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.Router\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.Router\.Router$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.Router\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.Router\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.Router$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.ProxyOptions$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.ThreadPool\.Size$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.ThreadPool\.SizeMax$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.ThreadPool\.SizeWarn$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.ThreadPool\.StackSize$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.ThreadPool\.Serialize$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.ThreadPool\.ThreadIdleTime$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.ThreadPool\.ThreadPriority$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Client\.MessageSizeMax$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.CryptPasswords$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.DefaultTemplates$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.ACM\.Timeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.ACM\.Heartbeat$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.ACM\.Close$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.ACM$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.AdapterId$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Connection\.CloseTimeout$", "10", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Connection\.ConnectTimeout$", "10", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Connection\.EnableIdleCheck$", "1", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Connection\.IdleTimeout$", "60", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Connection\.InactivityTimeout$", "300", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Connection$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Endpoints$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Locator\.EndpointSelection$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Locator\.ConnectionCached$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Locator\.PreferSecure$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Locator\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Locator\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Locator\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Locator\.Router$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Locator\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Locator\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.PublishedEndpoints$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.ReplicaGroupId$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Router\.EndpointSelection$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Router\.ConnectionCached$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Router\.PreferSecure$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Router\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Router\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Router\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Router\.Router$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Router\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Router\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Router$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.ProxyOptions$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.ThreadPool\.Size$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.ThreadPool\.SizeMax$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.ThreadPool\.SizeWarn$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.ThreadPool\.StackSize$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.ThreadPool\.Serialize$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.ThreadPool\.ThreadIdleTime$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.ThreadPool\.ThreadPriority$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.MessageSizeMax$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Enabled$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Address$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Port$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Discovery\.Interface$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.DynamicRegistration$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.ACM\.Timeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.ACM\.Heartbeat$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.ACM\.Close$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.ACM$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.AdapterId$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.Connection\.CloseTimeout$", "10", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.Connection\.ConnectTimeout$", "10", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.Connection\.EnableIdleCheck$", "1", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.Connection\.IdleTimeout$", "60", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.Connection\.InactivityTimeout$", "300", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.Connection$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.Endpoints$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.Locator\.EndpointSelection$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.Locator\.ConnectionCached$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.Locator\.PreferSecure$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.Locator\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.Locator\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.Locator\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.Locator\.Router$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.Locator\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.Locator\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.PublishedEndpoints$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.ReplicaGroupId$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.Router\.EndpointSelection$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.Router\.ConnectionCached$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.Router\.PreferSecure$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.Router\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.Router\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.Router\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.Router\.Router$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.Router\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.Router\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.Router$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.ProxyOptions$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.ThreadPool\.Size$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.ThreadPool\.SizeMax$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.ThreadPool\.SizeWarn$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.ThreadPool\.StackSize$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.ThreadPool\.Serialize$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.ThreadPool\.ThreadIdleTime$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.ThreadPool\.ThreadPriority$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Internal\.MessageSizeMax$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.LMDB\.MapSize$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.LMDB\.Path$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.PermissionsVerifier\.EndpointSelection$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.PermissionsVerifier\.ConnectionCached$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.PermissionsVerifier\.PreferSecure$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.PermissionsVerifier\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.PermissionsVerifier\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.PermissionsVerifier\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.PermissionsVerifier\.Router$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.PermissionsVerifier\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.PermissionsVerifier\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.PermissionsVerifier$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.ReplicaName$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.RequireNodeCertCN$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.RequireReplicaCertCN$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.ACM\.Timeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.ACM\.Heartbeat$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.ACM\.Close$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.ACM$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.AdapterId$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.Connection\.CloseTimeout$", "10", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.Connection\.ConnectTimeout$", "10", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.Connection\.EnableIdleCheck$", "1", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.Connection\.IdleTimeout$", "60", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.Connection\.InactivityTimeout$", "300", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.Connection$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.Endpoints$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.Locator\.EndpointSelection$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.Locator\.ConnectionCached$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.Locator\.PreferSecure$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.Locator\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.Locator\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.Locator\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.Locator\.Router$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.Locator\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.Locator\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.PublishedEndpoints$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.ReplicaGroupId$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.Router\.EndpointSelection$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.Router\.ConnectionCached$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.Router\.PreferSecure$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.Router\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.Router\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.Router\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.Router\.Router$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.Router\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.Router\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.Router$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.ProxyOptions$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.ThreadPool\.Size$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.ThreadPool\.SizeMax$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.ThreadPool\.SizeWarn$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.ThreadPool\.StackSize$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.ThreadPool\.Serialize$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.ThreadPool\.ThreadIdleTime$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.ThreadPool\.ThreadPriority$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Server\.MessageSizeMax$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionFilters$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.ACM\.Timeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.ACM\.Heartbeat$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.ACM\.Close$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.ACM$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.AdapterId$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.Connection\.CloseTimeout$", "10", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.Connection\.ConnectTimeout$", "10", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.Connection\.EnableIdleCheck$", "1", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.Connection\.IdleTimeout$", "60", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.Connection\.InactivityTimeout$", "300", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.Connection$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.Endpoints$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.Locator\.EndpointSelection$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.Locator\.ConnectionCached$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.Locator\.PreferSecure$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.Locator\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.Locator\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.Locator\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.Locator\.Router$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.Locator\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.Locator\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.PublishedEndpoints$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.ReplicaGroupId$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.Router\.EndpointSelection$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.Router\.ConnectionCached$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.Router\.PreferSecure$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.Router\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.Router\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.Router\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.Router\.Router$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.Router\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.Router\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.Router$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.ProxyOptions$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.ThreadPool\.Size$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.ThreadPool\.SizeMax$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.ThreadPool\.SizeWarn$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.ThreadPool\.StackSize$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.ThreadPool\.Serialize$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.ThreadPool\.ThreadIdleTime$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.ThreadPool\.ThreadPriority$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SessionManager\.MessageSizeMax$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SSLPermissionsVerifier\.EndpointSelection$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SSLPermissionsVerifier\.ConnectionCached$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SSLPermissionsVerifier\.PreferSecure$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SSLPermissionsVerifier\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SSLPermissionsVerifier\.InvocationTimeout$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SSLPermissionsVerifier\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SSLPermissionsVerifier\.Router$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SSLPermissionsVerifier\.CollocationOptimized$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SSLPermissionsVerifier\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.SSLPermissionsVerifier$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Trace\.Admin$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Trace\.Application$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Trace\.Adapter$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Trace\.Discovery$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Trace\.Locator$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Trace\.Node$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Trace\.Object$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Trace\.Patch$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Trace\.Replica$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Trace\.Server$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Trace\.Session$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Trace\.Subscriber$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Trace\.Topic$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.Trace\.TopicManager$", "", false, null),
+         new Property(@"^IceGrid\.Registry\.UserAccounts$", "", false, null),
+    };
 
     public static Property[] IceSSLProps =
     {
-             new Property(@"^IceSSL\.Alias$", false, null),
-             new Property(@"^IceSSL\.CAs$", false, null),
-             new Property(@"^IceSSL\.CertStore$", false, null),
-             new Property(@"^IceSSL\.CertStoreLocation$", false, null),
-             new Property(@"^IceSSL\.CertFile$", false, null),
-             new Property(@"^IceSSL\.CheckCertName$", false, null),
-             new Property(@"^IceSSL\.CheckCRL$", false, null),
-             new Property(@"^IceSSL\.CertificateRevocationListFiles$", false, null),
-             new Property(@"^IceSSL\.DefaultDir$", false, null),
-             new Property(@"^IceSSL\.FindCert$", false, null),
-             new Property(@"^IceSSL\.KeyFile$", false, null),
-             new Property(@"^IceSSL\.Keychain$", false, null),
-             new Property(@"^IceSSL\.KeychainPassword$", false, null),
-             new Property(@"^IceSSL\.Keystore$", false, null),
-             new Property(@"^IceSSL\.KeystorePassword$", false, null),
-             new Property(@"^IceSSL\.KeystoreType$", false, null),
-             new Property(@"^IceSSL\.Password$", false, null),
-             new Property(@"^IceSSL\.RevocationCheck$", false, null),
-             new Property(@"^IceSSL\.RevocationCheckCacheOnly$", false, null),
-             new Property(@"^IceSSL\.SchannelStrongCrypto$", false, null),
-             new Property(@"^IceSSL\.Trace\.Security$", false, null),
-             new Property(@"^IceSSL\.TrustOnly$", false, null),
-             new Property(@"^IceSSL\.TrustOnly\.Client$", false, null),
-             new Property(@"^IceSSL\.TrustOnly\.Server$", false, null),
-             new Property(@"^IceSSL\.TrustOnly\.Server\.[^\s]+$", false, null),
-             new Property(@"^IceSSL\.Truststore$", false, null),
-             new Property(@"^IceSSL\.TruststorePassword$", false, null),
-             new Property(@"^IceSSL\.TruststoreType$", false, null),
-             new Property(@"^IceSSL\.UsePlatformCAs$", false, null),
-             new Property(@"^IceSSL\.VerifyPeer$", false, null),
-        };
+         new Property(@"^IceSSL\.Alias$", "", false, null),
+         new Property(@"^IceSSL\.CAs$", "", false, null),
+         new Property(@"^IceSSL\.CertStore$", "", false, null),
+         new Property(@"^IceSSL\.CertStoreLocation$", "", false, null),
+         new Property(@"^IceSSL\.CertFile$", "", false, null),
+         new Property(@"^IceSSL\.CheckCertName$", "", false, null),
+         new Property(@"^IceSSL\.CheckCRL$", "", false, null),
+         new Property(@"^IceSSL\.CertificateRevocationListFiles$", "", false, null),
+         new Property(@"^IceSSL\.DefaultDir$", "", false, null),
+         new Property(@"^IceSSL\.FindCert$", "", false, null),
+         new Property(@"^IceSSL\.KeyFile$", "", false, null),
+         new Property(@"^IceSSL\.Keychain$", "", false, null),
+         new Property(@"^IceSSL\.KeychainPassword$", "", false, null),
+         new Property(@"^IceSSL\.Keystore$", "", false, null),
+         new Property(@"^IceSSL\.KeystorePassword$", "", false, null),
+         new Property(@"^IceSSL\.KeystoreType$", "", false, null),
+         new Property(@"^IceSSL\.Password$", "", false, null),
+         new Property(@"^IceSSL\.RevocationCheck$", "", false, null),
+         new Property(@"^IceSSL\.RevocationCheckCacheOnly$", "", false, null),
+         new Property(@"^IceSSL\.SchannelStrongCrypto$", "", false, null),
+         new Property(@"^IceSSL\.Trace\.Security$", "", false, null),
+         new Property(@"^IceSSL\.TrustOnly$", "", false, null),
+         new Property(@"^IceSSL\.TrustOnly\.Client$", "", false, null),
+         new Property(@"^IceSSL\.TrustOnly\.Server$", "", false, null),
+         new Property(@"^IceSSL\.TrustOnly\.Server\.[^\s]+$", "", false, null),
+         new Property(@"^IceSSL\.Truststore$", "", false, null),
+         new Property(@"^IceSSL\.TruststorePassword$", "", false, null),
+         new Property(@"^IceSSL\.TruststoreType$", "", false, null),
+         new Property(@"^IceSSL\.UsePlatformCAs$", "", false, null),
+         new Property(@"^IceSSL\.VerifyPeer$", "", false, null),
+    };
 
     public static Property[] IceStormAdminProps =
     {
-             new Property(@"^IceStormAdmin\.TopicManager\.[^\s]+$", false, null),
-             new Property(@"^IceStormAdmin\.Host$", false, null),
-             new Property(@"^IceStormAdmin\.Port$", false, null),
-        };
+         new Property(@"^IceStormAdmin\.TopicManager\.[^\s]+$", "", false, null),
+         new Property(@"^IceStormAdmin\.Host$", "", false, null),
+         new Property(@"^IceStormAdmin\.Port$", "", false, null),
+    };
 
     public static Property[] IceBTProps =
     {
-             new Property(@"^IceBT\.RcvSize$", false, null),
-             new Property(@"^IceBT\.SndSize$", false, null),
-        };
+         new Property(@"^IceBT\.RcvSize$", "", false, null),
+         new Property(@"^IceBT\.SndSize$", "", false, null),
+    };
 
     public static Property[] Glacier2Props =
     {
-             new Property(@"^Glacier2\.AddConnectionContext$", false, null),
-             new Property(@"^Glacier2\.Client\.ACM\.Timeout$", false, null),
-             new Property(@"^Glacier2\.Client\.ACM\.Heartbeat$", false, null),
-             new Property(@"^Glacier2\.Client\.ACM\.Close$", false, null),
-             new Property(@"^Glacier2\.Client\.ACM$", false, null),
-             new Property(@"^Glacier2\.Client\.AdapterId$", false, null),
-             new Property(@"^Glacier2\.Client\.Connection\.CloseTimeout$", false, null),
-             new Property(@"^Glacier2\.Client\.Connection\.ConnectTimeout$", false, null),
-             new Property(@"^Glacier2\.Client\.Connection\.EnableIdleCheck$", false, null),
-             new Property(@"^Glacier2\.Client\.Connection\.IdleTimeout$", false, null),
-             new Property(@"^Glacier2\.Client\.Connection\.InactivityTimeout$", false, null),
-             new Property(@"^Glacier2\.Client\.Connection$", false, null),
-             new Property(@"^Glacier2\.Client\.Endpoints$", false, null),
-             new Property(@"^Glacier2\.Client\.Locator\.EndpointSelection$", false, null),
-             new Property(@"^Glacier2\.Client\.Locator\.ConnectionCached$", false, null),
-             new Property(@"^Glacier2\.Client\.Locator\.PreferSecure$", false, null),
-             new Property(@"^Glacier2\.Client\.Locator\.LocatorCacheTimeout$", false, null),
-             new Property(@"^Glacier2\.Client\.Locator\.InvocationTimeout$", false, null),
-             new Property(@"^Glacier2\.Client\.Locator\.Locator$", false, null),
-             new Property(@"^Glacier2\.Client\.Locator\.Router$", false, null),
-             new Property(@"^Glacier2\.Client\.Locator\.CollocationOptimized$", false, null),
-             new Property(@"^Glacier2\.Client\.Locator\.Context\.[^\s]+$", false, null),
-             new Property(@"^Glacier2\.Client\.Locator$", false, null),
-             new Property(@"^Glacier2\.Client\.PublishedEndpoints$", false, null),
-             new Property(@"^Glacier2\.Client\.ReplicaGroupId$", false, null),
-             new Property(@"^Glacier2\.Client\.Router\.EndpointSelection$", false, null),
-             new Property(@"^Glacier2\.Client\.Router\.ConnectionCached$", false, null),
-             new Property(@"^Glacier2\.Client\.Router\.PreferSecure$", false, null),
-             new Property(@"^Glacier2\.Client\.Router\.LocatorCacheTimeout$", false, null),
-             new Property(@"^Glacier2\.Client\.Router\.InvocationTimeout$", false, null),
-             new Property(@"^Glacier2\.Client\.Router\.Locator$", false, null),
-             new Property(@"^Glacier2\.Client\.Router\.Router$", false, null),
-             new Property(@"^Glacier2\.Client\.Router\.CollocationOptimized$", false, null),
-             new Property(@"^Glacier2\.Client\.Router\.Context\.[^\s]+$", false, null),
-             new Property(@"^Glacier2\.Client\.Router$", false, null),
-             new Property(@"^Glacier2\.Client\.ProxyOptions$", false, null),
-             new Property(@"^Glacier2\.Client\.ThreadPool\.Size$", false, null),
-             new Property(@"^Glacier2\.Client\.ThreadPool\.SizeMax$", false, null),
-             new Property(@"^Glacier2\.Client\.ThreadPool\.SizeWarn$", false, null),
-             new Property(@"^Glacier2\.Client\.ThreadPool\.StackSize$", false, null),
-             new Property(@"^Glacier2\.Client\.ThreadPool\.Serialize$", false, null),
-             new Property(@"^Glacier2\.Client\.ThreadPool\.ThreadIdleTime$", false, null),
-             new Property(@"^Glacier2\.Client\.ThreadPool\.ThreadPriority$", false, null),
-             new Property(@"^Glacier2\.Client\.MessageSizeMax$", false, null),
-             new Property(@"^Glacier2\.Client\.Buffered$", false, null),
-             new Property(@"^Glacier2\.Client\.ForwardContext$", false, null),
-             new Property(@"^Glacier2\.Client\.SleepTime$", false, null),
-             new Property(@"^Glacier2\.Client\.Trace\.Override$", false, null),
-             new Property(@"^Glacier2\.Client\.Trace\.Reject$", false, null),
-             new Property(@"^Glacier2\.Client\.Trace\.Request$", false, null),
-             new Property(@"^Glacier2\.CryptPasswords$", false, null),
-             new Property(@"^Glacier2\.Filter\.Address\.Reject$", false, null),
-             new Property(@"^Glacier2\.Filter\.Address\.Accept$", false, null),
-             new Property(@"^Glacier2\.Filter\.ProxySizeMax$", false, null),
-             new Property(@"^Glacier2\.Filter\.Category\.Accept$", false, null),
-             new Property(@"^Glacier2\.Filter\.Category\.AcceptUser$", false, null),
-             new Property(@"^Glacier2\.Filter\.AdapterId\.Accept$", false, null),
-             new Property(@"^Glacier2\.Filter\.Identity\.Accept$", false, null),
-             new Property(@"^Glacier2\.InstanceName$", false, null),
-             new Property(@"^Glacier2\.PermissionsVerifier\.EndpointSelection$", false, null),
-             new Property(@"^Glacier2\.PermissionsVerifier\.ConnectionCached$", false, null),
-             new Property(@"^Glacier2\.PermissionsVerifier\.PreferSecure$", false, null),
-             new Property(@"^Glacier2\.PermissionsVerifier\.LocatorCacheTimeout$", false, null),
-             new Property(@"^Glacier2\.PermissionsVerifier\.InvocationTimeout$", false, null),
-             new Property(@"^Glacier2\.PermissionsVerifier\.Locator$", false, null),
-             new Property(@"^Glacier2\.PermissionsVerifier\.Router$", false, null),
-             new Property(@"^Glacier2\.PermissionsVerifier\.CollocationOptimized$", false, null),
-             new Property(@"^Glacier2\.PermissionsVerifier\.Context\.[^\s]+$", false, null),
-             new Property(@"^Glacier2\.PermissionsVerifier$", false, null),
-             new Property(@"^Glacier2\.ReturnClientProxy$", false, null),
-             new Property(@"^Glacier2\.SSLPermissionsVerifier\.EndpointSelection$", false, null),
-             new Property(@"^Glacier2\.SSLPermissionsVerifier\.ConnectionCached$", false, null),
-             new Property(@"^Glacier2\.SSLPermissionsVerifier\.PreferSecure$", false, null),
-             new Property(@"^Glacier2\.SSLPermissionsVerifier\.LocatorCacheTimeout$", false, null),
-             new Property(@"^Glacier2\.SSLPermissionsVerifier\.InvocationTimeout$", false, null),
-             new Property(@"^Glacier2\.SSLPermissionsVerifier\.Locator$", false, null),
-             new Property(@"^Glacier2\.SSLPermissionsVerifier\.Router$", false, null),
-             new Property(@"^Glacier2\.SSLPermissionsVerifier\.CollocationOptimized$", false, null),
-             new Property(@"^Glacier2\.SSLPermissionsVerifier\.Context\.[^\s]+$", false, null),
-             new Property(@"^Glacier2\.SSLPermissionsVerifier$", false, null),
-             new Property(@"^Glacier2\.RoutingTable\.MaxSize$", false, null),
-             new Property(@"^Glacier2\.Server\.ACM\.Timeout$", false, null),
-             new Property(@"^Glacier2\.Server\.ACM\.Heartbeat$", false, null),
-             new Property(@"^Glacier2\.Server\.ACM\.Close$", false, null),
-             new Property(@"^Glacier2\.Server\.ACM$", false, null),
-             new Property(@"^Glacier2\.Server\.AdapterId$", false, null),
-             new Property(@"^Glacier2\.Server\.Connection\.CloseTimeout$", false, null),
-             new Property(@"^Glacier2\.Server\.Connection\.ConnectTimeout$", false, null),
-             new Property(@"^Glacier2\.Server\.Connection\.EnableIdleCheck$", false, null),
-             new Property(@"^Glacier2\.Server\.Connection\.IdleTimeout$", false, null),
-             new Property(@"^Glacier2\.Server\.Connection\.InactivityTimeout$", false, null),
-             new Property(@"^Glacier2\.Server\.Connection$", false, null),
-             new Property(@"^Glacier2\.Server\.Endpoints$", false, null),
-             new Property(@"^Glacier2\.Server\.Locator\.EndpointSelection$", false, null),
-             new Property(@"^Glacier2\.Server\.Locator\.ConnectionCached$", false, null),
-             new Property(@"^Glacier2\.Server\.Locator\.PreferSecure$", false, null),
-             new Property(@"^Glacier2\.Server\.Locator\.LocatorCacheTimeout$", false, null),
-             new Property(@"^Glacier2\.Server\.Locator\.InvocationTimeout$", false, null),
-             new Property(@"^Glacier2\.Server\.Locator\.Locator$", false, null),
-             new Property(@"^Glacier2\.Server\.Locator\.Router$", false, null),
-             new Property(@"^Glacier2\.Server\.Locator\.CollocationOptimized$", false, null),
-             new Property(@"^Glacier2\.Server\.Locator\.Context\.[^\s]+$", false, null),
-             new Property(@"^Glacier2\.Server\.Locator$", false, null),
-             new Property(@"^Glacier2\.Server\.PublishedEndpoints$", false, null),
-             new Property(@"^Glacier2\.Server\.ReplicaGroupId$", false, null),
-             new Property(@"^Glacier2\.Server\.Router\.EndpointSelection$", false, null),
-             new Property(@"^Glacier2\.Server\.Router\.ConnectionCached$", false, null),
-             new Property(@"^Glacier2\.Server\.Router\.PreferSecure$", false, null),
-             new Property(@"^Glacier2\.Server\.Router\.LocatorCacheTimeout$", false, null),
-             new Property(@"^Glacier2\.Server\.Router\.InvocationTimeout$", false, null),
-             new Property(@"^Glacier2\.Server\.Router\.Locator$", false, null),
-             new Property(@"^Glacier2\.Server\.Router\.Router$", false, null),
-             new Property(@"^Glacier2\.Server\.Router\.CollocationOptimized$", false, null),
-             new Property(@"^Glacier2\.Server\.Router\.Context\.[^\s]+$", false, null),
-             new Property(@"^Glacier2\.Server\.Router$", false, null),
-             new Property(@"^Glacier2\.Server\.ProxyOptions$", false, null),
-             new Property(@"^Glacier2\.Server\.ThreadPool\.Size$", false, null),
-             new Property(@"^Glacier2\.Server\.ThreadPool\.SizeMax$", false, null),
-             new Property(@"^Glacier2\.Server\.ThreadPool\.SizeWarn$", false, null),
-             new Property(@"^Glacier2\.Server\.ThreadPool\.StackSize$", false, null),
-             new Property(@"^Glacier2\.Server\.ThreadPool\.Serialize$", false, null),
-             new Property(@"^Glacier2\.Server\.ThreadPool\.ThreadIdleTime$", false, null),
-             new Property(@"^Glacier2\.Server\.ThreadPool\.ThreadPriority$", false, null),
-             new Property(@"^Glacier2\.Server\.MessageSizeMax$", false, null),
-             new Property(@"^Glacier2\.Server\.Buffered$", false, null),
-             new Property(@"^Glacier2\.Server\.ForwardContext$", false, null),
-             new Property(@"^Glacier2\.Server\.SleepTime$", false, null),
-             new Property(@"^Glacier2\.Server\.Trace\.Override$", false, null),
-             new Property(@"^Glacier2\.Server\.Trace\.Request$", false, null),
-             new Property(@"^Glacier2\.SessionManager\.EndpointSelection$", false, null),
-             new Property(@"^Glacier2\.SessionManager\.ConnectionCached$", false, null),
-             new Property(@"^Glacier2\.SessionManager\.PreferSecure$", false, null),
-             new Property(@"^Glacier2\.SessionManager\.LocatorCacheTimeout$", false, null),
-             new Property(@"^Glacier2\.SessionManager\.InvocationTimeout$", false, null),
-             new Property(@"^Glacier2\.SessionManager\.Locator$", false, null),
-             new Property(@"^Glacier2\.SessionManager\.Router$", false, null),
-             new Property(@"^Glacier2\.SessionManager\.CollocationOptimized$", false, null),
-             new Property(@"^Glacier2\.SessionManager\.Context\.[^\s]+$", false, null),
-             new Property(@"^Glacier2\.SessionManager$", false, null),
-             new Property(@"^Glacier2\.SSLSessionManager\.EndpointSelection$", false, null),
-             new Property(@"^Glacier2\.SSLSessionManager\.ConnectionCached$", false, null),
-             new Property(@"^Glacier2\.SSLSessionManager\.PreferSecure$", false, null),
-             new Property(@"^Glacier2\.SSLSessionManager\.LocatorCacheTimeout$", false, null),
-             new Property(@"^Glacier2\.SSLSessionManager\.InvocationTimeout$", false, null),
-             new Property(@"^Glacier2\.SSLSessionManager\.Locator$", false, null),
-             new Property(@"^Glacier2\.SSLSessionManager\.Router$", false, null),
-             new Property(@"^Glacier2\.SSLSessionManager\.CollocationOptimized$", false, null),
-             new Property(@"^Glacier2\.SSLSessionManager\.Context\.[^\s]+$", false, null),
-             new Property(@"^Glacier2\.SSLSessionManager$", false, null),
-             new Property(@"^Glacier2\.Trace\.RoutingTable$", false, null),
-             new Property(@"^Glacier2\.Trace\.Session$", false, null),
-        };
+         new Property(@"^Glacier2\.AddConnectionContext$", "", false, null),
+         new Property(@"^Glacier2\.Client\.ACM\.Timeout$", "", false, null),
+         new Property(@"^Glacier2\.Client\.ACM\.Heartbeat$", "", false, null),
+         new Property(@"^Glacier2\.Client\.ACM\.Close$", "", false, null),
+         new Property(@"^Glacier2\.Client\.ACM$", "", false, null),
+         new Property(@"^Glacier2\.Client\.AdapterId$", "", false, null),
+         new Property(@"^Glacier2\.Client\.Connection\.CloseTimeout$", "10", false, null),
+         new Property(@"^Glacier2\.Client\.Connection\.ConnectTimeout$", "10", false, null),
+         new Property(@"^Glacier2\.Client\.Connection\.EnableIdleCheck$", "1", false, null),
+         new Property(@"^Glacier2\.Client\.Connection\.IdleTimeout$", "60", false, null),
+         new Property(@"^Glacier2\.Client\.Connection\.InactivityTimeout$", "300", false, null),
+         new Property(@"^Glacier2\.Client\.Connection$", "", false, null),
+         new Property(@"^Glacier2\.Client\.Endpoints$", "", false, null),
+         new Property(@"^Glacier2\.Client\.Locator\.EndpointSelection$", "", false, null),
+         new Property(@"^Glacier2\.Client\.Locator\.ConnectionCached$", "", false, null),
+         new Property(@"^Glacier2\.Client\.Locator\.PreferSecure$", "", false, null),
+         new Property(@"^Glacier2\.Client\.Locator\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^Glacier2\.Client\.Locator\.InvocationTimeout$", "", false, null),
+         new Property(@"^Glacier2\.Client\.Locator\.Locator$", "", false, null),
+         new Property(@"^Glacier2\.Client\.Locator\.Router$", "", false, null),
+         new Property(@"^Glacier2\.Client\.Locator\.CollocationOptimized$", "", false, null),
+         new Property(@"^Glacier2\.Client\.Locator\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^Glacier2\.Client\.Locator$", "", false, null),
+         new Property(@"^Glacier2\.Client\.PublishedEndpoints$", "", false, null),
+         new Property(@"^Glacier2\.Client\.ReplicaGroupId$", "", false, null),
+         new Property(@"^Glacier2\.Client\.Router\.EndpointSelection$", "", false, null),
+         new Property(@"^Glacier2\.Client\.Router\.ConnectionCached$", "", false, null),
+         new Property(@"^Glacier2\.Client\.Router\.PreferSecure$", "", false, null),
+         new Property(@"^Glacier2\.Client\.Router\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^Glacier2\.Client\.Router\.InvocationTimeout$", "", false, null),
+         new Property(@"^Glacier2\.Client\.Router\.Locator$", "", false, null),
+         new Property(@"^Glacier2\.Client\.Router\.Router$", "", false, null),
+         new Property(@"^Glacier2\.Client\.Router\.CollocationOptimized$", "", false, null),
+         new Property(@"^Glacier2\.Client\.Router\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^Glacier2\.Client\.Router$", "", false, null),
+         new Property(@"^Glacier2\.Client\.ProxyOptions$", "", false, null),
+         new Property(@"^Glacier2\.Client\.ThreadPool\.Size$", "", false, null),
+         new Property(@"^Glacier2\.Client\.ThreadPool\.SizeMax$", "", false, null),
+         new Property(@"^Glacier2\.Client\.ThreadPool\.SizeWarn$", "", false, null),
+         new Property(@"^Glacier2\.Client\.ThreadPool\.StackSize$", "", false, null),
+         new Property(@"^Glacier2\.Client\.ThreadPool\.Serialize$", "", false, null),
+         new Property(@"^Glacier2\.Client\.ThreadPool\.ThreadIdleTime$", "", false, null),
+         new Property(@"^Glacier2\.Client\.ThreadPool\.ThreadPriority$", "", false, null),
+         new Property(@"^Glacier2\.Client\.MessageSizeMax$", "", false, null),
+         new Property(@"^Glacier2\.Client\.Buffered$", "", false, null),
+         new Property(@"^Glacier2\.Client\.ForwardContext$", "", false, null),
+         new Property(@"^Glacier2\.Client\.SleepTime$", "", false, null),
+         new Property(@"^Glacier2\.Client\.Trace\.Override$", "", false, null),
+         new Property(@"^Glacier2\.Client\.Trace\.Reject$", "", false, null),
+         new Property(@"^Glacier2\.Client\.Trace\.Request$", "", false, null),
+         new Property(@"^Glacier2\.CryptPasswords$", "", false, null),
+         new Property(@"^Glacier2\.Filter\.Address\.Reject$", "", false, null),
+         new Property(@"^Glacier2\.Filter\.Address\.Accept$", "", false, null),
+         new Property(@"^Glacier2\.Filter\.ProxySizeMax$", "", false, null),
+         new Property(@"^Glacier2\.Filter\.Category\.Accept$", "", false, null),
+         new Property(@"^Glacier2\.Filter\.Category\.AcceptUser$", "", false, null),
+         new Property(@"^Glacier2\.Filter\.AdapterId\.Accept$", "", false, null),
+         new Property(@"^Glacier2\.Filter\.Identity\.Accept$", "", false, null),
+         new Property(@"^Glacier2\.InstanceName$", "", false, null),
+         new Property(@"^Glacier2\.PermissionsVerifier\.EndpointSelection$", "", false, null),
+         new Property(@"^Glacier2\.PermissionsVerifier\.ConnectionCached$", "", false, null),
+         new Property(@"^Glacier2\.PermissionsVerifier\.PreferSecure$", "", false, null),
+         new Property(@"^Glacier2\.PermissionsVerifier\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^Glacier2\.PermissionsVerifier\.InvocationTimeout$", "", false, null),
+         new Property(@"^Glacier2\.PermissionsVerifier\.Locator$", "", false, null),
+         new Property(@"^Glacier2\.PermissionsVerifier\.Router$", "", false, null),
+         new Property(@"^Glacier2\.PermissionsVerifier\.CollocationOptimized$", "", false, null),
+         new Property(@"^Glacier2\.PermissionsVerifier\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^Glacier2\.PermissionsVerifier$", "", false, null),
+         new Property(@"^Glacier2\.ReturnClientProxy$", "", false, null),
+         new Property(@"^Glacier2\.SSLPermissionsVerifier\.EndpointSelection$", "", false, null),
+         new Property(@"^Glacier2\.SSLPermissionsVerifier\.ConnectionCached$", "", false, null),
+         new Property(@"^Glacier2\.SSLPermissionsVerifier\.PreferSecure$", "", false, null),
+         new Property(@"^Glacier2\.SSLPermissionsVerifier\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^Glacier2\.SSLPermissionsVerifier\.InvocationTimeout$", "", false, null),
+         new Property(@"^Glacier2\.SSLPermissionsVerifier\.Locator$", "", false, null),
+         new Property(@"^Glacier2\.SSLPermissionsVerifier\.Router$", "", false, null),
+         new Property(@"^Glacier2\.SSLPermissionsVerifier\.CollocationOptimized$", "", false, null),
+         new Property(@"^Glacier2\.SSLPermissionsVerifier\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^Glacier2\.SSLPermissionsVerifier$", "", false, null),
+         new Property(@"^Glacier2\.RoutingTable\.MaxSize$", "", false, null),
+         new Property(@"^Glacier2\.Server\.ACM\.Timeout$", "", false, null),
+         new Property(@"^Glacier2\.Server\.ACM\.Heartbeat$", "", false, null),
+         new Property(@"^Glacier2\.Server\.ACM\.Close$", "", false, null),
+         new Property(@"^Glacier2\.Server\.ACM$", "", false, null),
+         new Property(@"^Glacier2\.Server\.AdapterId$", "", false, null),
+         new Property(@"^Glacier2\.Server\.Connection\.CloseTimeout$", "10", false, null),
+         new Property(@"^Glacier2\.Server\.Connection\.ConnectTimeout$", "10", false, null),
+         new Property(@"^Glacier2\.Server\.Connection\.EnableIdleCheck$", "1", false, null),
+         new Property(@"^Glacier2\.Server\.Connection\.IdleTimeout$", "60", false, null),
+         new Property(@"^Glacier2\.Server\.Connection\.InactivityTimeout$", "300", false, null),
+         new Property(@"^Glacier2\.Server\.Connection$", "", false, null),
+         new Property(@"^Glacier2\.Server\.Endpoints$", "", false, null),
+         new Property(@"^Glacier2\.Server\.Locator\.EndpointSelection$", "", false, null),
+         new Property(@"^Glacier2\.Server\.Locator\.ConnectionCached$", "", false, null),
+         new Property(@"^Glacier2\.Server\.Locator\.PreferSecure$", "", false, null),
+         new Property(@"^Glacier2\.Server\.Locator\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^Glacier2\.Server\.Locator\.InvocationTimeout$", "", false, null),
+         new Property(@"^Glacier2\.Server\.Locator\.Locator$", "", false, null),
+         new Property(@"^Glacier2\.Server\.Locator\.Router$", "", false, null),
+         new Property(@"^Glacier2\.Server\.Locator\.CollocationOptimized$", "", false, null),
+         new Property(@"^Glacier2\.Server\.Locator\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^Glacier2\.Server\.Locator$", "", false, null),
+         new Property(@"^Glacier2\.Server\.PublishedEndpoints$", "", false, null),
+         new Property(@"^Glacier2\.Server\.ReplicaGroupId$", "", false, null),
+         new Property(@"^Glacier2\.Server\.Router\.EndpointSelection$", "", false, null),
+         new Property(@"^Glacier2\.Server\.Router\.ConnectionCached$", "", false, null),
+         new Property(@"^Glacier2\.Server\.Router\.PreferSecure$", "", false, null),
+         new Property(@"^Glacier2\.Server\.Router\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^Glacier2\.Server\.Router\.InvocationTimeout$", "", false, null),
+         new Property(@"^Glacier2\.Server\.Router\.Locator$", "", false, null),
+         new Property(@"^Glacier2\.Server\.Router\.Router$", "", false, null),
+         new Property(@"^Glacier2\.Server\.Router\.CollocationOptimized$", "", false, null),
+         new Property(@"^Glacier2\.Server\.Router\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^Glacier2\.Server\.Router$", "", false, null),
+         new Property(@"^Glacier2\.Server\.ProxyOptions$", "", false, null),
+         new Property(@"^Glacier2\.Server\.ThreadPool\.Size$", "", false, null),
+         new Property(@"^Glacier2\.Server\.ThreadPool\.SizeMax$", "", false, null),
+         new Property(@"^Glacier2\.Server\.ThreadPool\.SizeWarn$", "", false, null),
+         new Property(@"^Glacier2\.Server\.ThreadPool\.StackSize$", "", false, null),
+         new Property(@"^Glacier2\.Server\.ThreadPool\.Serialize$", "", false, null),
+         new Property(@"^Glacier2\.Server\.ThreadPool\.ThreadIdleTime$", "", false, null),
+         new Property(@"^Glacier2\.Server\.ThreadPool\.ThreadPriority$", "", false, null),
+         new Property(@"^Glacier2\.Server\.MessageSizeMax$", "", false, null),
+         new Property(@"^Glacier2\.Server\.Buffered$", "", false, null),
+         new Property(@"^Glacier2\.Server\.ForwardContext$", "", false, null),
+         new Property(@"^Glacier2\.Server\.SleepTime$", "", false, null),
+         new Property(@"^Glacier2\.Server\.Trace\.Override$", "", false, null),
+         new Property(@"^Glacier2\.Server\.Trace\.Request$", "", false, null),
+         new Property(@"^Glacier2\.SessionManager\.EndpointSelection$", "", false, null),
+         new Property(@"^Glacier2\.SessionManager\.ConnectionCached$", "", false, null),
+         new Property(@"^Glacier2\.SessionManager\.PreferSecure$", "", false, null),
+         new Property(@"^Glacier2\.SessionManager\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^Glacier2\.SessionManager\.InvocationTimeout$", "", false, null),
+         new Property(@"^Glacier2\.SessionManager\.Locator$", "", false, null),
+         new Property(@"^Glacier2\.SessionManager\.Router$", "", false, null),
+         new Property(@"^Glacier2\.SessionManager\.CollocationOptimized$", "", false, null),
+         new Property(@"^Glacier2\.SessionManager\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^Glacier2\.SessionManager$", "", false, null),
+         new Property(@"^Glacier2\.SSLSessionManager\.EndpointSelection$", "", false, null),
+         new Property(@"^Glacier2\.SSLSessionManager\.ConnectionCached$", "", false, null),
+         new Property(@"^Glacier2\.SSLSessionManager\.PreferSecure$", "", false, null),
+         new Property(@"^Glacier2\.SSLSessionManager\.LocatorCacheTimeout$", "", false, null),
+         new Property(@"^Glacier2\.SSLSessionManager\.InvocationTimeout$", "", false, null),
+         new Property(@"^Glacier2\.SSLSessionManager\.Locator$", "", false, null),
+         new Property(@"^Glacier2\.SSLSessionManager\.Router$", "", false, null),
+         new Property(@"^Glacier2\.SSLSessionManager\.CollocationOptimized$", "", false, null),
+         new Property(@"^Glacier2\.SSLSessionManager\.Context\.[^\s]+$", "", false, null),
+         new Property(@"^Glacier2\.SSLSessionManager$", "", false, null),
+         new Property(@"^Glacier2\.Trace\.RoutingTable$", "", false, null),
+         new Property(@"^Glacier2\.Trace\.Session$", "", false, null),
+    };
 
     public static Property[] Glacier2CryptPermissionsVerifierProps =
     {
-             new Property(@"^Glacier2CryptPermissionsVerifier\.[^\s]+\.PermissionsVerifier$", false, null),
-             new Property(@"^Glacier2CryptPermissionsVerifier\.[^\s]+\.AdminPermissionsVerifier$", false, null),
-        };
+         new Property(@"^Glacier2CryptPermissionsVerifier\.[^\s]+\.PermissionsVerifier$", "", false, null),
+         new Property(@"^Glacier2CryptPermissionsVerifier\.[^\s]+\.AdminPermissionsVerifier$", "", false, null),
+    };
 
     public static Property[][] validProps =
     {
-            IceProps,
-            IceMXProps,
-            IceDiscoveryProps,
-            IceLocatorDiscoveryProps,
-            IceBoxProps,
-            IceBoxAdminProps,
-            IceBridgeProps,
-            IceGridAdminProps,
-            IceGridProps,
-            IceSSLProps,
-            IceStormAdminProps,
-            IceBTProps,
-            Glacier2Props,
-            Glacier2CryptPermissionsVerifierProps,
-        };
+        IceProps,
+        IceMXProps,
+        IceDiscoveryProps,
+        IceLocatorDiscoveryProps,
+        IceBoxProps,
+        IceBoxAdminProps,
+        IceBridgeProps,
+        IceGridAdminProps,
+        IceGridProps,
+        IceSSLProps,
+        IceStormAdminProps,
+        IceBTProps,
+        Glacier2Props,
+        Glacier2CryptPermissionsVerifierProps,
+    };
 
     public static string[] clPropNames =
     {
-            "Ice",
-            "IceMX",
-            "IceDiscovery",
-            "IceLocatorDiscovery",
-            "IceBox",
-            "IceBoxAdmin",
-            "IceBridge",
-            "IceGridAdmin",
-            "IceGrid",
-            "IceSSL",
-            "IceStormAdmin",
-            "IceBT",
-            "Glacier2",
-            "Glacier2CryptPermissionsVerifier",
+        "Ice",
+        "IceMX",
+        "IceDiscovery",
+        "IceLocatorDiscovery",
+        "IceBox",
+        "IceBoxAdmin",
+        "IceBridge",
+        "IceGridAdmin",
+        "IceGrid",
+        "IceSSL",
+        "IceStormAdmin",
+        "IceBT",
+        "Glacier2",
+        "Glacier2CryptPermissionsVerifier",
     };
 }
diff --git a/csharp/src/Ice/Properties.cs b/csharp/src/Ice/Properties.cs
index 7289621c3dd..267deca3e9d 100644
--- a/csharp/src/Ice/Properties.cs
+++ b/csharp/src/Ice/Properties.cs
@@ -14,6 +14,16 @@ public interface Properties
     ///  </returns>
     string getProperty(string key);
 
+    /// <summary>
+    /// Get an Ice property by key.
+    /// If the property is not set, its default value is returned.
+    /// </summary>
+    ///  <param name="key">The property key.
+    ///  </param>
+    /// <returns>The property value or the default value.
+    ///  </returns>
+    string getIceProperty(string key);
+
     /// <summary>
     /// Get a property by key.
     /// If the property is not set, the given default value is returned.
@@ -36,6 +46,16 @@ public interface Properties
     ///  </returns>
     int getPropertyAsInt(string key);
 
+    /// <summary>
+    /// Get an Ice property as an integer.
+    /// If the property is not set, its default value is returned.
+    /// </summary>
+    ///  <param name="key">The property key.
+    ///  </param>
+    /// <returns>The property value interpreted as an integer, or the default value.
+    ///  </returns>
+    int getIcePropertyAsInt(string key);
+
     /// <summary>
     /// Get a property as an integer.
     /// If the property is not set, the given default value is returned.
@@ -62,6 +82,22 @@ public interface Properties
     ///  </returns>
     string[] getPropertyAsList(string key);
 
+    /// <summary>
+    /// Get an Ice property as a list of strings.
+    /// The strings must be separated by whitespace or comma. If the property is
+    ///  not set, its default list is returned. The strings in the list can contain whitespace and commas if they are
+    ///  enclosed in single or double quotes. If quotes are mismatched, the default list is returned. Within single
+    ///  quotes or double quotes, you can escape the quote in question with a backslash, e.g. O'Reilly can be written as
+    ///  O'Reilly, "O'Reilly" or 'O\'Reilly'.
+    /// </summary>
+    ///  <param name="key">The property key.
+    ///  </param>
+    /// <param name="value">The default value to use if the property is not set.
+    ///  </param>
+    /// <returns>The property value interpreted as list of strings, or the default value.
+    ///  </returns>
+    string[] getIcePropertyAsList(string key);
+
     /// <summary>
     /// Get a property as a list of strings.
     /// The strings must be separated by whitespace or comma. If the property is
diff --git a/csharp/src/Ice/PropertiesI.cs b/csharp/src/Ice/PropertiesI.cs
index 131a7a8ee9f..45b1fe255e6 100644
--- a/csharp/src/Ice/PropertiesI.cs
+++ b/csharp/src/Ice/PropertiesI.cs
@@ -41,6 +41,11 @@ public string getProperty(string key)
         }
     }
 
+    public string getIceProperty(string key)
+    {
+        return getPropertyWithDefault(key, getDefaultProperty(key));
+    }
+
     public string getPropertyWithDefault(string key, string val)
     {
         lock (this)
@@ -61,6 +66,18 @@ public int getPropertyAsInt(string key)
         return getPropertyAsIntWithDefault(key, 0);
     }
 
+    public int getIcePropertyAsInt(string key)
+    {
+        string defaultValueString = getDefaultProperty(key);
+        int defaultValue = 0;
+        if (!string.IsNullOrEmpty(defaultValueString))
+        {
+            defaultValue = int.Parse(defaultValueString, CultureInfo.InvariantCulture);
+        }
+
+        return getPropertyAsIntWithDefault(key, defaultValue);
+    }
+
     public int getPropertyAsIntWithDefault(string key, int val)
     {
         lock (this)
@@ -89,6 +106,12 @@ public string[] getPropertyAsList(string key)
         return getPropertyAsListWithDefault(key, null);
     }
 
+    public string[] getIcePropertyAsList(string key)
+    {
+        string[] defaultList = Ice.UtilInternal.StringUtil.splitString(getDefaultProperty(key), ", \t\r\n");
+        return getPropertyAsListWithDefault(key, defaultList);
+    }
+
     public string[] getPropertyAsListWithDefault(string key, string[] val)
     {
         if (val == null)
@@ -153,68 +176,13 @@ public void setProperty(string key, string val)
             throw new InitializationException("Attempt to set property with empty key");
         }
 
-        //
-        // Check if the property is legal.
-        //
-        Logger logger = Util.getProcessLogger();
-        int dotPos = key.IndexOf('.');
-        if (dotPos != -1)
-        {
-            string prefix = key.Substring(0, dotPos);
-            foreach (var validProps in Ice.Internal.PropertyNames.validProps)
-            {
-                string pattern = validProps[0].pattern();
-                dotPos = pattern.IndexOf('.');
-                Debug.Assert(dotPos != -1);
-                string propPrefix = pattern.Substring(1, dotPos - 2);
-                bool mismatchCase = false;
-                string otherKey = "";
-                if (!propPrefix.ToUpper().Equals(prefix.ToUpper()))
-                {
-                    continue;
-                }
+        // Find the property, log warnings if necessary
+        var prop = findProperty(key, true);
 
-                bool found = false;
-                foreach (var prop in validProps)
-                {
-                    Regex r = new Regex(prop.pattern());
-                    Match m = r.Match(key);
-                    found = m.Success;
-                    if (found)
-                    {
-                        if (prop.deprecated())
-                        {
-                            logger.warning("deprecated property: " + key);
-                            if (prop.deprecatedBy() != null)
-                            {
-                                key = prop.deprecatedBy();
-                            }
-                        }
-                        break;
-                    }
-
-                    if (!found)
-                    {
-                        r = new Regex(prop.pattern().ToUpper());
-                        m = r.Match(key.ToUpper());
-                        if (m.Success)
-                        {
-                            found = true;
-                            mismatchCase = true;
-                            otherKey = prop.pattern().Replace("\\", "").Replace("^", "").Replace("$", "");
-                            break;
-                        }
-                    }
-                }
-                if (!found)
-                {
-                    logger.warning("unknown property: " + key);
-                }
-                else if (mismatchCase)
-                {
-                    logger.warning("unknown property: `" + key + "'; did you mean `" + otherKey + "'");
-                }
-            }
+        // If the property is deprecated by another property, use the new property key
+        if (prop != null && prop.deprecatedBy() != null)
+        {
+            key = prop.deprecatedBy();
         }
 
         lock (this)
@@ -625,5 +593,89 @@ private void loadConfig()
         }
     }
 
+    /// <summary>
+    ///  Find a property in the Ice property set.
+    /// </summary>
+    /// <param name="key">The property's key.</param>
+    /// <param name="logWarnings">Whether to log relevant warnings.</param>
+    /// <returns>The found property</returns>
+    private static Ice.Internal.Property findProperty(string key, bool logWarnings)
+    {
+        // Check if the property is a known Ice property and log warnings if necessary
+        Logger logger = Util.getProcessLogger();
+        int dotPos = key.IndexOf('.');
+        if (dotPos != -1)
+        {
+            string prefix = key.Substring(0, dotPos);
+            foreach (var validProps in Ice.Internal.PropertyNames.validProps)
+            {
+                string pattern = validProps[0].pattern();
+                dotPos = pattern.IndexOf('.');
+                Debug.Assert(dotPos != -1);
+                string propPrefix = pattern.Substring(1, dotPos - 2);
+
+                // If the prefix is not the same, skip to the next set of properties
+                if (!propPrefix.ToUpper().Equals(prefix.ToUpper()))
+                {
+                    continue;
+                }
+
+                foreach (var prop in validProps)
+                {
+                    Regex r = new Regex(prop.pattern());
+                    Match m = r.Match(key);
+                    if (m.Success)
+                    {
+                        if (prop.deprecated() && logWarnings)
+                        {
+                            logger.warning("deprecated property: " + key);
+                        }
+                        return prop;
+                    }
+
+                    // Check for case-insensitive match
+                    r = new Regex(prop.pattern().ToUpper());
+                    m = r.Match(key.ToUpper());
+                    if (m.Success)
+                    {
+                        if (logWarnings)
+                        {
+                            string otherKey = prop.pattern().Replace("\\", "").Replace("^", "").Replace("$", "");
+                            logger.warning("unknown property: `" + key + "'; did you mean `" + otherKey + "'");
+                        }
+                        return null;
+                    }
+                }
+
+                // If we get here, the prefix is valid but the property is unknown
+                if (logWarnings)
+                {
+                    logger.warning("unknown property: " + key);
+                }
+                return null;
+            }
+        }
+
+        // The key does not match a known Ice property
+        return null;
+    }
+
+    /// <summary>
+    /// Gets the default value for a given Ice property.
+    /// </summary>
+    /// <param name="key">The Ice property key</param>
+    /// <returns>The default property value, or an empty string the default is unspecified.</returns>
+    /// <exception cref="ArgumentException"></exception>
+    static private string getDefaultProperty(string key)
+    {
+        // Find the property, don't log any warnings.
+        var prop = findProperty(key, false);
+        if (prop == null)
+        {
+            throw new ArgumentException("unknown ice property: " + key);
+        }
+        return prop.defaultValue();
+    }
+
     private Dictionary<string, PropertyValue> _properties;
 }
diff --git a/csharp/test/Ice/properties/Client.cs b/csharp/test/Ice/properties/Client.cs
index 4ef9c9f8ea4..968fcf6686c 100644
--- a/csharp/test/Ice/properties/Client.cs
+++ b/csharp/test/Ice/properties/Client.cs
@@ -76,6 +76,47 @@ public override void run(string[] args)
             }
             Console.Out.WriteLine("ok");
         }
+
+        {
+            Console.Out.Write("testing ice properties with set default values...");
+            Console.Out.Flush();
+            Ice.Properties properties = Ice.Util.createProperties();
+            string toStringMode = properties.getIceProperty("Ice.ToStringMode");
+            test(toStringMode == "Unicode");
+            int closeTimeout = properties.getIcePropertyAsInt("Ice.Connection.CloseTimeout");
+            test(closeTimeout == 10);
+            string[] retryIntervals = properties.getIcePropertyAsList("Ice.RetryIntervals");
+            test(retryIntervals.Length == 1);
+            test(retryIntervals[0] == "0");
+            Console.Out.WriteLine("ok");
+        }
+
+        {
+            Console.Out.Write("testing ice properties with unset default values...");
+            Console.Out.Flush();
+            Ice.Properties properties = Ice.Util.createProperties();
+            string stringValue = properties.getIceProperty("Ice.Admin.Router");
+            test(stringValue == "");
+            int intValue = properties.getIcePropertyAsInt("Ice.Admin.Router");
+            test(intValue == 0);
+            string[] listValue = properties.getIcePropertyAsList("Ice.Admin.Router");
+            test(listValue.Length == 0);
+            Console.Out.WriteLine("ok");
+        }
+
+        {
+            Console.Out.Write("testing that getting an unknown ice property throws an exception...");
+            Console.Out.Flush();
+            Ice.Properties properties = Ice.Util.createProperties();
+            try
+            {
+                properties.getIceProperty("Ice.UnknownProperty");
+                test(false);
+            }
+            catch (System.ArgumentException)
+            {
+            }
+        }
     }
 
     public static Task<int> Main(string[] args) =>
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/Properties.java b/java/src/Ice/src/main/java/com/zeroc/Ice/Properties.java
index 32801f4d7e2..feb75c92192 100644
--- a/java/src/Ice/src/main/java/com/zeroc/Ice/Properties.java
+++ b/java/src/Ice/src/main/java/com/zeroc/Ice/Properties.java
@@ -30,6 +30,15 @@ public interface Properties {
    */
   String getProperty(String key);
 
+  /**
+   * Get an Ice property by key. If the property is not set, its default value is returned.
+   *
+   * @param key The property key.
+   * @return The property value or the default value.
+   * @see #setProperty
+   */
+  String getIceProperty(String key);
+
   /**
    * Get a property by key. If the property is not set, the given default value is returned.
    *
@@ -49,6 +58,15 @@ public interface Properties {
    */
   int getPropertyAsInt(String key);
 
+  /**
+   * Get an Ice property as an integer. If the property is not set, its default value is returned.
+   *
+   * @param key The property key.
+   * @return The property value interpreted as an integer, or the default value.
+   * @see #setProperty
+   */
+  int getIcePropertyAsInt(String key);
+
   /**
    * Get a property as an integer. If the property is not set, the given default value is returned.
    *
@@ -73,6 +91,20 @@ public interface Properties {
    */
   String[] getPropertyAsList(String key);
 
+  /**
+   * Get an Ice property as a list of strings. The strings must be separated by whitespace or comma.
+   * If the property is not set, its default list is returned. The strings in the list can contain
+   * whitespace and commas if they are enclosed in single or double quotes. If quotes are
+   * mismatched, the default list is returned. Within single quotes or double quotes, you can escape
+   * the quote in question with a backslash, e.g. O'Reilly can be written as O'Reilly, "O'Reilly" or
+   * 'O\'Reilly'.
+   *
+   * @param key The property key.
+   * @return The property value interpreted as list of strings, or the default value.
+   * @see #setProperty
+   */
+  String[] getIcePropertyAsList(String key);
+
   /**
    * Get a property as a list of strings. The strings must be separated by whitespace or comma. If
    * the property is not set, the default list is returned. The strings in the list can contain
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/PropertiesI.java b/java/src/Ice/src/main/java/com/zeroc/Ice/PropertiesI.java
index 0f26508a2cd..5ff8ff4edf1 100644
--- a/java/src/Ice/src/main/java/com/zeroc/Ice/PropertiesI.java
+++ b/java/src/Ice/src/main/java/com/zeroc/Ice/PropertiesI.java
@@ -4,6 +4,8 @@
 
 package com.zeroc.Ice;
 
+import com.zeroc.IceInternal.Property;
+
 public final class PropertiesI implements Properties {
   static class PropertyValue {
     public PropertyValue(PropertyValue v) {
@@ -31,6 +33,17 @@ public synchronized String getProperty(String key) {
     }
   }
 
+  @Override
+  public synchronized String getIceProperty(String key) {
+    PropertyValue pv = _properties.get(key);
+    if (pv != null) {
+      pv.used = true;
+      return pv.value;
+    } else {
+      return getDefaultProperty(key);
+    }
+  }
+
   @Override
   public synchronized String getPropertyWithDefault(String key, String value) {
     PropertyValue pv = _properties.get(key);
@@ -47,6 +60,17 @@ public int getPropertyAsInt(String key) {
     return getPropertyAsIntWithDefault(key, 0);
   }
 
+  @Override
+  public synchronized int getIcePropertyAsInt(String key) {
+    String defaultValueString = getDefaultProperty(key);
+    int defaultValue = 0;
+    if (defaultValueString != "") {
+      defaultValue = Integer.parseInt(defaultValueString);
+    }
+
+    return getPropertyAsIntWithDefault(key, defaultValue);
+  }
+
   @Override
   public synchronized int getPropertyAsIntWithDefault(String key, int value) {
     PropertyValue pv = _properties.get(key);
@@ -70,6 +94,13 @@ public String[] getPropertyAsList(String key) {
     return getPropertyAsListWithDefault(key, null);
   }
 
+  @Override
+  public synchronized String[] getIcePropertyAsList(String key) {
+    String[] defaultList =
+        com.zeroc.IceUtilInternal.StringUtil.splitString(getDefaultProperty(key), ", \t\r\n");
+    return getPropertyAsListWithDefault(key, defaultList);
+  }
+
   @Override
   public synchronized String[] getPropertyAsListWithDefault(String key, String[] value) {
     if (value == null) {
@@ -118,65 +149,16 @@ public void setProperty(String key, String value) {
       key = key.trim();
     }
 
-    //
-    // Check if the property is legal.
-    //
-    Logger logger = Util.getProcessLogger();
     if (key == null || key.length() == 0) {
       throw new InitializationException("Attempt to set property with empty key");
     }
 
-    int dotPos = key.indexOf('.');
-    if (dotPos != -1) {
-      String prefix = key.substring(0, dotPos);
-      for (int i = 0; com.zeroc.IceInternal.PropertyNames.validProps[i] != null; ++i) {
-        String pattern = com.zeroc.IceInternal.PropertyNames.validProps[i][0].pattern();
-        dotPos = pattern.indexOf('.');
-        //
-        // Each top level prefix describes a non-empty namespace. Having a string without a
-        // prefix followed by a dot is an error.
-        //
-        assert (dotPos != -1);
-        String propPrefix = pattern.substring(0, dotPos - 1);
-        boolean mismatchCase = false;
-        String otherKey = "";
-        if (!propPrefix.toUpperCase().equals(prefix.toUpperCase())) {
-          continue;
-        }
-
-        boolean found = false;
-        for (int j = 0;
-            com.zeroc.IceInternal.PropertyNames.validProps[i][j] != null && !found;
-            ++j) {
-          pattern = com.zeroc.IceInternal.PropertyNames.validProps[i][j].pattern();
-          java.util.regex.Pattern pComp = java.util.regex.Pattern.compile(pattern);
-          java.util.regex.Matcher m = pComp.matcher(key);
-          found = m.matches();
+    // Find the property, log warnings if necessary
+    Property prop = findProperty(key, true);
 
-          if (found && com.zeroc.IceInternal.PropertyNames.validProps[i][j].deprecated()) {
-            logger.warning("deprecated property: " + key);
-            if (com.zeroc.IceInternal.PropertyNames.validProps[i][j].deprecatedBy() != null) {
-              key = com.zeroc.IceInternal.PropertyNames.validProps[i][j].deprecatedBy();
-            }
-          }
-
-          if (!found) {
-            pComp = java.util.regex.Pattern.compile(pattern.toUpperCase());
-            m = pComp.matcher(key.toUpperCase());
-            if (m.matches()) {
-              found = true;
-              mismatchCase = true;
-              otherKey = pattern.replaceAll("\\\\", "");
-              break;
-            }
-          }
-        }
-        if (!found) {
-          logger.warning("unknown property: " + key);
-        } else if (mismatchCase) {
-          logger.warning("unknown property: `" + key + "'; did you mean `" + otherKey + "'");
-        }
-      }
+    // If the property is deprecated by another property, use the new property key
+    if (prop != null && prop.deprecatedBy() != null) {
+      key = prop.deprecatedBy();
     }
 
     synchronized (this) {
@@ -609,5 +591,83 @@ private void loadConfig() {
     }
   }
 
+  /*
+   * Find a property by key.
+   * @param key The property key.
+   * @param logWarnings Whether to log if the property is a known Ice property.
+   * @return The property or null if the property is unknown.
+   */
+  private static Property findProperty(String key, Boolean logWarnings) {
+    // Check if the property is a known Ice property and log warnings if necessary
+    Logger logger = Util.getProcessLogger();
+
+    int dotPos = key.indexOf('.');
+    if (dotPos != -1) {
+      String prefix = key.substring(0, dotPos);
+      for (int i = 0; com.zeroc.IceInternal.PropertyNames.validProps[i] != null; ++i) {
+        String pattern = com.zeroc.IceInternal.PropertyNames.validProps[i][0].pattern();
+        dotPos = pattern.indexOf('.');
+        //
+        // Each top level prefix describes a non-empty namespace. Having a string without a
+        // prefix followed by a dot is an error.
+        //
+        assert (dotPos != -1);
+        String propPrefix = pattern.substring(0, dotPos - 1);
+
+        // If the prefix is not the same, skip to the next set of properties
+        if (!propPrefix.toUpperCase().equals(prefix.toUpperCase())) {
+          continue;
+        }
+
+        for (int j = 0; com.zeroc.IceInternal.PropertyNames.validProps[i][j] != null; ++j) {
+          Property prop = com.zeroc.IceInternal.PropertyNames.validProps[i][j];
+          java.util.regex.Pattern pComp = java.util.regex.Pattern.compile(prop.pattern());
+          java.util.regex.Matcher m = pComp.matcher(key);
+
+          if (m.matches()) {
+            if (prop.deprecated() && logWarnings) {
+              logger.warning("deprecated property: " + key);
+            }
+            return prop;
+          }
+
+          // Check for case-insensitive match
+          pComp = java.util.regex.Pattern.compile(pattern.toUpperCase());
+          m = pComp.matcher(key.toUpperCase());
+          if (m.matches()) {
+            if (logWarnings) {
+              String otherKey = pattern.replaceAll("\\\\", "");
+              logger.warning("unknown property: `" + key + "'; did you mean `" + otherKey + "'");
+            }
+            return null;
+          }
+        }
+
+        // If we reach this point, the property is unknown
+        if (logWarnings) {
+          logger.warning("unknown property: " + key);
+        }
+        return null;
+      }
+    }
+
+    // The key does not match a known Ice property
+    return null;
+  }
+
+  /*
+   * Gets the default value for a given Ice property.
+   * @param key The property key.
+   * @return The default value.
+   * @throws IllegalArgumentException if the property is unknown.
+   */
+  private static String getDefaultProperty(String key) {
+    Property prop = findProperty(key, false);
+    if (prop == null) {
+      throw new IllegalArgumentException("unknown ice property: " + key);
+    }
+    return prop.defaultValue();
+  }
+
   private java.util.HashMap<String, PropertyValue> _properties = new java.util.HashMap<>();
 }
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/Property.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/Property.java
index eca6cf47662..1fd23a6232b 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/Property.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/Property.java
@@ -5,8 +5,9 @@
 package com.zeroc.IceInternal;
 
 public class Property {
-  public Property(String pattern, boolean deprecated, String deprecatedBy) {
+  public Property(String pattern, String defaultValue, boolean deprecated, String deprecatedBy) {
     _pattern = pattern;
+    _defaultValue = defaultValue;
     _deprecated = deprecated;
     _deprecatedBy = deprecatedBy;
   }
@@ -15,6 +16,10 @@ public String pattern() {
     return _pattern;
   }
 
+  public String defaultValue() {
+    return _defaultValue;
+  }
+
   public boolean deprecated() {
     return _deprecated;
   }
@@ -24,6 +29,7 @@ public String deprecatedBy() {
   }
 
   private String _pattern;
+  private String _defaultValue;
   private boolean _deprecated;
   private String _deprecatedBy;
 }
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java
index 869b0bc9628..05fc88429b2 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java
@@ -1,7 +1,5 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Apr 26 11:24:58 2024
+// Copyright (c) ZeroC, Inc. All rights reserved.// Generated by makeprops.py from file
+// ./config/PropertyNames.xml, Wed May  1 14:40:59 2024
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -9,1363 +7,1446 @@
 
 public final class PropertyNames {
   public static final Property IceProps[] = {
-    new Property("Ice\\.AcceptClassCycles", false, null),
-    new Property("Ice\\.ACM\\.Client", true, null),
-    new Property("Ice\\.ACM\\.Server", true, null),
-    new Property("Ice\\.ACM\\.Timeout", false, null),
-    new Property("Ice\\.ACM\\.Heartbeat", false, null),
-    new Property("Ice\\.ACM\\.Close", false, null),
-    new Property("Ice\\.ACM", false, null),
-    new Property("Ice\\.ACM\\.Client\\.Timeout", false, null),
-    new Property("Ice\\.ACM\\.Client\\.Heartbeat", false, null),
-    new Property("Ice\\.ACM\\.Client\\.Close", false, null),
-    new Property("Ice\\.ACM\\.Client", false, null),
-    new Property("Ice\\.ACM\\.Server\\.Timeout", false, null),
-    new Property("Ice\\.ACM\\.Server\\.Heartbeat", false, null),
-    new Property("Ice\\.ACM\\.Server\\.Close", false, null),
-    new Property("Ice\\.ACM\\.Server", false, null),
-    new Property("Ice\\.Admin\\.ACM\\.Timeout", false, null),
-    new Property("Ice\\.Admin\\.ACM\\.Heartbeat", false, null),
-    new Property("Ice\\.Admin\\.ACM\\.Close", false, null),
-    new Property("Ice\\.Admin\\.ACM", false, null),
-    new Property("Ice\\.Admin\\.AdapterId", false, null),
-    new Property("Ice\\.Admin\\.Connection\\.CloseTimeout", false, null),
-    new Property("Ice\\.Admin\\.Connection\\.ConnectTimeout", false, null),
-    new Property("Ice\\.Admin\\.Connection\\.EnableIdleCheck", false, null),
-    new Property("Ice\\.Admin\\.Connection\\.IdleTimeout", false, null),
-    new Property("Ice\\.Admin\\.Connection\\.InactivityTimeout", false, null),
-    new Property("Ice\\.Admin\\.Connection", false, null),
-    new Property("Ice\\.Admin\\.Endpoints", false, null),
-    new Property("Ice\\.Admin\\.Locator\\.EndpointSelection", false, null),
-    new Property("Ice\\.Admin\\.Locator\\.ConnectionCached", false, null),
-    new Property("Ice\\.Admin\\.Locator\\.PreferSecure", false, null),
-    new Property("Ice\\.Admin\\.Locator\\.LocatorCacheTimeout", false, null),
-    new Property("Ice\\.Admin\\.Locator\\.InvocationTimeout", false, null),
-    new Property("Ice\\.Admin\\.Locator\\.Locator", false, null),
-    new Property("Ice\\.Admin\\.Locator\\.Router", false, null),
-    new Property("Ice\\.Admin\\.Locator\\.CollocationOptimized", false, null),
-    new Property("Ice\\.Admin\\.Locator\\.Context\\.[^\\s]+", false, null),
-    new Property("Ice\\.Admin\\.Locator", false, null),
-    new Property("Ice\\.Admin\\.PublishedEndpoints", false, null),
-    new Property("Ice\\.Admin\\.ReplicaGroupId", false, null),
-    new Property("Ice\\.Admin\\.Router\\.EndpointSelection", false, null),
-    new Property("Ice\\.Admin\\.Router\\.ConnectionCached", false, null),
-    new Property("Ice\\.Admin\\.Router\\.PreferSecure", false, null),
-    new Property("Ice\\.Admin\\.Router\\.LocatorCacheTimeout", false, null),
-    new Property("Ice\\.Admin\\.Router\\.InvocationTimeout", false, null),
-    new Property("Ice\\.Admin\\.Router\\.Locator", false, null),
-    new Property("Ice\\.Admin\\.Router\\.Router", false, null),
-    new Property("Ice\\.Admin\\.Router\\.CollocationOptimized", false, null),
-    new Property("Ice\\.Admin\\.Router\\.Context\\.[^\\s]+", false, null),
-    new Property("Ice\\.Admin\\.Router", false, null),
-    new Property("Ice\\.Admin\\.ProxyOptions", false, null),
-    new Property("Ice\\.Admin\\.ThreadPool\\.Size", false, null),
-    new Property("Ice\\.Admin\\.ThreadPool\\.SizeMax", false, null),
-    new Property("Ice\\.Admin\\.ThreadPool\\.SizeWarn", false, null),
-    new Property("Ice\\.Admin\\.ThreadPool\\.StackSize", false, null),
-    new Property("Ice\\.Admin\\.ThreadPool\\.Serialize", false, null),
-    new Property("Ice\\.Admin\\.ThreadPool\\.ThreadIdleTime", false, null),
-    new Property("Ice\\.Admin\\.ThreadPool\\.ThreadPriority", false, null),
-    new Property("Ice\\.Admin\\.MessageSizeMax", false, null),
-    new Property("Ice\\.Admin\\.DelayCreation", false, null),
-    new Property("Ice\\.Admin\\.Enabled", false, null),
-    new Property("Ice\\.Admin\\.Facets", false, null),
-    new Property("Ice\\.Admin\\.InstanceName", false, null),
-    new Property("Ice\\.Admin\\.Logger\\.KeepLogs", false, null),
-    new Property("Ice\\.Admin\\.Logger\\.KeepTraces", false, null),
-    new Property("Ice\\.Admin\\.Logger\\.Properties", false, null),
-    new Property("Ice\\.Admin\\.ServerId", false, null),
-    new Property("Ice\\.BackgroundLocatorCacheUpdates", false, null),
-    new Property("Ice\\.BatchAutoFlush", true, null),
-    new Property("Ice\\.BatchAutoFlushSize", false, null),
-    new Property("Ice\\.ChangeUser", false, null),
-    new Property("Ice\\.ClassGraphDepthMax", false, null),
-    new Property("Ice\\.ClientAccessPolicyProtocol", false, null),
-    new Property("Ice\\.Compression\\.Level", false, null),
-    new Property("Ice\\.Config", false, null),
-    new Property("Ice\\.Connection\\.CloseTimeout", false, null),
-    new Property("Ice\\.Connection\\.ConnectTimeout", false, null),
-    new Property("Ice\\.Connection\\.EnableIdleCheck", false, null),
-    new Property("Ice\\.Connection\\.IdleTimeout", false, null),
-    new Property("Ice\\.Connection\\.InactivityTimeout", false, null),
-    new Property("Ice\\.Connection", false, null),
-    new Property("Ice\\.ConsoleListener", false, null),
-    new Property("Ice\\.Default\\.CollocationOptimized", false, null),
-    new Property("Ice\\.Default\\.EncodingVersion", false, null),
-    new Property("Ice\\.Default\\.EndpointSelection", false, null),
-    new Property("Ice\\.Default\\.Host", false, null),
-    new Property("Ice\\.Default\\.Locator\\.EndpointSelection", false, null),
-    new Property("Ice\\.Default\\.Locator\\.ConnectionCached", false, null),
-    new Property("Ice\\.Default\\.Locator\\.PreferSecure", false, null),
-    new Property("Ice\\.Default\\.Locator\\.LocatorCacheTimeout", false, null),
-    new Property("Ice\\.Default\\.Locator\\.InvocationTimeout", false, null),
-    new Property("Ice\\.Default\\.Locator\\.Locator", false, null),
-    new Property("Ice\\.Default\\.Locator\\.Router", false, null),
-    new Property("Ice\\.Default\\.Locator\\.CollocationOptimized", false, null),
-    new Property("Ice\\.Default\\.Locator\\.Context\\.[^\\s]+", false, null),
-    new Property("Ice\\.Default\\.Locator", false, null),
-    new Property("Ice\\.Default\\.LocatorCacheTimeout", false, null),
-    new Property("Ice\\.Default\\.InvocationTimeout", false, null),
-    new Property("Ice\\.Default\\.Package", false, null),
-    new Property("Ice\\.Default\\.PreferSecure", false, null),
-    new Property("Ice\\.Default\\.Protocol", false, null),
-    new Property("Ice\\.Default\\.Router\\.EndpointSelection", false, null),
-    new Property("Ice\\.Default\\.Router\\.ConnectionCached", false, null),
-    new Property("Ice\\.Default\\.Router\\.PreferSecure", false, null),
-    new Property("Ice\\.Default\\.Router\\.LocatorCacheTimeout", false, null),
-    new Property("Ice\\.Default\\.Router\\.InvocationTimeout", false, null),
-    new Property("Ice\\.Default\\.Router\\.Locator", false, null),
-    new Property("Ice\\.Default\\.Router\\.Router", false, null),
-    new Property("Ice\\.Default\\.Router\\.CollocationOptimized", false, null),
-    new Property("Ice\\.Default\\.Router\\.Context\\.[^\\s]+", false, null),
-    new Property("Ice\\.Default\\.Router", false, null),
-    new Property("Ice\\.Default\\.SlicedFormat", false, null),
-    new Property("Ice\\.Default\\.SourceAddress", false, null),
-    new Property("Ice\\.Default\\.Timeout", false, null),
-    new Property("Ice\\.EventLog\\.Source", false, null),
-    new Property("Ice\\.FactoryAssemblies", false, null),
-    new Property("Ice\\.HTTPProxyHost", false, null),
-    new Property("Ice\\.HTTPProxyPort", false, null),
-    new Property("Ice\\.ImplicitContext", false, null),
-    new Property("Ice\\.InitPlugins", false, null),
-    new Property("Ice\\.IPv4", false, null),
-    new Property("Ice\\.IPv6", false, null),
-    new Property("Ice\\.LogFile", false, null),
-    new Property("Ice\\.LogFile\\.SizeMax", false, null),
-    new Property("Ice\\.LogStdErr\\.Convert", false, null),
-    new Property("Ice\\.MessageSizeMax", false, null),
-    new Property("Ice\\.Nohup", false, null),
-    new Property("Ice\\.Override\\.CloseTimeout", false, null),
-    new Property("Ice\\.Override\\.Compress", false, null),
-    new Property("Ice\\.Override\\.ConnectTimeout", false, null),
-    new Property("Ice\\.Override\\.Timeout", false, null),
-    new Property("Ice\\.Override\\.Secure", false, null),
-    new Property("Ice\\.Package\\.[^\\s]+", false, null),
-    new Property("Ice\\.Plugin\\.[^\\s]+", false, null),
-    new Property("Ice\\.PluginLoadOrder", false, null),
-    new Property("Ice\\.PreferIPv6Address", false, null),
-    new Property("Ice\\.PreloadAssemblies", false, null),
-    new Property("Ice\\.PrintAdapterReady", false, null),
-    new Property("Ice\\.PrintProcessId", false, null),
-    new Property("Ice\\.PrintStackTraces", false, null),
-    new Property("Ice\\.ProgramName", false, null),
-    new Property("Ice\\.RetryIntervals", false, null),
-    new Property("Ice\\.ServerIdleTime", false, null),
-    new Property("Ice\\.SOCKSProxyHost", false, null),
-    new Property("Ice\\.SOCKSProxyPort", false, null),
-    new Property("Ice\\.StdErr", false, null),
-    new Property("Ice\\.StdOut", false, null),
-    new Property("Ice\\.SyslogFacility", false, null),
-    new Property("Ice\\.ThreadPool\\.Client\\.Size", false, null),
-    new Property("Ice\\.ThreadPool\\.Client\\.SizeMax", false, null),
-    new Property("Ice\\.ThreadPool\\.Client\\.SizeWarn", false, null),
-    new Property("Ice\\.ThreadPool\\.Client\\.StackSize", false, null),
-    new Property("Ice\\.ThreadPool\\.Client\\.Serialize", false, null),
-    new Property("Ice\\.ThreadPool\\.Client\\.ThreadIdleTime", false, null),
-    new Property("Ice\\.ThreadPool\\.Client\\.ThreadPriority", false, null),
-    new Property("Ice\\.ThreadPool\\.Server\\.Size", false, null),
-    new Property("Ice\\.ThreadPool\\.Server\\.SizeMax", false, null),
-    new Property("Ice\\.ThreadPool\\.Server\\.SizeWarn", false, null),
-    new Property("Ice\\.ThreadPool\\.Server\\.StackSize", false, null),
-    new Property("Ice\\.ThreadPool\\.Server\\.Serialize", false, null),
-    new Property("Ice\\.ThreadPool\\.Server\\.ThreadIdleTime", false, null),
-    new Property("Ice\\.ThreadPool\\.Server\\.ThreadPriority", false, null),
-    new Property("Ice\\.ThreadPriority", false, null),
-    new Property("Ice\\.ToStringMode", false, null),
-    new Property("Ice\\.Trace\\.Admin\\.Properties", false, null),
-    new Property("Ice\\.Trace\\.Admin\\.Logger", false, null),
-    new Property("Ice\\.Trace\\.Locator", false, null),
-    new Property("Ice\\.Trace\\.Network", false, null),
-    new Property("Ice\\.Trace\\.Protocol", false, null),
-    new Property("Ice\\.Trace\\.Retry", false, null),
-    new Property("Ice\\.Trace\\.Slicing", false, null),
-    new Property("Ice\\.Trace\\.ThreadPool", false, null),
-    new Property("Ice\\.UDP\\.RcvSize", false, null),
-    new Property("Ice\\.UDP\\.SndSize", false, null),
-    new Property("Ice\\.TCP\\.Backlog", false, null),
-    new Property("Ice\\.TCP\\.RcvSize", false, null),
-    new Property("Ice\\.TCP\\.SndSize", false, null),
-    new Property("Ice\\.UseApplicationClassLoader", false, null),
-    new Property("Ice\\.UseOSLog", false, null),
-    new Property("Ice\\.UseSyslog", false, null),
-    new Property("Ice\\.UseSystemdJournal", false, null),
-    new Property("Ice\\.Warn\\.AMICallback", false, null),
-    new Property("Ice\\.Warn\\.Connections", false, null),
-    new Property("Ice\\.Warn\\.Datagrams", false, null),
-    new Property("Ice\\.Warn\\.Dispatch", false, null),
-    new Property("Ice\\.Warn\\.Endpoints", false, null),
-    new Property("Ice\\.Warn\\.UnknownProperties", false, null),
-    new Property("Ice\\.Warn\\.UnusedProperties", false, null),
-    new Property("Ice\\.CacheMessageBuffers", false, null),
-    new Property("Ice\\.ThreadInterruptSafe", false, null),
+    new Property("Ice\\.AcceptClassCycles", "", false, null),
+    new Property("Ice\\.ACM\\.Client", "", true, null),
+    new Property("Ice\\.ACM\\.Server", "", true, null),
+    new Property("Ice\\.ACM\\.Timeout", "", false, null),
+    new Property("Ice\\.ACM\\.Heartbeat", "", false, null),
+    new Property("Ice\\.ACM\\.Close", "", false, null),
+    new Property("Ice\\.ACM", "", false, null),
+    new Property("Ice\\.ACM\\.Client\\.Timeout", "", false, null),
+    new Property("Ice\\.ACM\\.Client\\.Heartbeat", "", false, null),
+    new Property("Ice\\.ACM\\.Client\\.Close", "", false, null),
+    new Property("Ice\\.ACM\\.Client", "", false, null),
+    new Property("Ice\\.ACM\\.Server\\.Timeout", "", false, null),
+    new Property("Ice\\.ACM\\.Server\\.Heartbeat", "", false, null),
+    new Property("Ice\\.ACM\\.Server\\.Close", "", false, null),
+    new Property("Ice\\.ACM\\.Server", "", false, null),
+    new Property("Ice\\.Admin\\.ACM\\.Timeout", "", false, null),
+    new Property("Ice\\.Admin\\.ACM\\.Heartbeat", "", false, null),
+    new Property("Ice\\.Admin\\.ACM\\.Close", "", false, null),
+    new Property("Ice\\.Admin\\.ACM", "", false, null),
+    new Property("Ice\\.Admin\\.AdapterId", "", false, null),
+    new Property("Ice\\.Admin\\.Connection\\.CloseTimeout", "10", false, null),
+    new Property("Ice\\.Admin\\.Connection\\.ConnectTimeout", "10", false, null),
+    new Property("Ice\\.Admin\\.Connection\\.EnableIdleCheck", "1", false, null),
+    new Property("Ice\\.Admin\\.Connection\\.IdleTimeout", "60", false, null),
+    new Property("Ice\\.Admin\\.Connection\\.InactivityTimeout", "300", false, null),
+    new Property("Ice\\.Admin\\.Connection", "", false, null),
+    new Property("Ice\\.Admin\\.Endpoints", "", false, null),
+    new Property("Ice\\.Admin\\.Locator\\.EndpointSelection", "", false, null),
+    new Property("Ice\\.Admin\\.Locator\\.ConnectionCached", "", false, null),
+    new Property("Ice\\.Admin\\.Locator\\.PreferSecure", "", false, null),
+    new Property("Ice\\.Admin\\.Locator\\.LocatorCacheTimeout", "", false, null),
+    new Property("Ice\\.Admin\\.Locator\\.InvocationTimeout", "", false, null),
+    new Property("Ice\\.Admin\\.Locator\\.Locator", "", false, null),
+    new Property("Ice\\.Admin\\.Locator\\.Router", "", false, null),
+    new Property("Ice\\.Admin\\.Locator\\.CollocationOptimized", "", false, null),
+    new Property("Ice\\.Admin\\.Locator\\.Context\\.[^\\s]+", "", false, null),
+    new Property("Ice\\.Admin\\.Locator", "", false, null),
+    new Property("Ice\\.Admin\\.PublishedEndpoints", "", false, null),
+    new Property("Ice\\.Admin\\.ReplicaGroupId", "", false, null),
+    new Property("Ice\\.Admin\\.Router\\.EndpointSelection", "", false, null),
+    new Property("Ice\\.Admin\\.Router\\.ConnectionCached", "", false, null),
+    new Property("Ice\\.Admin\\.Router\\.PreferSecure", "", false, null),
+    new Property("Ice\\.Admin\\.Router\\.LocatorCacheTimeout", "", false, null),
+    new Property("Ice\\.Admin\\.Router\\.InvocationTimeout", "", false, null),
+    new Property("Ice\\.Admin\\.Router\\.Locator", "", false, null),
+    new Property("Ice\\.Admin\\.Router\\.Router", "", false, null),
+    new Property("Ice\\.Admin\\.Router\\.CollocationOptimized", "", false, null),
+    new Property("Ice\\.Admin\\.Router\\.Context\\.[^\\s]+", "", false, null),
+    new Property("Ice\\.Admin\\.Router", "", false, null),
+    new Property("Ice\\.Admin\\.ProxyOptions", "", false, null),
+    new Property("Ice\\.Admin\\.ThreadPool\\.Size", "", false, null),
+    new Property("Ice\\.Admin\\.ThreadPool\\.SizeMax", "", false, null),
+    new Property("Ice\\.Admin\\.ThreadPool\\.SizeWarn", "", false, null),
+    new Property("Ice\\.Admin\\.ThreadPool\\.StackSize", "", false, null),
+    new Property("Ice\\.Admin\\.ThreadPool\\.Serialize", "", false, null),
+    new Property("Ice\\.Admin\\.ThreadPool\\.ThreadIdleTime", "", false, null),
+    new Property("Ice\\.Admin\\.ThreadPool\\.ThreadPriority", "", false, null),
+    new Property("Ice\\.Admin\\.MessageSizeMax", "", false, null),
+    new Property("Ice\\.Admin\\.DelayCreation", "", false, null),
+    new Property("Ice\\.Admin\\.Enabled", "", false, null),
+    new Property("Ice\\.Admin\\.Facets", "", false, null),
+    new Property("Ice\\.Admin\\.InstanceName", "", false, null),
+    new Property("Ice\\.Admin\\.Logger\\.KeepLogs", "", false, null),
+    new Property("Ice\\.Admin\\.Logger\\.KeepTraces", "", false, null),
+    new Property("Ice\\.Admin\\.Logger\\.Properties", "", false, null),
+    new Property("Ice\\.Admin\\.ServerId", "", false, null),
+    new Property("Ice\\.BackgroundLocatorCacheUpdates", "", false, null),
+    new Property("Ice\\.BatchAutoFlush", "", true, null),
+    new Property("Ice\\.BatchAutoFlushSize", "", false, null),
+    new Property("Ice\\.ChangeUser", "", false, null),
+    new Property("Ice\\.ClassGraphDepthMax", "", false, null),
+    new Property("Ice\\.ClientAccessPolicyProtocol", "", false, null),
+    new Property("Ice\\.Compression\\.Level", "", false, null),
+    new Property("Ice\\.Config", "", false, null),
+    new Property("Ice\\.Connection\\.CloseTimeout", "10", false, null),
+    new Property("Ice\\.Connection\\.ConnectTimeout", "10", false, null),
+    new Property("Ice\\.Connection\\.EnableIdleCheck", "1", false, null),
+    new Property("Ice\\.Connection\\.IdleTimeout", "60", false, null),
+    new Property("Ice\\.Connection\\.InactivityTimeout", "300", false, null),
+    new Property("Ice\\.Connection", "", false, null),
+    new Property("Ice\\.ConsoleListener", "", false, null),
+    new Property("Ice\\.Default\\.CollocationOptimized", "", false, null),
+    new Property("Ice\\.Default\\.EncodingVersion", "", false, null),
+    new Property("Ice\\.Default\\.EndpointSelection", "", false, null),
+    new Property("Ice\\.Default\\.Host", "", false, null),
+    new Property("Ice\\.Default\\.Locator\\.EndpointSelection", "", false, null),
+    new Property("Ice\\.Default\\.Locator\\.ConnectionCached", "", false, null),
+    new Property("Ice\\.Default\\.Locator\\.PreferSecure", "", false, null),
+    new Property("Ice\\.Default\\.Locator\\.LocatorCacheTimeout", "", false, null),
+    new Property("Ice\\.Default\\.Locator\\.InvocationTimeout", "", false, null),
+    new Property("Ice\\.Default\\.Locator\\.Locator", "", false, null),
+    new Property("Ice\\.Default\\.Locator\\.Router", "", false, null),
+    new Property("Ice\\.Default\\.Locator\\.CollocationOptimized", "", false, null),
+    new Property("Ice\\.Default\\.Locator\\.Context\\.[^\\s]+", "", false, null),
+    new Property("Ice\\.Default\\.Locator", "", false, null),
+    new Property("Ice\\.Default\\.LocatorCacheTimeout", "", false, null),
+    new Property("Ice\\.Default\\.InvocationTimeout", "", false, null),
+    new Property("Ice\\.Default\\.Package", "", false, null),
+    new Property("Ice\\.Default\\.PreferSecure", "", false, null),
+    new Property("Ice\\.Default\\.Protocol", "", false, null),
+    new Property("Ice\\.Default\\.Router\\.EndpointSelection", "", false, null),
+    new Property("Ice\\.Default\\.Router\\.ConnectionCached", "", false, null),
+    new Property("Ice\\.Default\\.Router\\.PreferSecure", "", false, null),
+    new Property("Ice\\.Default\\.Router\\.LocatorCacheTimeout", "", false, null),
+    new Property("Ice\\.Default\\.Router\\.InvocationTimeout", "", false, null),
+    new Property("Ice\\.Default\\.Router\\.Locator", "", false, null),
+    new Property("Ice\\.Default\\.Router\\.Router", "", false, null),
+    new Property("Ice\\.Default\\.Router\\.CollocationOptimized", "", false, null),
+    new Property("Ice\\.Default\\.Router\\.Context\\.[^\\s]+", "", false, null),
+    new Property("Ice\\.Default\\.Router", "", false, null),
+    new Property("Ice\\.Default\\.SlicedFormat", "", false, null),
+    new Property("Ice\\.Default\\.SourceAddress", "", false, null),
+    new Property("Ice\\.Default\\.Timeout", "", false, null),
+    new Property("Ice\\.EventLog\\.Source", "", false, null),
+    new Property("Ice\\.FactoryAssemblies", "", false, null),
+    new Property("Ice\\.HTTPProxyHost", "", false, null),
+    new Property("Ice\\.HTTPProxyPort", "", false, null),
+    new Property("Ice\\.ImplicitContext", "", false, null),
+    new Property("Ice\\.InitPlugins", "", false, null),
+    new Property("Ice\\.IPv4", "", false, null),
+    new Property("Ice\\.IPv6", "", false, null),
+    new Property("Ice\\.LogFile", "", false, null),
+    new Property("Ice\\.LogFile\\.SizeMax", "", false, null),
+    new Property("Ice\\.LogStdErr\\.Convert", "", false, null),
+    new Property("Ice\\.MessageSizeMax", "", false, null),
+    new Property("Ice\\.Nohup", "", false, null),
+    new Property("Ice\\.Override\\.CloseTimeout", "", false, null),
+    new Property("Ice\\.Override\\.Compress", "", false, null),
+    new Property("Ice\\.Override\\.ConnectTimeout", "", false, null),
+    new Property("Ice\\.Override\\.Timeout", "", false, null),
+    new Property("Ice\\.Override\\.Secure", "", false, null),
+    new Property("Ice\\.Package\\.[^\\s]+", "", false, null),
+    new Property("Ice\\.Plugin\\.[^\\s]+", "", false, null),
+    new Property("Ice\\.PluginLoadOrder", "", false, null),
+    new Property("Ice\\.PreferIPv6Address", "", false, null),
+    new Property("Ice\\.PreloadAssemblies", "", false, null),
+    new Property("Ice\\.PrintAdapterReady", "", false, null),
+    new Property("Ice\\.PrintProcessId", "", false, null),
+    new Property("Ice\\.PrintStackTraces", "", false, null),
+    new Property("Ice\\.ProgramName", "", false, null),
+    new Property("Ice\\.RetryIntervals", "0", false, null),
+    new Property("Ice\\.ServerIdleTime", "", false, null),
+    new Property("Ice\\.SOCKSProxyHost", "", false, null),
+    new Property("Ice\\.SOCKSProxyPort", "", false, null),
+    new Property("Ice\\.StdErr", "", false, null),
+    new Property("Ice\\.StdOut", "", false, null),
+    new Property("Ice\\.SyslogFacility", "", false, null),
+    new Property("Ice\\.ThreadPool\\.Client\\.Size", "", false, null),
+    new Property("Ice\\.ThreadPool\\.Client\\.SizeMax", "", false, null),
+    new Property("Ice\\.ThreadPool\\.Client\\.SizeWarn", "", false, null),
+    new Property("Ice\\.ThreadPool\\.Client\\.StackSize", "", false, null),
+    new Property("Ice\\.ThreadPool\\.Client\\.Serialize", "", false, null),
+    new Property("Ice\\.ThreadPool\\.Client\\.ThreadIdleTime", "", false, null),
+    new Property("Ice\\.ThreadPool\\.Client\\.ThreadPriority", "", false, null),
+    new Property("Ice\\.ThreadPool\\.Server\\.Size", "", false, null),
+    new Property("Ice\\.ThreadPool\\.Server\\.SizeMax", "", false, null),
+    new Property("Ice\\.ThreadPool\\.Server\\.SizeWarn", "", false, null),
+    new Property("Ice\\.ThreadPool\\.Server\\.StackSize", "", false, null),
+    new Property("Ice\\.ThreadPool\\.Server\\.Serialize", "", false, null),
+    new Property("Ice\\.ThreadPool\\.Server\\.ThreadIdleTime", "", false, null),
+    new Property("Ice\\.ThreadPool\\.Server\\.ThreadPriority", "", false, null),
+    new Property("Ice\\.ThreadPriority", "", false, null),
+    new Property("Ice\\.ToStringMode", "Unicode", false, null),
+    new Property("Ice\\.Trace\\.Admin\\.Properties", "", false, null),
+    new Property("Ice\\.Trace\\.Admin\\.Logger", "", false, null),
+    new Property("Ice\\.Trace\\.Locator", "", false, null),
+    new Property("Ice\\.Trace\\.Network", "", false, null),
+    new Property("Ice\\.Trace\\.Protocol", "", false, null),
+    new Property("Ice\\.Trace\\.Retry", "", false, null),
+    new Property("Ice\\.Trace\\.Slicing", "", false, null),
+    new Property("Ice\\.Trace\\.ThreadPool", "", false, null),
+    new Property("Ice\\.UDP\\.RcvSize", "", false, null),
+    new Property("Ice\\.UDP\\.SndSize", "", false, null),
+    new Property("Ice\\.TCP\\.Backlog", "", false, null),
+    new Property("Ice\\.TCP\\.RcvSize", "", false, null),
+    new Property("Ice\\.TCP\\.SndSize", "", false, null),
+    new Property("Ice\\.UseApplicationClassLoader", "", false, null),
+    new Property("Ice\\.UseOSLog", "", false, null),
+    new Property("Ice\\.UseSyslog", "", false, null),
+    new Property("Ice\\.UseSystemdJournal", "", false, null),
+    new Property("Ice\\.Warn\\.AMICallback", "", false, null),
+    new Property("Ice\\.Warn\\.Connections", "", false, null),
+    new Property("Ice\\.Warn\\.Datagrams", "", false, null),
+    new Property("Ice\\.Warn\\.Dispatch", "", false, null),
+    new Property("Ice\\.Warn\\.Endpoints", "", false, null),
+    new Property("Ice\\.Warn\\.UnknownProperties", "", false, null),
+    new Property("Ice\\.Warn\\.UnusedProperties", "", false, null),
+    new Property("Ice\\.CacheMessageBuffers", "", false, null),
+    new Property("Ice\\.ThreadInterruptSafe", "", false, null),
     null
   };
 
   public static final Property IceMXProps[] = {
-    new Property("IceMX\\.Metrics\\.[^\\s]+\\.GroupBy", false, null),
-    new Property("IceMX\\.Metrics\\.[^\\s]+\\.Map", false, null),
-    new Property("IceMX\\.Metrics\\.[^\\s]+\\.RetainDetached", false, null),
-    new Property("IceMX\\.Metrics\\.[^\\s]+\\.Accept", false, null),
-    new Property("IceMX\\.Metrics\\.[^\\s]+\\.Reject", false, null),
-    new Property("IceMX\\.Metrics\\.[^\\s]+", false, null),
+    new Property("IceMX\\.Metrics\\.[^\\s]+\\.GroupBy", "", false, null),
+    new Property("IceMX\\.Metrics\\.[^\\s]+\\.Map", "", false, null),
+    new Property("IceMX\\.Metrics\\.[^\\s]+\\.RetainDetached", "", false, null),
+    new Property("IceMX\\.Metrics\\.[^\\s]+\\.Accept", "", false, null),
+    new Property("IceMX\\.Metrics\\.[^\\s]+\\.Reject", "", false, null),
+    new Property("IceMX\\.Metrics\\.[^\\s]+", "", false, null),
     null
   };
 
   public static final Property IceDiscoveryProps[] = {
-    new Property("IceDiscovery\\.Multicast\\.ACM\\.Timeout", false, null),
-    new Property("IceDiscovery\\.Multicast\\.ACM\\.Heartbeat", false, null),
-    new Property("IceDiscovery\\.Multicast\\.ACM\\.Close", false, null),
-    new Property("IceDiscovery\\.Multicast\\.ACM", false, null),
-    new Property("IceDiscovery\\.Multicast\\.AdapterId", false, null),
-    new Property("IceDiscovery\\.Multicast\\.Connection\\.CloseTimeout", false, null),
-    new Property("IceDiscovery\\.Multicast\\.Connection\\.ConnectTimeout", false, null),
-    new Property("IceDiscovery\\.Multicast\\.Connection\\.EnableIdleCheck", false, null),
-    new Property("IceDiscovery\\.Multicast\\.Connection\\.IdleTimeout", false, null),
-    new Property("IceDiscovery\\.Multicast\\.Connection\\.InactivityTimeout", false, null),
-    new Property("IceDiscovery\\.Multicast\\.Connection", false, null),
-    new Property("IceDiscovery\\.Multicast\\.Endpoints", false, null),
-    new Property("IceDiscovery\\.Multicast\\.Locator\\.EndpointSelection", false, null),
-    new Property("IceDiscovery\\.Multicast\\.Locator\\.ConnectionCached", false, null),
-    new Property("IceDiscovery\\.Multicast\\.Locator\\.PreferSecure", false, null),
-    new Property("IceDiscovery\\.Multicast\\.Locator\\.LocatorCacheTimeout", false, null),
-    new Property("IceDiscovery\\.Multicast\\.Locator\\.InvocationTimeout", false, null),
-    new Property("IceDiscovery\\.Multicast\\.Locator\\.Locator", false, null),
-    new Property("IceDiscovery\\.Multicast\\.Locator\\.Router", false, null),
-    new Property("IceDiscovery\\.Multicast\\.Locator\\.CollocationOptimized", false, null),
-    new Property("IceDiscovery\\.Multicast\\.Locator\\.Context\\.[^\\s]+", false, null),
-    new Property("IceDiscovery\\.Multicast\\.Locator", false, null),
-    new Property("IceDiscovery\\.Multicast\\.PublishedEndpoints", false, null),
-    new Property("IceDiscovery\\.Multicast\\.ReplicaGroupId", false, null),
-    new Property("IceDiscovery\\.Multicast\\.Router\\.EndpointSelection", false, null),
-    new Property("IceDiscovery\\.Multicast\\.Router\\.ConnectionCached", false, null),
-    new Property("IceDiscovery\\.Multicast\\.Router\\.PreferSecure", false, null),
-    new Property("IceDiscovery\\.Multicast\\.Router\\.LocatorCacheTimeout", false, null),
-    new Property("IceDiscovery\\.Multicast\\.Router\\.InvocationTimeout", false, null),
-    new Property("IceDiscovery\\.Multicast\\.Router\\.Locator", false, null),
-    new Property("IceDiscovery\\.Multicast\\.Router\\.Router", false, null),
-    new Property("IceDiscovery\\.Multicast\\.Router\\.CollocationOptimized", false, null),
-    new Property("IceDiscovery\\.Multicast\\.Router\\.Context\\.[^\\s]+", false, null),
-    new Property("IceDiscovery\\.Multicast\\.Router", false, null),
-    new Property("IceDiscovery\\.Multicast\\.ProxyOptions", false, null),
-    new Property("IceDiscovery\\.Multicast\\.ThreadPool\\.Size", false, null),
-    new Property("IceDiscovery\\.Multicast\\.ThreadPool\\.SizeMax", false, null),
-    new Property("IceDiscovery\\.Multicast\\.ThreadPool\\.SizeWarn", false, null),
-    new Property("IceDiscovery\\.Multicast\\.ThreadPool\\.StackSize", false, null),
-    new Property("IceDiscovery\\.Multicast\\.ThreadPool\\.Serialize", false, null),
-    new Property("IceDiscovery\\.Multicast\\.ThreadPool\\.ThreadIdleTime", false, null),
-    new Property("IceDiscovery\\.Multicast\\.ThreadPool\\.ThreadPriority", false, null),
-    new Property("IceDiscovery\\.Multicast\\.MessageSizeMax", false, null),
-    new Property("IceDiscovery\\.Reply\\.ACM\\.Timeout", false, null),
-    new Property("IceDiscovery\\.Reply\\.ACM\\.Heartbeat", false, null),
-    new Property("IceDiscovery\\.Reply\\.ACM\\.Close", false, null),
-    new Property("IceDiscovery\\.Reply\\.ACM", false, null),
-    new Property("IceDiscovery\\.Reply\\.AdapterId", false, null),
-    new Property("IceDiscovery\\.Reply\\.Connection\\.CloseTimeout", false, null),
-    new Property("IceDiscovery\\.Reply\\.Connection\\.ConnectTimeout", false, null),
-    new Property("IceDiscovery\\.Reply\\.Connection\\.EnableIdleCheck", false, null),
-    new Property("IceDiscovery\\.Reply\\.Connection\\.IdleTimeout", false, null),
-    new Property("IceDiscovery\\.Reply\\.Connection\\.InactivityTimeout", false, null),
-    new Property("IceDiscovery\\.Reply\\.Connection", false, null),
-    new Property("IceDiscovery\\.Reply\\.Endpoints", false, null),
-    new Property("IceDiscovery\\.Reply\\.Locator\\.EndpointSelection", false, null),
-    new Property("IceDiscovery\\.Reply\\.Locator\\.ConnectionCached", false, null),
-    new Property("IceDiscovery\\.Reply\\.Locator\\.PreferSecure", false, null),
-    new Property("IceDiscovery\\.Reply\\.Locator\\.LocatorCacheTimeout", false, null),
-    new Property("IceDiscovery\\.Reply\\.Locator\\.InvocationTimeout", false, null),
-    new Property("IceDiscovery\\.Reply\\.Locator\\.Locator", false, null),
-    new Property("IceDiscovery\\.Reply\\.Locator\\.Router", false, null),
-    new Property("IceDiscovery\\.Reply\\.Locator\\.CollocationOptimized", false, null),
-    new Property("IceDiscovery\\.Reply\\.Locator\\.Context\\.[^\\s]+", false, null),
-    new Property("IceDiscovery\\.Reply\\.Locator", false, null),
-    new Property("IceDiscovery\\.Reply\\.PublishedEndpoints", false, null),
-    new Property("IceDiscovery\\.Reply\\.ReplicaGroupId", false, null),
-    new Property("IceDiscovery\\.Reply\\.Router\\.EndpointSelection", false, null),
-    new Property("IceDiscovery\\.Reply\\.Router\\.ConnectionCached", false, null),
-    new Property("IceDiscovery\\.Reply\\.Router\\.PreferSecure", false, null),
-    new Property("IceDiscovery\\.Reply\\.Router\\.LocatorCacheTimeout", false, null),
-    new Property("IceDiscovery\\.Reply\\.Router\\.InvocationTimeout", false, null),
-    new Property("IceDiscovery\\.Reply\\.Router\\.Locator", false, null),
-    new Property("IceDiscovery\\.Reply\\.Router\\.Router", false, null),
-    new Property("IceDiscovery\\.Reply\\.Router\\.CollocationOptimized", false, null),
-    new Property("IceDiscovery\\.Reply\\.Router\\.Context\\.[^\\s]+", false, null),
-    new Property("IceDiscovery\\.Reply\\.Router", false, null),
-    new Property("IceDiscovery\\.Reply\\.ProxyOptions", false, null),
-    new Property("IceDiscovery\\.Reply\\.ThreadPool\\.Size", false, null),
-    new Property("IceDiscovery\\.Reply\\.ThreadPool\\.SizeMax", false, null),
-    new Property("IceDiscovery\\.Reply\\.ThreadPool\\.SizeWarn", false, null),
-    new Property("IceDiscovery\\.Reply\\.ThreadPool\\.StackSize", false, null),
-    new Property("IceDiscovery\\.Reply\\.ThreadPool\\.Serialize", false, null),
-    new Property("IceDiscovery\\.Reply\\.ThreadPool\\.ThreadIdleTime", false, null),
-    new Property("IceDiscovery\\.Reply\\.ThreadPool\\.ThreadPriority", false, null),
-    new Property("IceDiscovery\\.Reply\\.MessageSizeMax", false, null),
-    new Property("IceDiscovery\\.Locator\\.ACM\\.Timeout", false, null),
-    new Property("IceDiscovery\\.Locator\\.ACM\\.Heartbeat", false, null),
-    new Property("IceDiscovery\\.Locator\\.ACM\\.Close", false, null),
-    new Property("IceDiscovery\\.Locator\\.ACM", false, null),
-    new Property("IceDiscovery\\.Locator\\.AdapterId", false, null),
-    new Property("IceDiscovery\\.Locator\\.Connection\\.CloseTimeout", false, null),
-    new Property("IceDiscovery\\.Locator\\.Connection\\.ConnectTimeout", false, null),
-    new Property("IceDiscovery\\.Locator\\.Connection\\.EnableIdleCheck", false, null),
-    new Property("IceDiscovery\\.Locator\\.Connection\\.IdleTimeout", false, null),
-    new Property("IceDiscovery\\.Locator\\.Connection\\.InactivityTimeout", false, null),
-    new Property("IceDiscovery\\.Locator\\.Connection", false, null),
-    new Property("IceDiscovery\\.Locator\\.Endpoints", false, null),
-    new Property("IceDiscovery\\.Locator\\.Locator\\.EndpointSelection", false, null),
-    new Property("IceDiscovery\\.Locator\\.Locator\\.ConnectionCached", false, null),
-    new Property("IceDiscovery\\.Locator\\.Locator\\.PreferSecure", false, null),
-    new Property("IceDiscovery\\.Locator\\.Locator\\.LocatorCacheTimeout", false, null),
-    new Property("IceDiscovery\\.Locator\\.Locator\\.InvocationTimeout", false, null),
-    new Property("IceDiscovery\\.Locator\\.Locator\\.Locator", false, null),
-    new Property("IceDiscovery\\.Locator\\.Locator\\.Router", false, null),
-    new Property("IceDiscovery\\.Locator\\.Locator\\.CollocationOptimized", false, null),
-    new Property("IceDiscovery\\.Locator\\.Locator\\.Context\\.[^\\s]+", false, null),
-    new Property("IceDiscovery\\.Locator\\.Locator", false, null),
-    new Property("IceDiscovery\\.Locator\\.PublishedEndpoints", false, null),
-    new Property("IceDiscovery\\.Locator\\.ReplicaGroupId", false, null),
-    new Property("IceDiscovery\\.Locator\\.Router\\.EndpointSelection", false, null),
-    new Property("IceDiscovery\\.Locator\\.Router\\.ConnectionCached", false, null),
-    new Property("IceDiscovery\\.Locator\\.Router\\.PreferSecure", false, null),
-    new Property("IceDiscovery\\.Locator\\.Router\\.LocatorCacheTimeout", false, null),
-    new Property("IceDiscovery\\.Locator\\.Router\\.InvocationTimeout", false, null),
-    new Property("IceDiscovery\\.Locator\\.Router\\.Locator", false, null),
-    new Property("IceDiscovery\\.Locator\\.Router\\.Router", false, null),
-    new Property("IceDiscovery\\.Locator\\.Router\\.CollocationOptimized", false, null),
-    new Property("IceDiscovery\\.Locator\\.Router\\.Context\\.[^\\s]+", false, null),
-    new Property("IceDiscovery\\.Locator\\.Router", false, null),
-    new Property("IceDiscovery\\.Locator\\.ProxyOptions", false, null),
-    new Property("IceDiscovery\\.Locator\\.ThreadPool\\.Size", false, null),
-    new Property("IceDiscovery\\.Locator\\.ThreadPool\\.SizeMax", false, null),
-    new Property("IceDiscovery\\.Locator\\.ThreadPool\\.SizeWarn", false, null),
-    new Property("IceDiscovery\\.Locator\\.ThreadPool\\.StackSize", false, null),
-    new Property("IceDiscovery\\.Locator\\.ThreadPool\\.Serialize", false, null),
-    new Property("IceDiscovery\\.Locator\\.ThreadPool\\.ThreadIdleTime", false, null),
-    new Property("IceDiscovery\\.Locator\\.ThreadPool\\.ThreadPriority", false, null),
-    new Property("IceDiscovery\\.Locator\\.MessageSizeMax", false, null),
-    new Property("IceDiscovery\\.Lookup", false, null),
-    new Property("IceDiscovery\\.Timeout", false, null),
-    new Property("IceDiscovery\\.RetryCount", false, null),
-    new Property("IceDiscovery\\.LatencyMultiplier", false, null),
-    new Property("IceDiscovery\\.Address", false, null),
-    new Property("IceDiscovery\\.Port", false, null),
-    new Property("IceDiscovery\\.Interface", false, null),
-    new Property("IceDiscovery\\.DomainId", false, null),
+    new Property("IceDiscovery\\.Multicast\\.ACM\\.Timeout", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.ACM\\.Heartbeat", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.ACM\\.Close", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.ACM", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.AdapterId", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.Connection\\.CloseTimeout", "10", false, null),
+    new Property("IceDiscovery\\.Multicast\\.Connection\\.ConnectTimeout", "10", false, null),
+    new Property("IceDiscovery\\.Multicast\\.Connection\\.EnableIdleCheck", "1", false, null),
+    new Property("IceDiscovery\\.Multicast\\.Connection\\.IdleTimeout", "60", false, null),
+    new Property("IceDiscovery\\.Multicast\\.Connection\\.InactivityTimeout", "300", false, null),
+    new Property("IceDiscovery\\.Multicast\\.Connection", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.Endpoints", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.Locator\\.EndpointSelection", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.Locator\\.ConnectionCached", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.Locator\\.PreferSecure", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.Locator\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.Locator\\.InvocationTimeout", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.Locator\\.Locator", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.Locator\\.Router", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.Locator\\.CollocationOptimized", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.Locator\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.Locator", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.PublishedEndpoints", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.ReplicaGroupId", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.Router\\.EndpointSelection", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.Router\\.ConnectionCached", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.Router\\.PreferSecure", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.Router\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.Router\\.InvocationTimeout", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.Router\\.Locator", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.Router\\.Router", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.Router\\.CollocationOptimized", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.Router\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.Router", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.ProxyOptions", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.ThreadPool\\.Size", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.ThreadPool\\.SizeMax", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.ThreadPool\\.SizeWarn", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.ThreadPool\\.StackSize", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.ThreadPool\\.Serialize", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.ThreadPool\\.ThreadIdleTime", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.ThreadPool\\.ThreadPriority", "", false, null),
+    new Property("IceDiscovery\\.Multicast\\.MessageSizeMax", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.ACM\\.Timeout", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.ACM\\.Heartbeat", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.ACM\\.Close", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.ACM", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.AdapterId", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.Connection\\.CloseTimeout", "10", false, null),
+    new Property("IceDiscovery\\.Reply\\.Connection\\.ConnectTimeout", "10", false, null),
+    new Property("IceDiscovery\\.Reply\\.Connection\\.EnableIdleCheck", "1", false, null),
+    new Property("IceDiscovery\\.Reply\\.Connection\\.IdleTimeout", "60", false, null),
+    new Property("IceDiscovery\\.Reply\\.Connection\\.InactivityTimeout", "300", false, null),
+    new Property("IceDiscovery\\.Reply\\.Connection", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.Endpoints", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.Locator\\.EndpointSelection", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.Locator\\.ConnectionCached", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.Locator\\.PreferSecure", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.Locator\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.Locator\\.InvocationTimeout", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.Locator\\.Locator", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.Locator\\.Router", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.Locator\\.CollocationOptimized", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.Locator\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.Locator", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.PublishedEndpoints", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.ReplicaGroupId", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.Router\\.EndpointSelection", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.Router\\.ConnectionCached", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.Router\\.PreferSecure", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.Router\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.Router\\.InvocationTimeout", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.Router\\.Locator", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.Router\\.Router", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.Router\\.CollocationOptimized", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.Router\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.Router", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.ProxyOptions", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.ThreadPool\\.Size", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.ThreadPool\\.SizeMax", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.ThreadPool\\.SizeWarn", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.ThreadPool\\.StackSize", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.ThreadPool\\.Serialize", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.ThreadPool\\.ThreadIdleTime", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.ThreadPool\\.ThreadPriority", "", false, null),
+    new Property("IceDiscovery\\.Reply\\.MessageSizeMax", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.ACM\\.Timeout", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.ACM\\.Heartbeat", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.ACM\\.Close", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.ACM", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.AdapterId", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.Connection\\.CloseTimeout", "10", false, null),
+    new Property("IceDiscovery\\.Locator\\.Connection\\.ConnectTimeout", "10", false, null),
+    new Property("IceDiscovery\\.Locator\\.Connection\\.EnableIdleCheck", "1", false, null),
+    new Property("IceDiscovery\\.Locator\\.Connection\\.IdleTimeout", "60", false, null),
+    new Property("IceDiscovery\\.Locator\\.Connection\\.InactivityTimeout", "300", false, null),
+    new Property("IceDiscovery\\.Locator\\.Connection", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.Endpoints", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.Locator\\.EndpointSelection", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.Locator\\.ConnectionCached", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.Locator\\.PreferSecure", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.Locator\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.Locator\\.InvocationTimeout", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.Locator\\.Locator", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.Locator\\.Router", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.Locator\\.CollocationOptimized", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.Locator\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.Locator", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.PublishedEndpoints", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.ReplicaGroupId", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.Router\\.EndpointSelection", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.Router\\.ConnectionCached", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.Router\\.PreferSecure", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.Router\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.Router\\.InvocationTimeout", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.Router\\.Locator", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.Router\\.Router", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.Router\\.CollocationOptimized", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.Router\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.Router", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.ProxyOptions", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.ThreadPool\\.Size", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.ThreadPool\\.SizeMax", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.ThreadPool\\.SizeWarn", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.ThreadPool\\.StackSize", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.ThreadPool\\.Serialize", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.ThreadPool\\.ThreadIdleTime", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.ThreadPool\\.ThreadPriority", "", false, null),
+    new Property("IceDiscovery\\.Locator\\.MessageSizeMax", "", false, null),
+    new Property("IceDiscovery\\.Lookup", "", false, null),
+    new Property("IceDiscovery\\.Timeout", "", false, null),
+    new Property("IceDiscovery\\.RetryCount", "", false, null),
+    new Property("IceDiscovery\\.LatencyMultiplier", "", false, null),
+    new Property("IceDiscovery\\.Address", "", false, null),
+    new Property("IceDiscovery\\.Port", "", false, null),
+    new Property("IceDiscovery\\.Interface", "", false, null),
+    new Property("IceDiscovery\\.DomainId", "", false, null),
     null
   };
 
   public static final Property IceLocatorDiscoveryProps[] = {
-    new Property("IceLocatorDiscovery\\.Reply\\.ACM\\.Timeout", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.ACM\\.Heartbeat", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.ACM\\.Close", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.ACM", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.AdapterId", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.Connection\\.CloseTimeout", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.Connection\\.ConnectTimeout", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.Connection\\.EnableIdleCheck", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.Connection\\.IdleTimeout", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.Connection\\.InactivityTimeout", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.Connection", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.Endpoints", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.Locator\\.EndpointSelection", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.Locator\\.ConnectionCached", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.Locator\\.PreferSecure", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.Locator\\.LocatorCacheTimeout", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.Locator\\.InvocationTimeout", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.Locator\\.Locator", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.Locator\\.Router", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.Locator\\.CollocationOptimized", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.Locator\\.Context\\.[^\\s]+", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.Locator", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.PublishedEndpoints", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.ReplicaGroupId", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.Router\\.EndpointSelection", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.Router\\.ConnectionCached", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.Router\\.PreferSecure", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.Router\\.LocatorCacheTimeout", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.Router\\.InvocationTimeout", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.Router\\.Locator", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.Router\\.Router", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.Router\\.CollocationOptimized", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.Router\\.Context\\.[^\\s]+", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.Router", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.ProxyOptions", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.ThreadPool\\.Size", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.ThreadPool\\.SizeMax", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.ThreadPool\\.SizeWarn", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.ThreadPool\\.StackSize", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.ThreadPool\\.Serialize", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.ThreadPool\\.ThreadIdleTime", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.ThreadPool\\.ThreadPriority", false, null),
-    new Property("IceLocatorDiscovery\\.Reply\\.MessageSizeMax", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.ACM\\.Timeout", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.ACM\\.Heartbeat", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.ACM\\.Close", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.ACM", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.AdapterId", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.Connection\\.CloseTimeout", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.Connection\\.ConnectTimeout", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.Connection\\.EnableIdleCheck", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.Connection\\.IdleTimeout", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.Connection\\.InactivityTimeout", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.Connection", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.Endpoints", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.Locator\\.EndpointSelection", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.Locator\\.ConnectionCached", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.Locator\\.PreferSecure", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.Locator\\.LocatorCacheTimeout", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.Locator\\.InvocationTimeout", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.Locator\\.Locator", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.Locator\\.Router", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.Locator\\.CollocationOptimized", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.Locator\\.Context\\.[^\\s]+", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.Locator", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.PublishedEndpoints", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.ReplicaGroupId", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.Router\\.EndpointSelection", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.Router\\.ConnectionCached", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.Router\\.PreferSecure", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.Router\\.LocatorCacheTimeout", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.Router\\.InvocationTimeout", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.Router\\.Locator", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.Router\\.Router", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.Router\\.CollocationOptimized", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.Router\\.Context\\.[^\\s]+", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.Router", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.ProxyOptions", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.ThreadPool\\.Size", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.ThreadPool\\.SizeMax", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.ThreadPool\\.SizeWarn", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.ThreadPool\\.StackSize", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.ThreadPool\\.Serialize", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.ThreadPool\\.ThreadIdleTime", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.ThreadPool\\.ThreadPriority", false, null),
-    new Property("IceLocatorDiscovery\\.Locator\\.MessageSizeMax", false, null),
-    new Property("IceLocatorDiscovery\\.Lookup", false, null),
-    new Property("IceLocatorDiscovery\\.Timeout", false, null),
-    new Property("IceLocatorDiscovery\\.RetryCount", false, null),
-    new Property("IceLocatorDiscovery\\.RetryDelay", false, null),
-    new Property("IceLocatorDiscovery\\.Address", false, null),
-    new Property("IceLocatorDiscovery\\.Port", false, null),
-    new Property("IceLocatorDiscovery\\.Interface", false, null),
-    new Property("IceLocatorDiscovery\\.InstanceName", false, null),
-    new Property("IceLocatorDiscovery\\.Trace\\.Lookup", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.ACM\\.Timeout", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.ACM\\.Heartbeat", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.ACM\\.Close", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.ACM", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.AdapterId", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.Connection\\.CloseTimeout", "10", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.Connection\\.ConnectTimeout", "10", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.Connection\\.EnableIdleCheck", "1", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.Connection\\.IdleTimeout", "60", false, null),
+    new Property(
+        "IceLocatorDiscovery\\.Reply\\.Connection\\.InactivityTimeout", "300", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.Connection", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.Endpoints", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.Locator\\.EndpointSelection", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.Locator\\.ConnectionCached", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.Locator\\.PreferSecure", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.Locator\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.Locator\\.InvocationTimeout", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.Locator\\.Locator", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.Locator\\.Router", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.Locator\\.CollocationOptimized", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.Locator\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.Locator", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.PublishedEndpoints", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.ReplicaGroupId", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.Router\\.EndpointSelection", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.Router\\.ConnectionCached", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.Router\\.PreferSecure", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.Router\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.Router\\.InvocationTimeout", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.Router\\.Locator", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.Router\\.Router", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.Router\\.CollocationOptimized", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.Router\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.Router", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.ProxyOptions", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.ThreadPool\\.Size", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.ThreadPool\\.SizeMax", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.ThreadPool\\.SizeWarn", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.ThreadPool\\.StackSize", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.ThreadPool\\.Serialize", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.ThreadPool\\.ThreadIdleTime", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.ThreadPool\\.ThreadPriority", "", false, null),
+    new Property("IceLocatorDiscovery\\.Reply\\.MessageSizeMax", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.ACM\\.Timeout", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.ACM\\.Heartbeat", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.ACM\\.Close", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.ACM", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.AdapterId", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.Connection\\.CloseTimeout", "10", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.Connection\\.ConnectTimeout", "10", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.Connection\\.EnableIdleCheck", "1", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.Connection\\.IdleTimeout", "60", false, null),
+    new Property(
+        "IceLocatorDiscovery\\.Locator\\.Connection\\.InactivityTimeout", "300", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.Connection", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.Endpoints", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.Locator\\.EndpointSelection", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.Locator\\.ConnectionCached", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.Locator\\.PreferSecure", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.Locator\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.Locator\\.InvocationTimeout", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.Locator\\.Locator", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.Locator\\.Router", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.Locator\\.CollocationOptimized", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.Locator\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.Locator", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.PublishedEndpoints", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.ReplicaGroupId", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.Router\\.EndpointSelection", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.Router\\.ConnectionCached", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.Router\\.PreferSecure", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.Router\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.Router\\.InvocationTimeout", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.Router\\.Locator", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.Router\\.Router", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.Router\\.CollocationOptimized", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.Router\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.Router", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.ProxyOptions", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.ThreadPool\\.Size", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.ThreadPool\\.SizeMax", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.ThreadPool\\.SizeWarn", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.ThreadPool\\.StackSize", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.ThreadPool\\.Serialize", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.ThreadPool\\.ThreadIdleTime", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.ThreadPool\\.ThreadPriority", "", false, null),
+    new Property("IceLocatorDiscovery\\.Locator\\.MessageSizeMax", "", false, null),
+    new Property("IceLocatorDiscovery\\.Lookup", "", false, null),
+    new Property("IceLocatorDiscovery\\.Timeout", "", false, null),
+    new Property("IceLocatorDiscovery\\.RetryCount", "", false, null),
+    new Property("IceLocatorDiscovery\\.RetryDelay", "", false, null),
+    new Property("IceLocatorDiscovery\\.Address", "", false, null),
+    new Property("IceLocatorDiscovery\\.Port", "", false, null),
+    new Property("IceLocatorDiscovery\\.Interface", "", false, null),
+    new Property("IceLocatorDiscovery\\.InstanceName", "", false, null),
+    new Property("IceLocatorDiscovery\\.Trace\\.Lookup", "", false, null),
     null
   };
 
   public static final Property IceBoxProps[] = {
-    new Property("IceBox\\.InheritProperties", false, null),
-    new Property("IceBox\\.InstanceName", true, null),
-    new Property("IceBox\\.LoadOrder", false, null),
-    new Property("IceBox\\.PrintServicesReady", false, null),
-    new Property("IceBox\\.Service\\.[^\\s]+", false, null),
-    new Property("IceBox\\.ServiceManager\\.AdapterId", true, null),
-    new Property("IceBox\\.ServiceManager\\.Endpoints", true, null),
-    new Property("IceBox\\.ServiceManager\\.Locator", true, null),
-    new Property("IceBox\\.ServiceManager\\.PublishedEndpoints", true, null),
-    new Property("IceBox\\.ServiceManager\\.ReplicaGroupId", true, null),
-    new Property("IceBox\\.ServiceManager\\.Router", true, null),
-    new Property("IceBox\\.ServiceManager\\.ThreadPool\\.Size", true, null),
-    new Property("IceBox\\.ServiceManager\\.ThreadPool\\.SizeMax", true, null),
-    new Property("IceBox\\.ServiceManager\\.ThreadPool\\.SizeWarn", true, null),
-    new Property("IceBox\\.ServiceManager\\.ThreadPool\\.StackSize", true, null),
-    new Property("IceBox\\.Trace\\.ServiceObserver", false, null),
-    new Property("IceBox\\.UseSharedCommunicator\\.[^\\s]+", false, null),
+    new Property("IceBox\\.InheritProperties", "", false, null),
+    new Property("IceBox\\.InstanceName", "", true, null),
+    new Property("IceBox\\.LoadOrder", "", false, null),
+    new Property("IceBox\\.PrintServicesReady", "", false, null),
+    new Property("IceBox\\.Service\\.[^\\s]+", "", false, null),
+    new Property("IceBox\\.ServiceManager\\.AdapterId", "", true, null),
+    new Property("IceBox\\.ServiceManager\\.Endpoints", "", true, null),
+    new Property("IceBox\\.ServiceManager\\.Locator", "", true, null),
+    new Property("IceBox\\.ServiceManager\\.PublishedEndpoints", "", true, null),
+    new Property("IceBox\\.ServiceManager\\.ReplicaGroupId", "", true, null),
+    new Property("IceBox\\.ServiceManager\\.Router", "", true, null),
+    new Property("IceBox\\.ServiceManager\\.ThreadPool\\.Size", "", true, null),
+    new Property("IceBox\\.ServiceManager\\.ThreadPool\\.SizeMax", "", true, null),
+    new Property("IceBox\\.ServiceManager\\.ThreadPool\\.SizeWarn", "", true, null),
+    new Property("IceBox\\.ServiceManager\\.ThreadPool\\.StackSize", "", true, null),
+    new Property("IceBox\\.Trace\\.ServiceObserver", "", false, null),
+    new Property("IceBox\\.UseSharedCommunicator\\.[^\\s]+", "", false, null),
     null
   };
 
   public static final Property IceBoxAdminProps[] = {
-    new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.EndpointSelection", false, null),
-    new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.ConnectionCached", false, null),
-    new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.PreferSecure", false, null),
-    new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.LocatorCacheTimeout", false, null),
-    new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.InvocationTimeout", false, null),
-    new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.Locator", false, null),
-    new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.Router", false, null),
-    new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.CollocationOptimized", false, null),
-    new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.Context\\.[^\\s]+", false, null),
-    new Property("IceBoxAdmin\\.ServiceManager\\.Proxy", false, null),
+    new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.EndpointSelection", "", false, null),
+    new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.ConnectionCached", "", false, null),
+    new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.PreferSecure", "", false, null),
+    new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.InvocationTimeout", "", false, null),
+    new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.Locator", "", false, null),
+    new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.Router", "", false, null),
+    new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.CollocationOptimized", "", false, null),
+    new Property("IceBoxAdmin\\.ServiceManager\\.Proxy\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceBoxAdmin\\.ServiceManager\\.Proxy", "", false, null),
     null
   };
 
   public static final Property IceBridgeProps[] = {
-    new Property("IceBridge\\.Source\\.ACM\\.Timeout", false, null),
-    new Property("IceBridge\\.Source\\.ACM\\.Heartbeat", false, null),
-    new Property("IceBridge\\.Source\\.ACM\\.Close", false, null),
-    new Property("IceBridge\\.Source\\.ACM", false, null),
-    new Property("IceBridge\\.Source\\.AdapterId", false, null),
-    new Property("IceBridge\\.Source\\.Connection\\.CloseTimeout", false, null),
-    new Property("IceBridge\\.Source\\.Connection\\.ConnectTimeout", false, null),
-    new Property("IceBridge\\.Source\\.Connection\\.EnableIdleCheck", false, null),
-    new Property("IceBridge\\.Source\\.Connection\\.IdleTimeout", false, null),
-    new Property("IceBridge\\.Source\\.Connection\\.InactivityTimeout", false, null),
-    new Property("IceBridge\\.Source\\.Connection", false, null),
-    new Property("IceBridge\\.Source\\.Endpoints", false, null),
-    new Property("IceBridge\\.Source\\.Locator\\.EndpointSelection", false, null),
-    new Property("IceBridge\\.Source\\.Locator\\.ConnectionCached", false, null),
-    new Property("IceBridge\\.Source\\.Locator\\.PreferSecure", false, null),
-    new Property("IceBridge\\.Source\\.Locator\\.LocatorCacheTimeout", false, null),
-    new Property("IceBridge\\.Source\\.Locator\\.InvocationTimeout", false, null),
-    new Property("IceBridge\\.Source\\.Locator\\.Locator", false, null),
-    new Property("IceBridge\\.Source\\.Locator\\.Router", false, null),
-    new Property("IceBridge\\.Source\\.Locator\\.CollocationOptimized", false, null),
-    new Property("IceBridge\\.Source\\.Locator\\.Context\\.[^\\s]+", false, null),
-    new Property("IceBridge\\.Source\\.Locator", false, null),
-    new Property("IceBridge\\.Source\\.PublishedEndpoints", false, null),
-    new Property("IceBridge\\.Source\\.ReplicaGroupId", false, null),
-    new Property("IceBridge\\.Source\\.Router\\.EndpointSelection", false, null),
-    new Property("IceBridge\\.Source\\.Router\\.ConnectionCached", false, null),
-    new Property("IceBridge\\.Source\\.Router\\.PreferSecure", false, null),
-    new Property("IceBridge\\.Source\\.Router\\.LocatorCacheTimeout", false, null),
-    new Property("IceBridge\\.Source\\.Router\\.InvocationTimeout", false, null),
-    new Property("IceBridge\\.Source\\.Router\\.Locator", false, null),
-    new Property("IceBridge\\.Source\\.Router\\.Router", false, null),
-    new Property("IceBridge\\.Source\\.Router\\.CollocationOptimized", false, null),
-    new Property("IceBridge\\.Source\\.Router\\.Context\\.[^\\s]+", false, null),
-    new Property("IceBridge\\.Source\\.Router", false, null),
-    new Property("IceBridge\\.Source\\.ProxyOptions", false, null),
-    new Property("IceBridge\\.Source\\.ThreadPool\\.Size", false, null),
-    new Property("IceBridge\\.Source\\.ThreadPool\\.SizeMax", false, null),
-    new Property("IceBridge\\.Source\\.ThreadPool\\.SizeWarn", false, null),
-    new Property("IceBridge\\.Source\\.ThreadPool\\.StackSize", false, null),
-    new Property("IceBridge\\.Source\\.ThreadPool\\.Serialize", false, null),
-    new Property("IceBridge\\.Source\\.ThreadPool\\.ThreadIdleTime", false, null),
-    new Property("IceBridge\\.Source\\.ThreadPool\\.ThreadPriority", false, null),
-    new Property("IceBridge\\.Source\\.MessageSizeMax", false, null),
-    new Property("IceBridge\\.Target\\.Endpoints", false, null),
-    new Property("IceBridge\\.InstanceName", false, null),
+    new Property("IceBridge\\.Source\\.ACM\\.Timeout", "", false, null),
+    new Property("IceBridge\\.Source\\.ACM\\.Heartbeat", "", false, null),
+    new Property("IceBridge\\.Source\\.ACM\\.Close", "", false, null),
+    new Property("IceBridge\\.Source\\.ACM", "", false, null),
+    new Property("IceBridge\\.Source\\.AdapterId", "", false, null),
+    new Property("IceBridge\\.Source\\.Connection\\.CloseTimeout", "10", false, null),
+    new Property("IceBridge\\.Source\\.Connection\\.ConnectTimeout", "10", false, null),
+    new Property("IceBridge\\.Source\\.Connection\\.EnableIdleCheck", "1", false, null),
+    new Property("IceBridge\\.Source\\.Connection\\.IdleTimeout", "60", false, null),
+    new Property("IceBridge\\.Source\\.Connection\\.InactivityTimeout", "300", false, null),
+    new Property("IceBridge\\.Source\\.Connection", "", false, null),
+    new Property("IceBridge\\.Source\\.Endpoints", "", false, null),
+    new Property("IceBridge\\.Source\\.Locator\\.EndpointSelection", "", false, null),
+    new Property("IceBridge\\.Source\\.Locator\\.ConnectionCached", "", false, null),
+    new Property("IceBridge\\.Source\\.Locator\\.PreferSecure", "", false, null),
+    new Property("IceBridge\\.Source\\.Locator\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceBridge\\.Source\\.Locator\\.InvocationTimeout", "", false, null),
+    new Property("IceBridge\\.Source\\.Locator\\.Locator", "", false, null),
+    new Property("IceBridge\\.Source\\.Locator\\.Router", "", false, null),
+    new Property("IceBridge\\.Source\\.Locator\\.CollocationOptimized", "", false, null),
+    new Property("IceBridge\\.Source\\.Locator\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceBridge\\.Source\\.Locator", "", false, null),
+    new Property("IceBridge\\.Source\\.PublishedEndpoints", "", false, null),
+    new Property("IceBridge\\.Source\\.ReplicaGroupId", "", false, null),
+    new Property("IceBridge\\.Source\\.Router\\.EndpointSelection", "", false, null),
+    new Property("IceBridge\\.Source\\.Router\\.ConnectionCached", "", false, null),
+    new Property("IceBridge\\.Source\\.Router\\.PreferSecure", "", false, null),
+    new Property("IceBridge\\.Source\\.Router\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceBridge\\.Source\\.Router\\.InvocationTimeout", "", false, null),
+    new Property("IceBridge\\.Source\\.Router\\.Locator", "", false, null),
+    new Property("IceBridge\\.Source\\.Router\\.Router", "", false, null),
+    new Property("IceBridge\\.Source\\.Router\\.CollocationOptimized", "", false, null),
+    new Property("IceBridge\\.Source\\.Router\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceBridge\\.Source\\.Router", "", false, null),
+    new Property("IceBridge\\.Source\\.ProxyOptions", "", false, null),
+    new Property("IceBridge\\.Source\\.ThreadPool\\.Size", "", false, null),
+    new Property("IceBridge\\.Source\\.ThreadPool\\.SizeMax", "", false, null),
+    new Property("IceBridge\\.Source\\.ThreadPool\\.SizeWarn", "", false, null),
+    new Property("IceBridge\\.Source\\.ThreadPool\\.StackSize", "", false, null),
+    new Property("IceBridge\\.Source\\.ThreadPool\\.Serialize", "", false, null),
+    new Property("IceBridge\\.Source\\.ThreadPool\\.ThreadIdleTime", "", false, null),
+    new Property("IceBridge\\.Source\\.ThreadPool\\.ThreadPriority", "", false, null),
+    new Property("IceBridge\\.Source\\.MessageSizeMax", "", false, null),
+    new Property("IceBridge\\.Target\\.Endpoints", "", false, null),
+    new Property("IceBridge\\.InstanceName", "", false, null),
     null
   };
 
   public static final Property IceGridAdminProps[] = {
-    new Property("IceGridAdmin\\.AuthenticateUsingSSL", false, null),
-    new Property("IceGridAdmin\\.MetricsConfig", false, null),
-    new Property("IceGridAdmin\\.Username", false, null),
-    new Property("IceGridAdmin\\.Password", false, null),
-    new Property("IceGridAdmin\\.Replica", false, null),
-    new Property("IceGridAdmin\\.Host", false, null),
-    new Property("IceGridAdmin\\.Port", false, null),
-    new Property("IceGridAdmin\\.InstanceName", false, null),
-    new Property("IceGridAdmin\\.Server\\.ACM\\.Timeout", false, null),
-    new Property("IceGridAdmin\\.Server\\.ACM\\.Heartbeat", false, null),
-    new Property("IceGridAdmin\\.Server\\.ACM\\.Close", false, null),
-    new Property("IceGridAdmin\\.Server\\.ACM", false, null),
-    new Property("IceGridAdmin\\.Server\\.AdapterId", false, null),
-    new Property("IceGridAdmin\\.Server\\.Connection\\.CloseTimeout", false, null),
-    new Property("IceGridAdmin\\.Server\\.Connection\\.ConnectTimeout", false, null),
-    new Property("IceGridAdmin\\.Server\\.Connection\\.EnableIdleCheck", false, null),
-    new Property("IceGridAdmin\\.Server\\.Connection\\.IdleTimeout", false, null),
-    new Property("IceGridAdmin\\.Server\\.Connection\\.InactivityTimeout", false, null),
-    new Property("IceGridAdmin\\.Server\\.Connection", false, null),
-    new Property("IceGridAdmin\\.Server\\.Endpoints", false, null),
-    new Property("IceGridAdmin\\.Server\\.Locator\\.EndpointSelection", false, null),
-    new Property("IceGridAdmin\\.Server\\.Locator\\.ConnectionCached", false, null),
-    new Property("IceGridAdmin\\.Server\\.Locator\\.PreferSecure", false, null),
-    new Property("IceGridAdmin\\.Server\\.Locator\\.LocatorCacheTimeout", false, null),
-    new Property("IceGridAdmin\\.Server\\.Locator\\.InvocationTimeout", false, null),
-    new Property("IceGridAdmin\\.Server\\.Locator\\.Locator", false, null),
-    new Property("IceGridAdmin\\.Server\\.Locator\\.Router", false, null),
-    new Property("IceGridAdmin\\.Server\\.Locator\\.CollocationOptimized", false, null),
-    new Property("IceGridAdmin\\.Server\\.Locator\\.Context\\.[^\\s]+", false, null),
-    new Property("IceGridAdmin\\.Server\\.Locator", false, null),
-    new Property("IceGridAdmin\\.Server\\.PublishedEndpoints", false, null),
-    new Property("IceGridAdmin\\.Server\\.ReplicaGroupId", false, null),
-    new Property("IceGridAdmin\\.Server\\.Router\\.EndpointSelection", false, null),
-    new Property("IceGridAdmin\\.Server\\.Router\\.ConnectionCached", false, null),
-    new Property("IceGridAdmin\\.Server\\.Router\\.PreferSecure", false, null),
-    new Property("IceGridAdmin\\.Server\\.Router\\.LocatorCacheTimeout", false, null),
-    new Property("IceGridAdmin\\.Server\\.Router\\.InvocationTimeout", false, null),
-    new Property("IceGridAdmin\\.Server\\.Router\\.Locator", false, null),
-    new Property("IceGridAdmin\\.Server\\.Router\\.Router", false, null),
-    new Property("IceGridAdmin\\.Server\\.Router\\.CollocationOptimized", false, null),
-    new Property("IceGridAdmin\\.Server\\.Router\\.Context\\.[^\\s]+", false, null),
-    new Property("IceGridAdmin\\.Server\\.Router", false, null),
-    new Property("IceGridAdmin\\.Server\\.ProxyOptions", false, null),
-    new Property("IceGridAdmin\\.Server\\.ThreadPool\\.Size", false, null),
-    new Property("IceGridAdmin\\.Server\\.ThreadPool\\.SizeMax", false, null),
-    new Property("IceGridAdmin\\.Server\\.ThreadPool\\.SizeWarn", false, null),
-    new Property("IceGridAdmin\\.Server\\.ThreadPool\\.StackSize", false, null),
-    new Property("IceGridAdmin\\.Server\\.ThreadPool\\.Serialize", false, null),
-    new Property("IceGridAdmin\\.Server\\.ThreadPool\\.ThreadIdleTime", false, null),
-    new Property("IceGridAdmin\\.Server\\.ThreadPool\\.ThreadPriority", false, null),
-    new Property("IceGridAdmin\\.Server\\.MessageSizeMax", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Address", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Interface", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Lookup", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.ACM\\.Timeout", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.ACM\\.Heartbeat", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.ACM\\.Close", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.ACM", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.AdapterId", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Connection\\.CloseTimeout", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Connection\\.ConnectTimeout", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Connection\\.EnableIdleCheck", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Connection\\.IdleTimeout", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Connection\\.InactivityTimeout", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Connection", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Endpoints", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Locator\\.EndpointSelection", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Locator\\.ConnectionCached", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Locator\\.PreferSecure", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Locator\\.LocatorCacheTimeout", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Locator\\.InvocationTimeout", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Locator\\.Locator", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Locator\\.Router", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Locator\\.CollocationOptimized", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Locator\\.Context\\.[^\\s]+", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Locator", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.PublishedEndpoints", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.ReplicaGroupId", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Router\\.EndpointSelection", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Router\\.ConnectionCached", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Router\\.PreferSecure", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Router\\.LocatorCacheTimeout", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Router\\.InvocationTimeout", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Router\\.Locator", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Router\\.Router", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Router\\.CollocationOptimized", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Router\\.Context\\.[^\\s]+", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Router", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.ProxyOptions", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.ThreadPool\\.Size", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.ThreadPool\\.SizeMax", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.ThreadPool\\.SizeWarn", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.ThreadPool\\.StackSize", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.ThreadPool\\.Serialize", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.ThreadPool\\.ThreadIdleTime", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.ThreadPool\\.ThreadPriority", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Reply\\.MessageSizeMax", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.ACM\\.Timeout", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.ACM\\.Heartbeat", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.ACM\\.Close", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.ACM", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.AdapterId", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Connection\\.CloseTimeout", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Connection\\.ConnectTimeout", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Connection\\.EnableIdleCheck", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Connection\\.IdleTimeout", false, null),
-    new Property(
-        "IceGridAdmin\\.Discovery\\.Locator\\.Connection\\.InactivityTimeout", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Connection", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Endpoints", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Locator\\.EndpointSelection", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Locator\\.ConnectionCached", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Locator\\.PreferSecure", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Locator\\.LocatorCacheTimeout", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Locator\\.InvocationTimeout", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Locator\\.Locator", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Locator\\.Router", false, null),
-    new Property(
-        "IceGridAdmin\\.Discovery\\.Locator\\.Locator\\.CollocationOptimized", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Locator\\.Context\\.[^\\s]+", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Locator", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.PublishedEndpoints", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.ReplicaGroupId", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Router\\.EndpointSelection", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Router\\.ConnectionCached", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Router\\.PreferSecure", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Router\\.LocatorCacheTimeout", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Router\\.InvocationTimeout", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Router\\.Locator", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Router\\.Router", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Router\\.CollocationOptimized", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Router\\.Context\\.[^\\s]+", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Router", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.ProxyOptions", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.ThreadPool\\.Size", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.ThreadPool\\.SizeMax", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.ThreadPool\\.SizeWarn", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.ThreadPool\\.StackSize", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.ThreadPool\\.Serialize", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.ThreadPool\\.ThreadIdleTime", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.ThreadPool\\.ThreadPriority", false, null),
-    new Property("IceGridAdmin\\.Discovery\\.Locator\\.MessageSizeMax", false, null),
-    new Property("IceGridAdmin\\.Trace\\.Observers", false, null),
-    new Property("IceGridAdmin\\.Trace\\.SaveToRegistry", false, null),
+    new Property("IceGridAdmin\\.AuthenticateUsingSSL", "", false, null),
+    new Property("IceGridAdmin\\.MetricsConfig", "", false, null),
+    new Property("IceGridAdmin\\.Username", "", false, null),
+    new Property("IceGridAdmin\\.Password", "", false, null),
+    new Property("IceGridAdmin\\.Replica", "", false, null),
+    new Property("IceGridAdmin\\.Host", "", false, null),
+    new Property("IceGridAdmin\\.Port", "", false, null),
+    new Property("IceGridAdmin\\.InstanceName", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.ACM\\.Timeout", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.ACM\\.Heartbeat", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.ACM\\.Close", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.ACM", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.AdapterId", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.Connection\\.CloseTimeout", "10", false, null),
+    new Property("IceGridAdmin\\.Server\\.Connection\\.ConnectTimeout", "10", false, null),
+    new Property("IceGridAdmin\\.Server\\.Connection\\.EnableIdleCheck", "1", false, null),
+    new Property("IceGridAdmin\\.Server\\.Connection\\.IdleTimeout", "60", false, null),
+    new Property("IceGridAdmin\\.Server\\.Connection\\.InactivityTimeout", "300", false, null),
+    new Property("IceGridAdmin\\.Server\\.Connection", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.Endpoints", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.Locator\\.EndpointSelection", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.Locator\\.ConnectionCached", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.Locator\\.PreferSecure", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.Locator\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.Locator\\.InvocationTimeout", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.Locator\\.Locator", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.Locator\\.Router", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.Locator\\.CollocationOptimized", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.Locator\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.Locator", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.PublishedEndpoints", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.ReplicaGroupId", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.Router\\.EndpointSelection", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.Router\\.ConnectionCached", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.Router\\.PreferSecure", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.Router\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.Router\\.InvocationTimeout", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.Router\\.Locator", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.Router\\.Router", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.Router\\.CollocationOptimized", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.Router\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.Router", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.ProxyOptions", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.ThreadPool\\.Size", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.ThreadPool\\.SizeMax", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.ThreadPool\\.SizeWarn", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.ThreadPool\\.StackSize", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.ThreadPool\\.Serialize", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.ThreadPool\\.ThreadIdleTime", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.ThreadPool\\.ThreadPriority", "", false, null),
+    new Property("IceGridAdmin\\.Server\\.MessageSizeMax", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Address", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Interface", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Lookup", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.ACM\\.Timeout", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.ACM\\.Heartbeat", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.ACM\\.Close", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.ACM", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.AdapterId", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Connection\\.CloseTimeout", "10", false, null),
+    new Property(
+        "IceGridAdmin\\.Discovery\\.Reply\\.Connection\\.ConnectTimeout", "10", false, null),
+    new Property(
+        "IceGridAdmin\\.Discovery\\.Reply\\.Connection\\.EnableIdleCheck", "1", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Connection\\.IdleTimeout", "60", false, null),
+    new Property(
+        "IceGridAdmin\\.Discovery\\.Reply\\.Connection\\.InactivityTimeout", "300", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Connection", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Endpoints", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Locator\\.EndpointSelection", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Locator\\.ConnectionCached", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Locator\\.PreferSecure", "", false, null),
+    new Property(
+        "IceGridAdmin\\.Discovery\\.Reply\\.Locator\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Locator\\.InvocationTimeout", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Locator\\.Locator", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Locator\\.Router", "", false, null),
+    new Property(
+        "IceGridAdmin\\.Discovery\\.Reply\\.Locator\\.CollocationOptimized", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Locator\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Locator", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.PublishedEndpoints", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.ReplicaGroupId", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Router\\.EndpointSelection", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Router\\.ConnectionCached", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Router\\.PreferSecure", "", false, null),
+    new Property(
+        "IceGridAdmin\\.Discovery\\.Reply\\.Router\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Router\\.InvocationTimeout", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Router\\.Locator", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Router\\.Router", "", false, null),
+    new Property(
+        "IceGridAdmin\\.Discovery\\.Reply\\.Router\\.CollocationOptimized", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Router\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.Router", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.ProxyOptions", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.ThreadPool\\.Size", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.ThreadPool\\.SizeMax", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.ThreadPool\\.SizeWarn", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.ThreadPool\\.StackSize", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.ThreadPool\\.Serialize", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.ThreadPool\\.ThreadIdleTime", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.ThreadPool\\.ThreadPriority", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Reply\\.MessageSizeMax", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Locator\\.ACM\\.Timeout", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Locator\\.ACM\\.Heartbeat", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Locator\\.ACM\\.Close", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Locator\\.ACM", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Locator\\.AdapterId", "", false, null),
+    new Property(
+        "IceGridAdmin\\.Discovery\\.Locator\\.Connection\\.CloseTimeout", "10", false, null),
+    new Property(
+        "IceGridAdmin\\.Discovery\\.Locator\\.Connection\\.ConnectTimeout", "10", false, null),
+    new Property(
+        "IceGridAdmin\\.Discovery\\.Locator\\.Connection\\.EnableIdleCheck", "1", false, null),
+    new Property(
+        "IceGridAdmin\\.Discovery\\.Locator\\.Connection\\.IdleTimeout", "60", false, null),
+    new Property(
+        "IceGridAdmin\\.Discovery\\.Locator\\.Connection\\.InactivityTimeout", "300", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Connection", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Endpoints", "", false, null),
+    new Property(
+        "IceGridAdmin\\.Discovery\\.Locator\\.Locator\\.EndpointSelection", "", false, null),
+    new Property(
+        "IceGridAdmin\\.Discovery\\.Locator\\.Locator\\.ConnectionCached", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Locator\\.PreferSecure", "", false, null),
+    new Property(
+        "IceGridAdmin\\.Discovery\\.Locator\\.Locator\\.LocatorCacheTimeout", "", false, null),
+    new Property(
+        "IceGridAdmin\\.Discovery\\.Locator\\.Locator\\.InvocationTimeout", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Locator\\.Locator", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Locator\\.Router", "", false, null),
+    new Property(
+        "IceGridAdmin\\.Discovery\\.Locator\\.Locator\\.CollocationOptimized", "", false, null),
+    new Property(
+        "IceGridAdmin\\.Discovery\\.Locator\\.Locator\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Locator", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Locator\\.PublishedEndpoints", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Locator\\.ReplicaGroupId", "", false, null),
+    new Property(
+        "IceGridAdmin\\.Discovery\\.Locator\\.Router\\.EndpointSelection", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Router\\.ConnectionCached", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Router\\.PreferSecure", "", false, null),
+    new Property(
+        "IceGridAdmin\\.Discovery\\.Locator\\.Router\\.LocatorCacheTimeout", "", false, null),
+    new Property(
+        "IceGridAdmin\\.Discovery\\.Locator\\.Router\\.InvocationTimeout", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Router\\.Locator", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Router\\.Router", "", false, null),
+    new Property(
+        "IceGridAdmin\\.Discovery\\.Locator\\.Router\\.CollocationOptimized", "", false, null),
+    new Property(
+        "IceGridAdmin\\.Discovery\\.Locator\\.Router\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Locator\\.Router", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Locator\\.ProxyOptions", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Locator\\.ThreadPool\\.Size", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Locator\\.ThreadPool\\.SizeMax", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Locator\\.ThreadPool\\.SizeWarn", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Locator\\.ThreadPool\\.StackSize", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Locator\\.ThreadPool\\.Serialize", "", false, null),
+    new Property(
+        "IceGridAdmin\\.Discovery\\.Locator\\.ThreadPool\\.ThreadIdleTime", "", false, null),
+    new Property(
+        "IceGridAdmin\\.Discovery\\.Locator\\.ThreadPool\\.ThreadPriority", "", false, null),
+    new Property("IceGridAdmin\\.Discovery\\.Locator\\.MessageSizeMax", "", false, null),
+    new Property("IceGridAdmin\\.Trace\\.Observers", "", false, null),
+    new Property("IceGridAdmin\\.Trace\\.SaveToRegistry", "", false, null),
     null
   };
 
   public static final Property IceGridProps[] = {
-    new Property("IceGrid\\.AdminRouter\\.ACM\\.Timeout", false, null),
-    new Property("IceGrid\\.AdminRouter\\.ACM\\.Heartbeat", false, null),
-    new Property("IceGrid\\.AdminRouter\\.ACM\\.Close", false, null),
-    new Property("IceGrid\\.AdminRouter\\.ACM", false, null),
-    new Property("IceGrid\\.AdminRouter\\.AdapterId", false, null),
-    new Property("IceGrid\\.AdminRouter\\.Connection\\.CloseTimeout", false, null),
-    new Property("IceGrid\\.AdminRouter\\.Connection\\.ConnectTimeout", false, null),
-    new Property("IceGrid\\.AdminRouter\\.Connection\\.EnableIdleCheck", false, null),
-    new Property("IceGrid\\.AdminRouter\\.Connection\\.IdleTimeout", false, null),
-    new Property("IceGrid\\.AdminRouter\\.Connection\\.InactivityTimeout", false, null),
-    new Property("IceGrid\\.AdminRouter\\.Connection", false, null),
-    new Property("IceGrid\\.AdminRouter\\.Endpoints", false, null),
-    new Property("IceGrid\\.AdminRouter\\.Locator\\.EndpointSelection", false, null),
-    new Property("IceGrid\\.AdminRouter\\.Locator\\.ConnectionCached", false, null),
-    new Property("IceGrid\\.AdminRouter\\.Locator\\.PreferSecure", false, null),
-    new Property("IceGrid\\.AdminRouter\\.Locator\\.LocatorCacheTimeout", false, null),
-    new Property("IceGrid\\.AdminRouter\\.Locator\\.InvocationTimeout", false, null),
-    new Property("IceGrid\\.AdminRouter\\.Locator\\.Locator", false, null),
-    new Property("IceGrid\\.AdminRouter\\.Locator\\.Router", false, null),
-    new Property("IceGrid\\.AdminRouter\\.Locator\\.CollocationOptimized", false, null),
-    new Property("IceGrid\\.AdminRouter\\.Locator\\.Context\\.[^\\s]+", false, null),
-    new Property("IceGrid\\.AdminRouter\\.Locator", false, null),
-    new Property("IceGrid\\.AdminRouter\\.PublishedEndpoints", false, null),
-    new Property("IceGrid\\.AdminRouter\\.ReplicaGroupId", false, null),
-    new Property("IceGrid\\.AdminRouter\\.Router\\.EndpointSelection", false, null),
-    new Property("IceGrid\\.AdminRouter\\.Router\\.ConnectionCached", false, null),
-    new Property("IceGrid\\.AdminRouter\\.Router\\.PreferSecure", false, null),
-    new Property("IceGrid\\.AdminRouter\\.Router\\.LocatorCacheTimeout", false, null),
-    new Property("IceGrid\\.AdminRouter\\.Router\\.InvocationTimeout", false, null),
-    new Property("IceGrid\\.AdminRouter\\.Router\\.Locator", false, null),
-    new Property("IceGrid\\.AdminRouter\\.Router\\.Router", false, null),
-    new Property("IceGrid\\.AdminRouter\\.Router\\.CollocationOptimized", false, null),
-    new Property("IceGrid\\.AdminRouter\\.Router\\.Context\\.[^\\s]+", false, null),
-    new Property("IceGrid\\.AdminRouter\\.Router", false, null),
-    new Property("IceGrid\\.AdminRouter\\.ProxyOptions", false, null),
-    new Property("IceGrid\\.AdminRouter\\.ThreadPool\\.Size", false, null),
-    new Property("IceGrid\\.AdminRouter\\.ThreadPool\\.SizeMax", false, null),
-    new Property("IceGrid\\.AdminRouter\\.ThreadPool\\.SizeWarn", false, null),
-    new Property("IceGrid\\.AdminRouter\\.ThreadPool\\.StackSize", false, null),
-    new Property("IceGrid\\.AdminRouter\\.ThreadPool\\.Serialize", false, null),
-    new Property("IceGrid\\.AdminRouter\\.ThreadPool\\.ThreadIdleTime", false, null),
-    new Property("IceGrid\\.AdminRouter\\.ThreadPool\\.ThreadPriority", false, null),
-    new Property("IceGrid\\.AdminRouter\\.MessageSizeMax", false, null),
-    new Property("IceGrid\\.InstanceName", false, null),
-    new Property("IceGrid\\.Node\\.ACM\\.Timeout", false, null),
-    new Property("IceGrid\\.Node\\.ACM\\.Heartbeat", false, null),
-    new Property("IceGrid\\.Node\\.ACM\\.Close", false, null),
-    new Property("IceGrid\\.Node\\.ACM", false, null),
-    new Property("IceGrid\\.Node\\.AdapterId", false, null),
-    new Property("IceGrid\\.Node\\.Connection\\.CloseTimeout", false, null),
-    new Property("IceGrid\\.Node\\.Connection\\.ConnectTimeout", false, null),
-    new Property("IceGrid\\.Node\\.Connection\\.EnableIdleCheck", false, null),
-    new Property("IceGrid\\.Node\\.Connection\\.IdleTimeout", false, null),
-    new Property("IceGrid\\.Node\\.Connection\\.InactivityTimeout", false, null),
-    new Property("IceGrid\\.Node\\.Connection", false, null),
-    new Property("IceGrid\\.Node\\.Endpoints", false, null),
-    new Property("IceGrid\\.Node\\.Locator\\.EndpointSelection", false, null),
-    new Property("IceGrid\\.Node\\.Locator\\.ConnectionCached", false, null),
-    new Property("IceGrid\\.Node\\.Locator\\.PreferSecure", false, null),
-    new Property("IceGrid\\.Node\\.Locator\\.LocatorCacheTimeout", false, null),
-    new Property("IceGrid\\.Node\\.Locator\\.InvocationTimeout", false, null),
-    new Property("IceGrid\\.Node\\.Locator\\.Locator", false, null),
-    new Property("IceGrid\\.Node\\.Locator\\.Router", false, null),
-    new Property("IceGrid\\.Node\\.Locator\\.CollocationOptimized", false, null),
-    new Property("IceGrid\\.Node\\.Locator\\.Context\\.[^\\s]+", false, null),
-    new Property("IceGrid\\.Node\\.Locator", false, null),
-    new Property("IceGrid\\.Node\\.PublishedEndpoints", false, null),
-    new Property("IceGrid\\.Node\\.ReplicaGroupId", false, null),
-    new Property("IceGrid\\.Node\\.Router\\.EndpointSelection", false, null),
-    new Property("IceGrid\\.Node\\.Router\\.ConnectionCached", false, null),
-    new Property("IceGrid\\.Node\\.Router\\.PreferSecure", false, null),
-    new Property("IceGrid\\.Node\\.Router\\.LocatorCacheTimeout", false, null),
-    new Property("IceGrid\\.Node\\.Router\\.InvocationTimeout", false, null),
-    new Property("IceGrid\\.Node\\.Router\\.Locator", false, null),
-    new Property("IceGrid\\.Node\\.Router\\.Router", false, null),
-    new Property("IceGrid\\.Node\\.Router\\.CollocationOptimized", false, null),
-    new Property("IceGrid\\.Node\\.Router\\.Context\\.[^\\s]+", false, null),
-    new Property("IceGrid\\.Node\\.Router", false, null),
-    new Property("IceGrid\\.Node\\.ProxyOptions", false, null),
-    new Property("IceGrid\\.Node\\.ThreadPool\\.Size", false, null),
-    new Property("IceGrid\\.Node\\.ThreadPool\\.SizeMax", false, null),
-    new Property("IceGrid\\.Node\\.ThreadPool\\.SizeWarn", false, null),
-    new Property("IceGrid\\.Node\\.ThreadPool\\.StackSize", false, null),
-    new Property("IceGrid\\.Node\\.ThreadPool\\.Serialize", false, null),
-    new Property("IceGrid\\.Node\\.ThreadPool\\.ThreadIdleTime", false, null),
-    new Property("IceGrid\\.Node\\.ThreadPool\\.ThreadPriority", false, null),
-    new Property("IceGrid\\.Node\\.MessageSizeMax", false, null),
-    new Property("IceGrid\\.Node\\.AllowRunningServersAsRoot", false, null),
-    new Property("IceGrid\\.Node\\.AllowEndpointsOverride", false, null),
-    new Property("IceGrid\\.Node\\.CollocateRegistry", false, null),
-    new Property("IceGrid\\.Node\\.Data", false, null),
-    new Property("IceGrid\\.Node\\.DisableOnFailure", false, null),
-    new Property("IceGrid\\.Node\\.Name", false, null),
-    new Property("IceGrid\\.Node\\.Output", false, null),
-    new Property("IceGrid\\.Node\\.ProcessorSocketCount", false, null),
-    new Property("IceGrid\\.Node\\.PrintServersReady", false, null),
-    new Property("IceGrid\\.Node\\.PropertiesOverride", false, null),
-    new Property("IceGrid\\.Node\\.RedirectErrToOut", false, null),
-    new Property("IceGrid\\.Node\\.Trace\\.Activator", false, null),
-    new Property("IceGrid\\.Node\\.Trace\\.Adapter", false, null),
-    new Property("IceGrid\\.Node\\.Trace\\.Admin", false, null),
-    new Property("IceGrid\\.Node\\.Trace\\.Patch", false, null),
-    new Property("IceGrid\\.Node\\.Trace\\.Replica", false, null),
-    new Property("IceGrid\\.Node\\.Trace\\.Server", false, null),
-    new Property("IceGrid\\.Node\\.UserAccounts", false, null),
-    new Property("IceGrid\\.Node\\.UserAccountMapper\\.EndpointSelection", false, null),
-    new Property("IceGrid\\.Node\\.UserAccountMapper\\.ConnectionCached", false, null),
-    new Property("IceGrid\\.Node\\.UserAccountMapper\\.PreferSecure", false, null),
-    new Property("IceGrid\\.Node\\.UserAccountMapper\\.LocatorCacheTimeout", false, null),
-    new Property("IceGrid\\.Node\\.UserAccountMapper\\.InvocationTimeout", false, null),
-    new Property("IceGrid\\.Node\\.UserAccountMapper\\.Locator", false, null),
-    new Property("IceGrid\\.Node\\.UserAccountMapper\\.Router", false, null),
-    new Property("IceGrid\\.Node\\.UserAccountMapper\\.CollocationOptimized", false, null),
-    new Property("IceGrid\\.Node\\.UserAccountMapper\\.Context\\.[^\\s]+", false, null),
-    new Property("IceGrid\\.Node\\.UserAccountMapper", false, null),
-    new Property("IceGrid\\.Node\\.WaitTime", false, null),
-    new Property("IceGrid\\.Registry\\.AdminCryptPasswords", false, null),
-    new Property("IceGrid\\.Registry\\.AdminPermissionsVerifier\\.EndpointSelection", false, null),
-    new Property("IceGrid\\.Registry\\.AdminPermissionsVerifier\\.ConnectionCached", false, null),
-    new Property("IceGrid\\.Registry\\.AdminPermissionsVerifier\\.PreferSecure", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.AdminPermissionsVerifier\\.LocatorCacheTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.AdminPermissionsVerifier\\.InvocationTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.AdminPermissionsVerifier\\.Locator", false, null),
-    new Property("IceGrid\\.Registry\\.AdminPermissionsVerifier\\.Router", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.AdminPermissionsVerifier\\.CollocationOptimized", false, null),
-    new Property("IceGrid\\.Registry\\.AdminPermissionsVerifier\\.Context\\.[^\\s]+", false, null),
-    new Property("IceGrid\\.Registry\\.AdminPermissionsVerifier", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSessionFilters", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.ACM\\.Timeout", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.ACM\\.Heartbeat", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.ACM\\.Close", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.ACM", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.AdapterId", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.AdminSessionManager\\.Connection\\.CloseTimeout", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.AdminSessionManager\\.Connection\\.ConnectTimeout", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.AdminSessionManager\\.Connection\\.EnableIdleCheck", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.AdminSessionManager\\.Connection\\.IdleTimeout", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.AdminSessionManager\\.Connection\\.InactivityTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Connection", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Endpoints", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.AdminSessionManager\\.Locator\\.EndpointSelection", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.AdminSessionManager\\.Locator\\.ConnectionCached", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Locator\\.PreferSecure", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.AdminSessionManager\\.Locator\\.LocatorCacheTimeout", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.AdminSessionManager\\.Locator\\.InvocationTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Locator\\.Locator", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Locator\\.Router", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.AdminSessionManager\\.Locator\\.CollocationOptimized", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.AdminSessionManager\\.Locator\\.Context\\.[^\\s]+", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Locator", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.PublishedEndpoints", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.ReplicaGroupId", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.EndpointSelection", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.ConnectionCached", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.PreferSecure", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.LocatorCacheTimeout", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.InvocationTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.Locator", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.Router", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.CollocationOptimized", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.Context\\.[^\\s]+", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Router", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.ProxyOptions", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.ThreadPool\\.Size", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.ThreadPool\\.SizeMax", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.ThreadPool\\.SizeWarn", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.ThreadPool\\.StackSize", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.ThreadPool\\.Serialize", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.AdminSessionManager\\.ThreadPool\\.ThreadIdleTime", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.AdminSessionManager\\.ThreadPool\\.ThreadPriority", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.MessageSizeMax", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.EndpointSelection", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.ConnectionCached", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.PreferSecure", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.LocatorCacheTimeout", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.InvocationTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.Locator", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.Router", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.CollocationOptimized", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.Context\\.[^\\s]+", false, null),
-    new Property("IceGrid\\.Registry\\.AdminSSLPermissionsVerifier", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.ACM\\.Timeout", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.ACM\\.Heartbeat", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.ACM\\.Close", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.ACM", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.AdapterId", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.Connection\\.CloseTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.Connection\\.ConnectTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.Connection\\.EnableIdleCheck", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.Connection\\.IdleTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.Connection\\.InactivityTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.Connection", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.Endpoints", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.Locator\\.EndpointSelection", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.Locator\\.ConnectionCached", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.Locator\\.PreferSecure", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.Locator\\.LocatorCacheTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.Locator\\.InvocationTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.Locator\\.Locator", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.Locator\\.Router", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.Locator\\.CollocationOptimized", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.Locator\\.Context\\.[^\\s]+", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.Locator", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.PublishedEndpoints", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.ReplicaGroupId", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.Router\\.EndpointSelection", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.Router\\.ConnectionCached", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.Router\\.PreferSecure", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.Router\\.LocatorCacheTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.Router\\.InvocationTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.Router\\.Locator", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.Router\\.Router", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.Router\\.CollocationOptimized", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.Router\\.Context\\.[^\\s]+", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.Router", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.ProxyOptions", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.ThreadPool\\.Size", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.ThreadPool\\.SizeMax", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.ThreadPool\\.SizeWarn", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.ThreadPool\\.StackSize", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.ThreadPool\\.Serialize", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.ThreadPool\\.ThreadIdleTime", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.ThreadPool\\.ThreadPriority", false, null),
-    new Property("IceGrid\\.Registry\\.Client\\.MessageSizeMax", false, null),
-    new Property("IceGrid\\.Registry\\.CryptPasswords", false, null),
-    new Property("IceGrid\\.Registry\\.DefaultTemplates", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.ACM\\.Timeout", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.ACM\\.Heartbeat", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.ACM\\.Close", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.ACM", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.AdapterId", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Connection\\.CloseTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Connection\\.ConnectTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Connection\\.EnableIdleCheck", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Connection\\.IdleTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Connection\\.InactivityTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Connection", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Endpoints", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Locator\\.EndpointSelection", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Locator\\.ConnectionCached", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Locator\\.PreferSecure", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Locator\\.LocatorCacheTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Locator\\.InvocationTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Locator\\.Locator", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Locator\\.Router", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Locator\\.CollocationOptimized", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Locator\\.Context\\.[^\\s]+", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Locator", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.PublishedEndpoints", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.ReplicaGroupId", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Router\\.EndpointSelection", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Router\\.ConnectionCached", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Router\\.PreferSecure", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Router\\.LocatorCacheTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Router\\.InvocationTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Router\\.Locator", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Router\\.Router", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Router\\.CollocationOptimized", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Router\\.Context\\.[^\\s]+", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Router", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.ProxyOptions", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.ThreadPool\\.Size", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.ThreadPool\\.SizeMax", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.ThreadPool\\.SizeWarn", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.ThreadPool\\.StackSize", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.ThreadPool\\.Serialize", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.ThreadPool\\.ThreadIdleTime", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.ThreadPool\\.ThreadPriority", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.MessageSizeMax", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Enabled", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Address", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Port", false, null),
-    new Property("IceGrid\\.Registry\\.Discovery\\.Interface", false, null),
-    new Property("IceGrid\\.Registry\\.DynamicRegistration", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.ACM\\.Timeout", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.ACM\\.Heartbeat", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.ACM\\.Close", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.ACM", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.AdapterId", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.Connection\\.CloseTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.Connection\\.ConnectTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.Connection\\.EnableIdleCheck", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.Connection\\.IdleTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.Connection\\.InactivityTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.Connection", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.Endpoints", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.Locator\\.EndpointSelection", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.Locator\\.ConnectionCached", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.Locator\\.PreferSecure", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.Locator\\.LocatorCacheTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.Locator\\.InvocationTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.Locator\\.Locator", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.Locator\\.Router", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.Locator\\.CollocationOptimized", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.Locator\\.Context\\.[^\\s]+", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.Locator", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.PublishedEndpoints", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.ReplicaGroupId", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.Router\\.EndpointSelection", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.Router\\.ConnectionCached", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.Router\\.PreferSecure", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.Router\\.LocatorCacheTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.Router\\.InvocationTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.Router\\.Locator", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.Router\\.Router", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.Router\\.CollocationOptimized", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.Router\\.Context\\.[^\\s]+", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.Router", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.ProxyOptions", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.ThreadPool\\.Size", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.ThreadPool\\.SizeMax", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.ThreadPool\\.SizeWarn", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.ThreadPool\\.StackSize", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.ThreadPool\\.Serialize", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.ThreadPool\\.ThreadIdleTime", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.ThreadPool\\.ThreadPriority", false, null),
-    new Property("IceGrid\\.Registry\\.Internal\\.MessageSizeMax", false, null),
-    new Property("IceGrid\\.Registry\\.LMDB\\.MapSize", false, null),
-    new Property("IceGrid\\.Registry\\.LMDB\\.Path", false, null),
-    new Property("IceGrid\\.Registry\\.PermissionsVerifier\\.EndpointSelection", false, null),
-    new Property("IceGrid\\.Registry\\.PermissionsVerifier\\.ConnectionCached", false, null),
-    new Property("IceGrid\\.Registry\\.PermissionsVerifier\\.PreferSecure", false, null),
-    new Property("IceGrid\\.Registry\\.PermissionsVerifier\\.LocatorCacheTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.PermissionsVerifier\\.InvocationTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.PermissionsVerifier\\.Locator", false, null),
-    new Property("IceGrid\\.Registry\\.PermissionsVerifier\\.Router", false, null),
-    new Property("IceGrid\\.Registry\\.PermissionsVerifier\\.CollocationOptimized", false, null),
-    new Property("IceGrid\\.Registry\\.PermissionsVerifier\\.Context\\.[^\\s]+", false, null),
-    new Property("IceGrid\\.Registry\\.PermissionsVerifier", false, null),
-    new Property("IceGrid\\.Registry\\.ReplicaName", false, null),
-    new Property("IceGrid\\.Registry\\.RequireNodeCertCN", false, null),
-    new Property("IceGrid\\.Registry\\.RequireReplicaCertCN", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.ACM\\.Timeout", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.ACM\\.Heartbeat", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.ACM\\.Close", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.ACM", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.AdapterId", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.Connection\\.CloseTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.Connection\\.ConnectTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.Connection\\.EnableIdleCheck", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.Connection\\.IdleTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.Connection\\.InactivityTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.Connection", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.Endpoints", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.Locator\\.EndpointSelection", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.Locator\\.ConnectionCached", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.Locator\\.PreferSecure", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.Locator\\.LocatorCacheTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.Locator\\.InvocationTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.Locator\\.Locator", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.Locator\\.Router", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.Locator\\.CollocationOptimized", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.Locator\\.Context\\.[^\\s]+", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.Locator", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.PublishedEndpoints", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.ReplicaGroupId", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.Router\\.EndpointSelection", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.Router\\.ConnectionCached", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.Router\\.PreferSecure", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.Router\\.LocatorCacheTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.Router\\.InvocationTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.Router\\.Locator", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.Router\\.Router", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.Router\\.CollocationOptimized", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.Router\\.Context\\.[^\\s]+", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.Router", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.ProxyOptions", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.ThreadPool\\.Size", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.ThreadPool\\.SizeMax", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.ThreadPool\\.SizeWarn", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.ThreadPool\\.StackSize", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.ThreadPool\\.Serialize", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.ThreadPool\\.ThreadIdleTime", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.ThreadPool\\.ThreadPriority", false, null),
-    new Property("IceGrid\\.Registry\\.Server\\.MessageSizeMax", false, null),
-    new Property("IceGrid\\.Registry\\.SessionFilters", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.ACM\\.Timeout", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.ACM\\.Heartbeat", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.ACM\\.Close", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.ACM", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.AdapterId", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.Connection\\.CloseTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.Connection\\.ConnectTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.Connection\\.EnableIdleCheck", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.Connection\\.IdleTimeout", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.SessionManager\\.Connection\\.InactivityTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.Connection", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.Endpoints", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.Locator\\.EndpointSelection", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.Locator\\.ConnectionCached", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.Locator\\.PreferSecure", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.SessionManager\\.Locator\\.LocatorCacheTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.Locator\\.InvocationTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.Locator\\.Locator", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.Locator\\.Router", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.SessionManager\\.Locator\\.CollocationOptimized", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.Locator\\.Context\\.[^\\s]+", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.Locator", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.PublishedEndpoints", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.ReplicaGroupId", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.Router\\.EndpointSelection", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.Router\\.ConnectionCached", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.Router\\.PreferSecure", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.Router\\.LocatorCacheTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.Router\\.InvocationTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.Router\\.Locator", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.Router\\.Router", false, null),
-    new Property(
-        "IceGrid\\.Registry\\.SessionManager\\.Router\\.CollocationOptimized", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.Router\\.Context\\.[^\\s]+", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.Router", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.ProxyOptions", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.ThreadPool\\.Size", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.ThreadPool\\.SizeMax", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.ThreadPool\\.SizeWarn", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.ThreadPool\\.StackSize", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.ThreadPool\\.Serialize", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.ThreadPool\\.ThreadIdleTime", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.ThreadPool\\.ThreadPriority", false, null),
-    new Property("IceGrid\\.Registry\\.SessionManager\\.MessageSizeMax", false, null),
-    new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier\\.EndpointSelection", false, null),
-    new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier\\.ConnectionCached", false, null),
-    new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier\\.PreferSecure", false, null),
-    new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier\\.LocatorCacheTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier\\.InvocationTimeout", false, null),
-    new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier\\.Locator", false, null),
-    new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier\\.Router", false, null),
-    new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier\\.CollocationOptimized", false, null),
-    new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier\\.Context\\.[^\\s]+", false, null),
-    new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier", false, null),
-    new Property("IceGrid\\.Registry\\.Trace\\.Admin", false, null),
-    new Property("IceGrid\\.Registry\\.Trace\\.Application", false, null),
-    new Property("IceGrid\\.Registry\\.Trace\\.Adapter", false, null),
-    new Property("IceGrid\\.Registry\\.Trace\\.Discovery", false, null),
-    new Property("IceGrid\\.Registry\\.Trace\\.Locator", false, null),
-    new Property("IceGrid\\.Registry\\.Trace\\.Node", false, null),
-    new Property("IceGrid\\.Registry\\.Trace\\.Object", false, null),
-    new Property("IceGrid\\.Registry\\.Trace\\.Patch", false, null),
-    new Property("IceGrid\\.Registry\\.Trace\\.Replica", false, null),
-    new Property("IceGrid\\.Registry\\.Trace\\.Server", false, null),
-    new Property("IceGrid\\.Registry\\.Trace\\.Session", false, null),
-    new Property("IceGrid\\.Registry\\.Trace\\.Subscriber", false, null),
-    new Property("IceGrid\\.Registry\\.Trace\\.Topic", false, null),
-    new Property("IceGrid\\.Registry\\.Trace\\.TopicManager", false, null),
-    new Property("IceGrid\\.Registry\\.UserAccounts", false, null),
+    new Property("IceGrid\\.AdminRouter\\.ACM\\.Timeout", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.ACM\\.Heartbeat", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.ACM\\.Close", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.ACM", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.AdapterId", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.Connection\\.CloseTimeout", "10", false, null),
+    new Property("IceGrid\\.AdminRouter\\.Connection\\.ConnectTimeout", "10", false, null),
+    new Property("IceGrid\\.AdminRouter\\.Connection\\.EnableIdleCheck", "1", false, null),
+    new Property("IceGrid\\.AdminRouter\\.Connection\\.IdleTimeout", "60", false, null),
+    new Property("IceGrid\\.AdminRouter\\.Connection\\.InactivityTimeout", "300", false, null),
+    new Property("IceGrid\\.AdminRouter\\.Connection", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.Endpoints", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.Locator\\.EndpointSelection", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.Locator\\.ConnectionCached", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.Locator\\.PreferSecure", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.Locator\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.Locator\\.InvocationTimeout", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.Locator\\.Locator", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.Locator\\.Router", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.Locator\\.CollocationOptimized", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.Locator\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.Locator", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.PublishedEndpoints", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.ReplicaGroupId", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.Router\\.EndpointSelection", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.Router\\.ConnectionCached", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.Router\\.PreferSecure", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.Router\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.Router\\.InvocationTimeout", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.Router\\.Locator", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.Router\\.Router", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.Router\\.CollocationOptimized", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.Router\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.Router", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.ProxyOptions", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.ThreadPool\\.Size", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.ThreadPool\\.SizeMax", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.ThreadPool\\.SizeWarn", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.ThreadPool\\.StackSize", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.ThreadPool\\.Serialize", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.ThreadPool\\.ThreadIdleTime", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.ThreadPool\\.ThreadPriority", "", false, null),
+    new Property("IceGrid\\.AdminRouter\\.MessageSizeMax", "", false, null),
+    new Property("IceGrid\\.InstanceName", "", false, null),
+    new Property("IceGrid\\.Node\\.ACM\\.Timeout", "", false, null),
+    new Property("IceGrid\\.Node\\.ACM\\.Heartbeat", "", false, null),
+    new Property("IceGrid\\.Node\\.ACM\\.Close", "", false, null),
+    new Property("IceGrid\\.Node\\.ACM", "", false, null),
+    new Property("IceGrid\\.Node\\.AdapterId", "", false, null),
+    new Property("IceGrid\\.Node\\.Connection\\.CloseTimeout", "10", false, null),
+    new Property("IceGrid\\.Node\\.Connection\\.ConnectTimeout", "10", false, null),
+    new Property("IceGrid\\.Node\\.Connection\\.EnableIdleCheck", "1", false, null),
+    new Property("IceGrid\\.Node\\.Connection\\.IdleTimeout", "60", false, null),
+    new Property("IceGrid\\.Node\\.Connection\\.InactivityTimeout", "300", false, null),
+    new Property("IceGrid\\.Node\\.Connection", "", false, null),
+    new Property("IceGrid\\.Node\\.Endpoints", "", false, null),
+    new Property("IceGrid\\.Node\\.Locator\\.EndpointSelection", "", false, null),
+    new Property("IceGrid\\.Node\\.Locator\\.ConnectionCached", "", false, null),
+    new Property("IceGrid\\.Node\\.Locator\\.PreferSecure", "", false, null),
+    new Property("IceGrid\\.Node\\.Locator\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceGrid\\.Node\\.Locator\\.InvocationTimeout", "", false, null),
+    new Property("IceGrid\\.Node\\.Locator\\.Locator", "", false, null),
+    new Property("IceGrid\\.Node\\.Locator\\.Router", "", false, null),
+    new Property("IceGrid\\.Node\\.Locator\\.CollocationOptimized", "", false, null),
+    new Property("IceGrid\\.Node\\.Locator\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceGrid\\.Node\\.Locator", "", false, null),
+    new Property("IceGrid\\.Node\\.PublishedEndpoints", "", false, null),
+    new Property("IceGrid\\.Node\\.ReplicaGroupId", "", false, null),
+    new Property("IceGrid\\.Node\\.Router\\.EndpointSelection", "", false, null),
+    new Property("IceGrid\\.Node\\.Router\\.ConnectionCached", "", false, null),
+    new Property("IceGrid\\.Node\\.Router\\.PreferSecure", "", false, null),
+    new Property("IceGrid\\.Node\\.Router\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceGrid\\.Node\\.Router\\.InvocationTimeout", "", false, null),
+    new Property("IceGrid\\.Node\\.Router\\.Locator", "", false, null),
+    new Property("IceGrid\\.Node\\.Router\\.Router", "", false, null),
+    new Property("IceGrid\\.Node\\.Router\\.CollocationOptimized", "", false, null),
+    new Property("IceGrid\\.Node\\.Router\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceGrid\\.Node\\.Router", "", false, null),
+    new Property("IceGrid\\.Node\\.ProxyOptions", "", false, null),
+    new Property("IceGrid\\.Node\\.ThreadPool\\.Size", "", false, null),
+    new Property("IceGrid\\.Node\\.ThreadPool\\.SizeMax", "", false, null),
+    new Property("IceGrid\\.Node\\.ThreadPool\\.SizeWarn", "", false, null),
+    new Property("IceGrid\\.Node\\.ThreadPool\\.StackSize", "", false, null),
+    new Property("IceGrid\\.Node\\.ThreadPool\\.Serialize", "", false, null),
+    new Property("IceGrid\\.Node\\.ThreadPool\\.ThreadIdleTime", "", false, null),
+    new Property("IceGrid\\.Node\\.ThreadPool\\.ThreadPriority", "", false, null),
+    new Property("IceGrid\\.Node\\.MessageSizeMax", "", false, null),
+    new Property("IceGrid\\.Node\\.AllowRunningServersAsRoot", "", false, null),
+    new Property("IceGrid\\.Node\\.AllowEndpointsOverride", "", false, null),
+    new Property("IceGrid\\.Node\\.CollocateRegistry", "", false, null),
+    new Property("IceGrid\\.Node\\.Data", "", false, null),
+    new Property("IceGrid\\.Node\\.DisableOnFailure", "", false, null),
+    new Property("IceGrid\\.Node\\.Name", "", false, null),
+    new Property("IceGrid\\.Node\\.Output", "", false, null),
+    new Property("IceGrid\\.Node\\.ProcessorSocketCount", "", false, null),
+    new Property("IceGrid\\.Node\\.PrintServersReady", "", false, null),
+    new Property("IceGrid\\.Node\\.PropertiesOverride", "", false, null),
+    new Property("IceGrid\\.Node\\.RedirectErrToOut", "", false, null),
+    new Property("IceGrid\\.Node\\.Trace\\.Activator", "", false, null),
+    new Property("IceGrid\\.Node\\.Trace\\.Adapter", "", false, null),
+    new Property("IceGrid\\.Node\\.Trace\\.Admin", "", false, null),
+    new Property("IceGrid\\.Node\\.Trace\\.Patch", "", false, null),
+    new Property("IceGrid\\.Node\\.Trace\\.Replica", "", false, null),
+    new Property("IceGrid\\.Node\\.Trace\\.Server", "", false, null),
+    new Property("IceGrid\\.Node\\.UserAccounts", "", false, null),
+    new Property("IceGrid\\.Node\\.UserAccountMapper\\.EndpointSelection", "", false, null),
+    new Property("IceGrid\\.Node\\.UserAccountMapper\\.ConnectionCached", "", false, null),
+    new Property("IceGrid\\.Node\\.UserAccountMapper\\.PreferSecure", "", false, null),
+    new Property("IceGrid\\.Node\\.UserAccountMapper\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceGrid\\.Node\\.UserAccountMapper\\.InvocationTimeout", "", false, null),
+    new Property("IceGrid\\.Node\\.UserAccountMapper\\.Locator", "", false, null),
+    new Property("IceGrid\\.Node\\.UserAccountMapper\\.Router", "", false, null),
+    new Property("IceGrid\\.Node\\.UserAccountMapper\\.CollocationOptimized", "", false, null),
+    new Property("IceGrid\\.Node\\.UserAccountMapper\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceGrid\\.Node\\.UserAccountMapper", "", false, null),
+    new Property("IceGrid\\.Node\\.WaitTime", "", false, null),
+    new Property("IceGrid\\.Registry\\.AdminCryptPasswords", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminPermissionsVerifier\\.EndpointSelection", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminPermissionsVerifier\\.ConnectionCached", "", false, null),
+    new Property("IceGrid\\.Registry\\.AdminPermissionsVerifier\\.PreferSecure", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminPermissionsVerifier\\.LocatorCacheTimeout", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminPermissionsVerifier\\.InvocationTimeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.AdminPermissionsVerifier\\.Locator", "", false, null),
+    new Property("IceGrid\\.Registry\\.AdminPermissionsVerifier\\.Router", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminPermissionsVerifier\\.CollocationOptimized", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminPermissionsVerifier\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceGrid\\.Registry\\.AdminPermissionsVerifier", "", false, null),
+    new Property("IceGrid\\.Registry\\.AdminSessionFilters", "", false, null),
+    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.ACM\\.Timeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.ACM\\.Heartbeat", "", false, null),
+    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.ACM\\.Close", "", false, null),
+    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.ACM", "", false, null),
+    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.AdapterId", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSessionManager\\.Connection\\.CloseTimeout", "10", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSessionManager\\.Connection\\.ConnectTimeout",
+        "10",
+        false,
+        null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSessionManager\\.Connection\\.EnableIdleCheck",
+        "1",
+        false,
+        null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSessionManager\\.Connection\\.IdleTimeout", "60", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSessionManager\\.Connection\\.InactivityTimeout",
+        "300",
+        false,
+        null),
+    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Connection", "", false, null),
+    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Endpoints", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSessionManager\\.Locator\\.EndpointSelection", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSessionManager\\.Locator\\.ConnectionCached", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSessionManager\\.Locator\\.PreferSecure", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSessionManager\\.Locator\\.LocatorCacheTimeout",
+        "",
+        false,
+        null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSessionManager\\.Locator\\.InvocationTimeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Locator\\.Locator", "", false, null),
+    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Locator\\.Router", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSessionManager\\.Locator\\.CollocationOptimized",
+        "",
+        false,
+        null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSessionManager\\.Locator\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Locator", "", false, null),
+    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.PublishedEndpoints", "", false, null),
+    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.ReplicaGroupId", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.EndpointSelection", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.ConnectionCached", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.PreferSecure", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.LocatorCacheTimeout", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.InvocationTimeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.Locator", "", false, null),
+    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.Router", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.CollocationOptimized",
+        "",
+        false,
+        null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSessionManager\\.Router\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.Router", "", false, null),
+    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.ProxyOptions", "", false, null),
+    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.ThreadPool\\.Size", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSessionManager\\.ThreadPool\\.SizeMax", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSessionManager\\.ThreadPool\\.SizeWarn", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSessionManager\\.ThreadPool\\.StackSize", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSessionManager\\.ThreadPool\\.Serialize", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSessionManager\\.ThreadPool\\.ThreadIdleTime", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSessionManager\\.ThreadPool\\.ThreadPriority", "", false, null),
+    new Property("IceGrid\\.Registry\\.AdminSessionManager\\.MessageSizeMax", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.EndpointSelection", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.ConnectionCached", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.PreferSecure", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.LocatorCacheTimeout", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.InvocationTimeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.Locator", "", false, null),
+    new Property("IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.Router", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.CollocationOptimized", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.AdminSSLPermissionsVerifier\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceGrid\\.Registry\\.AdminSSLPermissionsVerifier", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.ACM\\.Timeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.ACM\\.Heartbeat", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.ACM\\.Close", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.ACM", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.AdapterId", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.Connection\\.CloseTimeout", "10", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.Connection\\.ConnectTimeout", "10", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.Connection\\.EnableIdleCheck", "1", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.Connection\\.IdleTimeout", "60", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.Client\\.Connection\\.InactivityTimeout", "300", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.Connection", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.Endpoints", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.Locator\\.EndpointSelection", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.Locator\\.ConnectionCached", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.Locator\\.PreferSecure", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.Locator\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.Locator\\.InvocationTimeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.Locator\\.Locator", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.Locator\\.Router", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.Locator\\.CollocationOptimized", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.Locator\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.Locator", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.PublishedEndpoints", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.ReplicaGroupId", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.Router\\.EndpointSelection", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.Router\\.ConnectionCached", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.Router\\.PreferSecure", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.Router\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.Router\\.InvocationTimeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.Router\\.Locator", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.Router\\.Router", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.Router\\.CollocationOptimized", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.Router\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.Router", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.ProxyOptions", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.ThreadPool\\.Size", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.ThreadPool\\.SizeMax", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.ThreadPool\\.SizeWarn", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.ThreadPool\\.StackSize", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.ThreadPool\\.Serialize", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.ThreadPool\\.ThreadIdleTime", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.ThreadPool\\.ThreadPriority", "", false, null),
+    new Property("IceGrid\\.Registry\\.Client\\.MessageSizeMax", "", false, null),
+    new Property("IceGrid\\.Registry\\.CryptPasswords", "", false, null),
+    new Property("IceGrid\\.Registry\\.DefaultTemplates", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.ACM\\.Timeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.ACM\\.Heartbeat", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.ACM\\.Close", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.ACM", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.AdapterId", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Connection\\.CloseTimeout", "10", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Connection\\.ConnectTimeout", "10", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Connection\\.EnableIdleCheck", "1", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Connection\\.IdleTimeout", "60", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.Discovery\\.Connection\\.InactivityTimeout", "300", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Connection", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Endpoints", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Locator\\.EndpointSelection", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Locator\\.ConnectionCached", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Locator\\.PreferSecure", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Locator\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Locator\\.InvocationTimeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Locator\\.Locator", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Locator\\.Router", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.Discovery\\.Locator\\.CollocationOptimized", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Locator\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Locator", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.PublishedEndpoints", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.ReplicaGroupId", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Router\\.EndpointSelection", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Router\\.ConnectionCached", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Router\\.PreferSecure", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Router\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Router\\.InvocationTimeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Router\\.Locator", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Router\\.Router", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Router\\.CollocationOptimized", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Router\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Router", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.ProxyOptions", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.ThreadPool\\.Size", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.ThreadPool\\.SizeMax", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.ThreadPool\\.SizeWarn", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.ThreadPool\\.StackSize", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.ThreadPool\\.Serialize", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.ThreadPool\\.ThreadIdleTime", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.ThreadPool\\.ThreadPriority", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.MessageSizeMax", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Enabled", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Address", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Port", "", false, null),
+    new Property("IceGrid\\.Registry\\.Discovery\\.Interface", "", false, null),
+    new Property("IceGrid\\.Registry\\.DynamicRegistration", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.ACM\\.Timeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.ACM\\.Heartbeat", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.ACM\\.Close", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.ACM", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.AdapterId", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.Connection\\.CloseTimeout", "10", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.Connection\\.ConnectTimeout", "10", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.Connection\\.EnableIdleCheck", "1", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.Connection\\.IdleTimeout", "60", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.Internal\\.Connection\\.InactivityTimeout", "300", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.Connection", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.Endpoints", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.Locator\\.EndpointSelection", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.Locator\\.ConnectionCached", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.Locator\\.PreferSecure", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.Locator\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.Locator\\.InvocationTimeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.Locator\\.Locator", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.Locator\\.Router", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.Locator\\.CollocationOptimized", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.Locator\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.Locator", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.PublishedEndpoints", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.ReplicaGroupId", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.Router\\.EndpointSelection", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.Router\\.ConnectionCached", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.Router\\.PreferSecure", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.Router\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.Router\\.InvocationTimeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.Router\\.Locator", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.Router\\.Router", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.Router\\.CollocationOptimized", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.Router\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.Router", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.ProxyOptions", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.ThreadPool\\.Size", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.ThreadPool\\.SizeMax", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.ThreadPool\\.SizeWarn", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.ThreadPool\\.StackSize", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.ThreadPool\\.Serialize", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.ThreadPool\\.ThreadIdleTime", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.ThreadPool\\.ThreadPriority", "", false, null),
+    new Property("IceGrid\\.Registry\\.Internal\\.MessageSizeMax", "", false, null),
+    new Property("IceGrid\\.Registry\\.LMDB\\.MapSize", "", false, null),
+    new Property("IceGrid\\.Registry\\.LMDB\\.Path", "", false, null),
+    new Property("IceGrid\\.Registry\\.PermissionsVerifier\\.EndpointSelection", "", false, null),
+    new Property("IceGrid\\.Registry\\.PermissionsVerifier\\.ConnectionCached", "", false, null),
+    new Property("IceGrid\\.Registry\\.PermissionsVerifier\\.PreferSecure", "", false, null),
+    new Property("IceGrid\\.Registry\\.PermissionsVerifier\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.PermissionsVerifier\\.InvocationTimeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.PermissionsVerifier\\.Locator", "", false, null),
+    new Property("IceGrid\\.Registry\\.PermissionsVerifier\\.Router", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.PermissionsVerifier\\.CollocationOptimized", "", false, null),
+    new Property("IceGrid\\.Registry\\.PermissionsVerifier\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceGrid\\.Registry\\.PermissionsVerifier", "", false, null),
+    new Property("IceGrid\\.Registry\\.ReplicaName", "", false, null),
+    new Property("IceGrid\\.Registry\\.RequireNodeCertCN", "", false, null),
+    new Property("IceGrid\\.Registry\\.RequireReplicaCertCN", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.ACM\\.Timeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.ACM\\.Heartbeat", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.ACM\\.Close", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.ACM", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.AdapterId", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.Connection\\.CloseTimeout", "10", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.Connection\\.ConnectTimeout", "10", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.Connection\\.EnableIdleCheck", "1", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.Connection\\.IdleTimeout", "60", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.Server\\.Connection\\.InactivityTimeout", "300", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.Connection", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.Endpoints", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.Locator\\.EndpointSelection", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.Locator\\.ConnectionCached", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.Locator\\.PreferSecure", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.Locator\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.Locator\\.InvocationTimeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.Locator\\.Locator", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.Locator\\.Router", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.Locator\\.CollocationOptimized", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.Locator\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.Locator", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.PublishedEndpoints", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.ReplicaGroupId", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.Router\\.EndpointSelection", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.Router\\.ConnectionCached", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.Router\\.PreferSecure", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.Router\\.LocatorCacheTimeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.Router\\.InvocationTimeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.Router\\.Locator", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.Router\\.Router", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.Router\\.CollocationOptimized", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.Router\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.Router", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.ProxyOptions", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.ThreadPool\\.Size", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.ThreadPool\\.SizeMax", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.ThreadPool\\.SizeWarn", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.ThreadPool\\.StackSize", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.ThreadPool\\.Serialize", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.ThreadPool\\.ThreadIdleTime", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.ThreadPool\\.ThreadPriority", "", false, null),
+    new Property("IceGrid\\.Registry\\.Server\\.MessageSizeMax", "", false, null),
+    new Property("IceGrid\\.Registry\\.SessionFilters", "", false, null),
+    new Property("IceGrid\\.Registry\\.SessionManager\\.ACM\\.Timeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.SessionManager\\.ACM\\.Heartbeat", "", false, null),
+    new Property("IceGrid\\.Registry\\.SessionManager\\.ACM\\.Close", "", false, null),
+    new Property("IceGrid\\.Registry\\.SessionManager\\.ACM", "", false, null),
+    new Property("IceGrid\\.Registry\\.SessionManager\\.AdapterId", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.SessionManager\\.Connection\\.CloseTimeout", "10", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.SessionManager\\.Connection\\.ConnectTimeout", "10", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.SessionManager\\.Connection\\.EnableIdleCheck", "1", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.SessionManager\\.Connection\\.IdleTimeout", "60", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.SessionManager\\.Connection\\.InactivityTimeout", "300", false, null),
+    new Property("IceGrid\\.Registry\\.SessionManager\\.Connection", "", false, null),
+    new Property("IceGrid\\.Registry\\.SessionManager\\.Endpoints", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.SessionManager\\.Locator\\.EndpointSelection", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.SessionManager\\.Locator\\.ConnectionCached", "", false, null),
+    new Property("IceGrid\\.Registry\\.SessionManager\\.Locator\\.PreferSecure", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.SessionManager\\.Locator\\.LocatorCacheTimeout", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.SessionManager\\.Locator\\.InvocationTimeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.SessionManager\\.Locator\\.Locator", "", false, null),
+    new Property("IceGrid\\.Registry\\.SessionManager\\.Locator\\.Router", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.SessionManager\\.Locator\\.CollocationOptimized", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.SessionManager\\.Locator\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceGrid\\.Registry\\.SessionManager\\.Locator", "", false, null),
+    new Property("IceGrid\\.Registry\\.SessionManager\\.PublishedEndpoints", "", false, null),
+    new Property("IceGrid\\.Registry\\.SessionManager\\.ReplicaGroupId", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.SessionManager\\.Router\\.EndpointSelection", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.SessionManager\\.Router\\.ConnectionCached", "", false, null),
+    new Property("IceGrid\\.Registry\\.SessionManager\\.Router\\.PreferSecure", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.SessionManager\\.Router\\.LocatorCacheTimeout", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.SessionManager\\.Router\\.InvocationTimeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.SessionManager\\.Router\\.Locator", "", false, null),
+    new Property("IceGrid\\.Registry\\.SessionManager\\.Router\\.Router", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.SessionManager\\.Router\\.CollocationOptimized", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.SessionManager\\.Router\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceGrid\\.Registry\\.SessionManager\\.Router", "", false, null),
+    new Property("IceGrid\\.Registry\\.SessionManager\\.ProxyOptions", "", false, null),
+    new Property("IceGrid\\.Registry\\.SessionManager\\.ThreadPool\\.Size", "", false, null),
+    new Property("IceGrid\\.Registry\\.SessionManager\\.ThreadPool\\.SizeMax", "", false, null),
+    new Property("IceGrid\\.Registry\\.SessionManager\\.ThreadPool\\.SizeWarn", "", false, null),
+    new Property("IceGrid\\.Registry\\.SessionManager\\.ThreadPool\\.StackSize", "", false, null),
+    new Property("IceGrid\\.Registry\\.SessionManager\\.ThreadPool\\.Serialize", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.SessionManager\\.ThreadPool\\.ThreadIdleTime", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.SessionManager\\.ThreadPool\\.ThreadPriority", "", false, null),
+    new Property("IceGrid\\.Registry\\.SessionManager\\.MessageSizeMax", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.SSLPermissionsVerifier\\.EndpointSelection", "", false, null),
+    new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier\\.ConnectionCached", "", false, null),
+    new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier\\.PreferSecure", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.SSLPermissionsVerifier\\.LocatorCacheTimeout", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.SSLPermissionsVerifier\\.InvocationTimeout", "", false, null),
+    new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier\\.Locator", "", false, null),
+    new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier\\.Router", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.SSLPermissionsVerifier\\.CollocationOptimized", "", false, null),
+    new Property(
+        "IceGrid\\.Registry\\.SSLPermissionsVerifier\\.Context\\.[^\\s]+", "", false, null),
+    new Property("IceGrid\\.Registry\\.SSLPermissionsVerifier", "", false, null),
+    new Property("IceGrid\\.Registry\\.Trace\\.Admin", "", false, null),
+    new Property("IceGrid\\.Registry\\.Trace\\.Application", "", false, null),
+    new Property("IceGrid\\.Registry\\.Trace\\.Adapter", "", false, null),
+    new Property("IceGrid\\.Registry\\.Trace\\.Discovery", "", false, null),
+    new Property("IceGrid\\.Registry\\.Trace\\.Locator", "", false, null),
+    new Property("IceGrid\\.Registry\\.Trace\\.Node", "", false, null),
+    new Property("IceGrid\\.Registry\\.Trace\\.Object", "", false, null),
+    new Property("IceGrid\\.Registry\\.Trace\\.Patch", "", false, null),
+    new Property("IceGrid\\.Registry\\.Trace\\.Replica", "", false, null),
+    new Property("IceGrid\\.Registry\\.Trace\\.Server", "", false, null),
+    new Property("IceGrid\\.Registry\\.Trace\\.Session", "", false, null),
+    new Property("IceGrid\\.Registry\\.Trace\\.Subscriber", "", false, null),
+    new Property("IceGrid\\.Registry\\.Trace\\.Topic", "", false, null),
+    new Property("IceGrid\\.Registry\\.Trace\\.TopicManager", "", false, null),
+    new Property("IceGrid\\.Registry\\.UserAccounts", "", false, null),
     null
   };
 
   public static final Property IceSSLProps[] = {
-    new Property("IceSSL\\.Alias", false, null),
-    new Property("IceSSL\\.CAs", false, null),
-    new Property("IceSSL\\.CertStore", false, null),
-    new Property("IceSSL\\.CertStoreLocation", false, null),
-    new Property("IceSSL\\.CertFile", false, null),
-    new Property("IceSSL\\.CheckCertName", false, null),
-    new Property("IceSSL\\.CheckCRL", false, null),
-    new Property("IceSSL\\.CertificateRevocationListFiles", false, null),
-    new Property("IceSSL\\.DefaultDir", false, null),
-    new Property("IceSSL\\.FindCert", false, null),
-    new Property("IceSSL\\.KeyFile", false, null),
-    new Property("IceSSL\\.Keychain", false, null),
-    new Property("IceSSL\\.KeychainPassword", false, null),
-    new Property("IceSSL\\.Keystore", false, null),
-    new Property("IceSSL\\.KeystorePassword", false, null),
-    new Property("IceSSL\\.KeystoreType", false, null),
-    new Property("IceSSL\\.Password", false, null),
-    new Property("IceSSL\\.RevocationCheck", false, null),
-    new Property("IceSSL\\.RevocationCheckCacheOnly", false, null),
-    new Property("IceSSL\\.SchannelStrongCrypto", false, null),
-    new Property("IceSSL\\.Trace\\.Security", false, null),
-    new Property("IceSSL\\.TrustOnly", false, null),
-    new Property("IceSSL\\.TrustOnly\\.Client", false, null),
-    new Property("IceSSL\\.TrustOnly\\.Server", false, null),
-    new Property("IceSSL\\.TrustOnly\\.Server\\.[^\\s]+", false, null),
-    new Property("IceSSL\\.Truststore", false, null),
-    new Property("IceSSL\\.TruststorePassword", false, null),
-    new Property("IceSSL\\.TruststoreType", false, null),
-    new Property("IceSSL\\.UsePlatformCAs", false, null),
-    new Property("IceSSL\\.VerifyPeer", false, null),
+    new Property("IceSSL\\.Alias", "", false, null),
+    new Property("IceSSL\\.CAs", "", false, null),
+    new Property("IceSSL\\.CertStore", "", false, null),
+    new Property("IceSSL\\.CertStoreLocation", "", false, null),
+    new Property("IceSSL\\.CertFile", "", false, null),
+    new Property("IceSSL\\.CheckCertName", "", false, null),
+    new Property("IceSSL\\.CheckCRL", "", false, null),
+    new Property("IceSSL\\.CertificateRevocationListFiles", "", false, null),
+    new Property("IceSSL\\.DefaultDir", "", false, null),
+    new Property("IceSSL\\.FindCert", "", false, null),
+    new Property("IceSSL\\.KeyFile", "", false, null),
+    new Property("IceSSL\\.Keychain", "", false, null),
+    new Property("IceSSL\\.KeychainPassword", "", false, null),
+    new Property("IceSSL\\.Keystore", "", false, null),
+    new Property("IceSSL\\.KeystorePassword", "", false, null),
+    new Property("IceSSL\\.KeystoreType", "", false, null),
+    new Property("IceSSL\\.Password", "", false, null),
+    new Property("IceSSL\\.RevocationCheck", "", false, null),
+    new Property("IceSSL\\.RevocationCheckCacheOnly", "", false, null),
+    new Property("IceSSL\\.SchannelStrongCrypto", "", false, null),
+    new Property("IceSSL\\.Trace\\.Security", "", false, null),
+    new Property("IceSSL\\.TrustOnly", "", false, null),
+    new Property("IceSSL\\.TrustOnly\\.Client", "", false, null),
+    new Property("IceSSL\\.TrustOnly\\.Server", "", false, null),
+    new Property("IceSSL\\.TrustOnly\\.Server\\.[^\\s]+", "", false, null),
+    new Property("IceSSL\\.Truststore", "", false, null),
+    new Property("IceSSL\\.TruststorePassword", "", false, null),
+    new Property("IceSSL\\.TruststoreType", "", false, null),
+    new Property("IceSSL\\.UsePlatformCAs", "", false, null),
+    new Property("IceSSL\\.VerifyPeer", "", false, null),
     null
   };
 
   public static final Property IceStormAdminProps[] = {
-    new Property("IceStormAdmin\\.TopicManager\\.[^\\s]+", false, null),
-    new Property("IceStormAdmin\\.Host", false, null),
-    new Property("IceStormAdmin\\.Port", false, null),
+    new Property("IceStormAdmin\\.TopicManager\\.[^\\s]+", "", false, null),
+    new Property("IceStormAdmin\\.Host", "", false, null),
+    new Property("IceStormAdmin\\.Port", "", false, null),
     null
   };
 
   public static final Property IceBTProps[] = {
-    new Property("IceBT\\.RcvSize", false, null), new Property("IceBT\\.SndSize", false, null), null
+    new Property("IceBT\\.RcvSize", "", false, null),
+    new Property("IceBT\\.SndSize", "", false, null),
+    null
   };
 
   public static final Property Glacier2Props[] = {
-    new Property("Glacier2\\.AddConnectionContext", false, null),
-    new Property("Glacier2\\.Client\\.ACM\\.Timeout", false, null),
-    new Property("Glacier2\\.Client\\.ACM\\.Heartbeat", false, null),
-    new Property("Glacier2\\.Client\\.ACM\\.Close", false, null),
-    new Property("Glacier2\\.Client\\.ACM", false, null),
-    new Property("Glacier2\\.Client\\.AdapterId", false, null),
-    new Property("Glacier2\\.Client\\.Connection\\.CloseTimeout", false, null),
-    new Property("Glacier2\\.Client\\.Connection\\.ConnectTimeout", false, null),
-    new Property("Glacier2\\.Client\\.Connection\\.EnableIdleCheck", false, null),
-    new Property("Glacier2\\.Client\\.Connection\\.IdleTimeout", false, null),
-    new Property("Glacier2\\.Client\\.Connection\\.InactivityTimeout", false, null),
-    new Property("Glacier2\\.Client\\.Connection", false, null),
-    new Property("Glacier2\\.Client\\.Endpoints", false, null),
-    new Property("Glacier2\\.Client\\.Locator\\.EndpointSelection", false, null),
-    new Property("Glacier2\\.Client\\.Locator\\.ConnectionCached", false, null),
-    new Property("Glacier2\\.Client\\.Locator\\.PreferSecure", false, null),
-    new Property("Glacier2\\.Client\\.Locator\\.LocatorCacheTimeout", false, null),
-    new Property("Glacier2\\.Client\\.Locator\\.InvocationTimeout", false, null),
-    new Property("Glacier2\\.Client\\.Locator\\.Locator", false, null),
-    new Property("Glacier2\\.Client\\.Locator\\.Router", false, null),
-    new Property("Glacier2\\.Client\\.Locator\\.CollocationOptimized", false, null),
-    new Property("Glacier2\\.Client\\.Locator\\.Context\\.[^\\s]+", false, null),
-    new Property("Glacier2\\.Client\\.Locator", false, null),
-    new Property("Glacier2\\.Client\\.PublishedEndpoints", false, null),
-    new Property("Glacier2\\.Client\\.ReplicaGroupId", false, null),
-    new Property("Glacier2\\.Client\\.Router\\.EndpointSelection", false, null),
-    new Property("Glacier2\\.Client\\.Router\\.ConnectionCached", false, null),
-    new Property("Glacier2\\.Client\\.Router\\.PreferSecure", false, null),
-    new Property("Glacier2\\.Client\\.Router\\.LocatorCacheTimeout", false, null),
-    new Property("Glacier2\\.Client\\.Router\\.InvocationTimeout", false, null),
-    new Property("Glacier2\\.Client\\.Router\\.Locator", false, null),
-    new Property("Glacier2\\.Client\\.Router\\.Router", false, null),
-    new Property("Glacier2\\.Client\\.Router\\.CollocationOptimized", false, null),
-    new Property("Glacier2\\.Client\\.Router\\.Context\\.[^\\s]+", false, null),
-    new Property("Glacier2\\.Client\\.Router", false, null),
-    new Property("Glacier2\\.Client\\.ProxyOptions", false, null),
-    new Property("Glacier2\\.Client\\.ThreadPool\\.Size", false, null),
-    new Property("Glacier2\\.Client\\.ThreadPool\\.SizeMax", false, null),
-    new Property("Glacier2\\.Client\\.ThreadPool\\.SizeWarn", false, null),
-    new Property("Glacier2\\.Client\\.ThreadPool\\.StackSize", false, null),
-    new Property("Glacier2\\.Client\\.ThreadPool\\.Serialize", false, null),
-    new Property("Glacier2\\.Client\\.ThreadPool\\.ThreadIdleTime", false, null),
-    new Property("Glacier2\\.Client\\.ThreadPool\\.ThreadPriority", false, null),
-    new Property("Glacier2\\.Client\\.MessageSizeMax", false, null),
-    new Property("Glacier2\\.Client\\.Buffered", false, null),
-    new Property("Glacier2\\.Client\\.ForwardContext", false, null),
-    new Property("Glacier2\\.Client\\.SleepTime", false, null),
-    new Property("Glacier2\\.Client\\.Trace\\.Override", false, null),
-    new Property("Glacier2\\.Client\\.Trace\\.Reject", false, null),
-    new Property("Glacier2\\.Client\\.Trace\\.Request", false, null),
-    new Property("Glacier2\\.CryptPasswords", false, null),
-    new Property("Glacier2\\.Filter\\.Address\\.Reject", false, null),
-    new Property("Glacier2\\.Filter\\.Address\\.Accept", false, null),
-    new Property("Glacier2\\.Filter\\.ProxySizeMax", false, null),
-    new Property("Glacier2\\.Filter\\.Category\\.Accept", false, null),
-    new Property("Glacier2\\.Filter\\.Category\\.AcceptUser", false, null),
-    new Property("Glacier2\\.Filter\\.AdapterId\\.Accept", false, null),
-    new Property("Glacier2\\.Filter\\.Identity\\.Accept", false, null),
-    new Property("Glacier2\\.InstanceName", false, null),
-    new Property("Glacier2\\.PermissionsVerifier\\.EndpointSelection", false, null),
-    new Property("Glacier2\\.PermissionsVerifier\\.ConnectionCached", false, null),
-    new Property("Glacier2\\.PermissionsVerifier\\.PreferSecure", false, null),
-    new Property("Glacier2\\.PermissionsVerifier\\.LocatorCacheTimeout", false, null),
-    new Property("Glacier2\\.PermissionsVerifier\\.InvocationTimeout", false, null),
-    new Property("Glacier2\\.PermissionsVerifier\\.Locator", false, null),
-    new Property("Glacier2\\.PermissionsVerifier\\.Router", false, null),
-    new Property("Glacier2\\.PermissionsVerifier\\.CollocationOptimized", false, null),
-    new Property("Glacier2\\.PermissionsVerifier\\.Context\\.[^\\s]+", false, null),
-    new Property("Glacier2\\.PermissionsVerifier", false, null),
-    new Property("Glacier2\\.ReturnClientProxy", false, null),
-    new Property("Glacier2\\.SSLPermissionsVerifier\\.EndpointSelection", false, null),
-    new Property("Glacier2\\.SSLPermissionsVerifier\\.ConnectionCached", false, null),
-    new Property("Glacier2\\.SSLPermissionsVerifier\\.PreferSecure", false, null),
-    new Property("Glacier2\\.SSLPermissionsVerifier\\.LocatorCacheTimeout", false, null),
-    new Property("Glacier2\\.SSLPermissionsVerifier\\.InvocationTimeout", false, null),
-    new Property("Glacier2\\.SSLPermissionsVerifier\\.Locator", false, null),
-    new Property("Glacier2\\.SSLPermissionsVerifier\\.Router", false, null),
-    new Property("Glacier2\\.SSLPermissionsVerifier\\.CollocationOptimized", false, null),
-    new Property("Glacier2\\.SSLPermissionsVerifier\\.Context\\.[^\\s]+", false, null),
-    new Property("Glacier2\\.SSLPermissionsVerifier", false, null),
-    new Property("Glacier2\\.RoutingTable\\.MaxSize", false, null),
-    new Property("Glacier2\\.Server\\.ACM\\.Timeout", false, null),
-    new Property("Glacier2\\.Server\\.ACM\\.Heartbeat", false, null),
-    new Property("Glacier2\\.Server\\.ACM\\.Close", false, null),
-    new Property("Glacier2\\.Server\\.ACM", false, null),
-    new Property("Glacier2\\.Server\\.AdapterId", false, null),
-    new Property("Glacier2\\.Server\\.Connection\\.CloseTimeout", false, null),
-    new Property("Glacier2\\.Server\\.Connection\\.ConnectTimeout", false, null),
-    new Property("Glacier2\\.Server\\.Connection\\.EnableIdleCheck", false, null),
-    new Property("Glacier2\\.Server\\.Connection\\.IdleTimeout", false, null),
-    new Property("Glacier2\\.Server\\.Connection\\.InactivityTimeout", false, null),
-    new Property("Glacier2\\.Server\\.Connection", false, null),
-    new Property("Glacier2\\.Server\\.Endpoints", false, null),
-    new Property("Glacier2\\.Server\\.Locator\\.EndpointSelection", false, null),
-    new Property("Glacier2\\.Server\\.Locator\\.ConnectionCached", false, null),
-    new Property("Glacier2\\.Server\\.Locator\\.PreferSecure", false, null),
-    new Property("Glacier2\\.Server\\.Locator\\.LocatorCacheTimeout", false, null),
-    new Property("Glacier2\\.Server\\.Locator\\.InvocationTimeout", false, null),
-    new Property("Glacier2\\.Server\\.Locator\\.Locator", false, null),
-    new Property("Glacier2\\.Server\\.Locator\\.Router", false, null),
-    new Property("Glacier2\\.Server\\.Locator\\.CollocationOptimized", false, null),
-    new Property("Glacier2\\.Server\\.Locator\\.Context\\.[^\\s]+", false, null),
-    new Property("Glacier2\\.Server\\.Locator", false, null),
-    new Property("Glacier2\\.Server\\.PublishedEndpoints", false, null),
-    new Property("Glacier2\\.Server\\.ReplicaGroupId", false, null),
-    new Property("Glacier2\\.Server\\.Router\\.EndpointSelection", false, null),
-    new Property("Glacier2\\.Server\\.Router\\.ConnectionCached", false, null),
-    new Property("Glacier2\\.Server\\.Router\\.PreferSecure", false, null),
-    new Property("Glacier2\\.Server\\.Router\\.LocatorCacheTimeout", false, null),
-    new Property("Glacier2\\.Server\\.Router\\.InvocationTimeout", false, null),
-    new Property("Glacier2\\.Server\\.Router\\.Locator", false, null),
-    new Property("Glacier2\\.Server\\.Router\\.Router", false, null),
-    new Property("Glacier2\\.Server\\.Router\\.CollocationOptimized", false, null),
-    new Property("Glacier2\\.Server\\.Router\\.Context\\.[^\\s]+", false, null),
-    new Property("Glacier2\\.Server\\.Router", false, null),
-    new Property("Glacier2\\.Server\\.ProxyOptions", false, null),
-    new Property("Glacier2\\.Server\\.ThreadPool\\.Size", false, null),
-    new Property("Glacier2\\.Server\\.ThreadPool\\.SizeMax", false, null),
-    new Property("Glacier2\\.Server\\.ThreadPool\\.SizeWarn", false, null),
-    new Property("Glacier2\\.Server\\.ThreadPool\\.StackSize", false, null),
-    new Property("Glacier2\\.Server\\.ThreadPool\\.Serialize", false, null),
-    new Property("Glacier2\\.Server\\.ThreadPool\\.ThreadIdleTime", false, null),
-    new Property("Glacier2\\.Server\\.ThreadPool\\.ThreadPriority", false, null),
-    new Property("Glacier2\\.Server\\.MessageSizeMax", false, null),
-    new Property("Glacier2\\.Server\\.Buffered", false, null),
-    new Property("Glacier2\\.Server\\.ForwardContext", false, null),
-    new Property("Glacier2\\.Server\\.SleepTime", false, null),
-    new Property("Glacier2\\.Server\\.Trace\\.Override", false, null),
-    new Property("Glacier2\\.Server\\.Trace\\.Request", false, null),
-    new Property("Glacier2\\.SessionManager\\.EndpointSelection", false, null),
-    new Property("Glacier2\\.SessionManager\\.ConnectionCached", false, null),
-    new Property("Glacier2\\.SessionManager\\.PreferSecure", false, null),
-    new Property("Glacier2\\.SessionManager\\.LocatorCacheTimeout", false, null),
-    new Property("Glacier2\\.SessionManager\\.InvocationTimeout", false, null),
-    new Property("Glacier2\\.SessionManager\\.Locator", false, null),
-    new Property("Glacier2\\.SessionManager\\.Router", false, null),
-    new Property("Glacier2\\.SessionManager\\.CollocationOptimized", false, null),
-    new Property("Glacier2\\.SessionManager\\.Context\\.[^\\s]+", false, null),
-    new Property("Glacier2\\.SessionManager", false, null),
-    new Property("Glacier2\\.SSLSessionManager\\.EndpointSelection", false, null),
-    new Property("Glacier2\\.SSLSessionManager\\.ConnectionCached", false, null),
-    new Property("Glacier2\\.SSLSessionManager\\.PreferSecure", false, null),
-    new Property("Glacier2\\.SSLSessionManager\\.LocatorCacheTimeout", false, null),
-    new Property("Glacier2\\.SSLSessionManager\\.InvocationTimeout", false, null),
-    new Property("Glacier2\\.SSLSessionManager\\.Locator", false, null),
-    new Property("Glacier2\\.SSLSessionManager\\.Router", false, null),
-    new Property("Glacier2\\.SSLSessionManager\\.CollocationOptimized", false, null),
-    new Property("Glacier2\\.SSLSessionManager\\.Context\\.[^\\s]+", false, null),
-    new Property("Glacier2\\.SSLSessionManager", false, null),
-    new Property("Glacier2\\.Trace\\.RoutingTable", false, null),
-    new Property("Glacier2\\.Trace\\.Session", false, null),
+    new Property("Glacier2\\.AddConnectionContext", "", false, null),
+    new Property("Glacier2\\.Client\\.ACM\\.Timeout", "", false, null),
+    new Property("Glacier2\\.Client\\.ACM\\.Heartbeat", "", false, null),
+    new Property("Glacier2\\.Client\\.ACM\\.Close", "", false, null),
+    new Property("Glacier2\\.Client\\.ACM", "", false, null),
+    new Property("Glacier2\\.Client\\.AdapterId", "", false, null),
+    new Property("Glacier2\\.Client\\.Connection\\.CloseTimeout", "10", false, null),
+    new Property("Glacier2\\.Client\\.Connection\\.ConnectTimeout", "10", false, null),
+    new Property("Glacier2\\.Client\\.Connection\\.EnableIdleCheck", "1", false, null),
+    new Property("Glacier2\\.Client\\.Connection\\.IdleTimeout", "60", false, null),
+    new Property("Glacier2\\.Client\\.Connection\\.InactivityTimeout", "300", false, null),
+    new Property("Glacier2\\.Client\\.Connection", "", false, null),
+    new Property("Glacier2\\.Client\\.Endpoints", "", false, null),
+    new Property("Glacier2\\.Client\\.Locator\\.EndpointSelection", "", false, null),
+    new Property("Glacier2\\.Client\\.Locator\\.ConnectionCached", "", false, null),
+    new Property("Glacier2\\.Client\\.Locator\\.PreferSecure", "", false, null),
+    new Property("Glacier2\\.Client\\.Locator\\.LocatorCacheTimeout", "", false, null),
+    new Property("Glacier2\\.Client\\.Locator\\.InvocationTimeout", "", false, null),
+    new Property("Glacier2\\.Client\\.Locator\\.Locator", "", false, null),
+    new Property("Glacier2\\.Client\\.Locator\\.Router", "", false, null),
+    new Property("Glacier2\\.Client\\.Locator\\.CollocationOptimized", "", false, null),
+    new Property("Glacier2\\.Client\\.Locator\\.Context\\.[^\\s]+", "", false, null),
+    new Property("Glacier2\\.Client\\.Locator", "", false, null),
+    new Property("Glacier2\\.Client\\.PublishedEndpoints", "", false, null),
+    new Property("Glacier2\\.Client\\.ReplicaGroupId", "", false, null),
+    new Property("Glacier2\\.Client\\.Router\\.EndpointSelection", "", false, null),
+    new Property("Glacier2\\.Client\\.Router\\.ConnectionCached", "", false, null),
+    new Property("Glacier2\\.Client\\.Router\\.PreferSecure", "", false, null),
+    new Property("Glacier2\\.Client\\.Router\\.LocatorCacheTimeout", "", false, null),
+    new Property("Glacier2\\.Client\\.Router\\.InvocationTimeout", "", false, null),
+    new Property("Glacier2\\.Client\\.Router\\.Locator", "", false, null),
+    new Property("Glacier2\\.Client\\.Router\\.Router", "", false, null),
+    new Property("Glacier2\\.Client\\.Router\\.CollocationOptimized", "", false, null),
+    new Property("Glacier2\\.Client\\.Router\\.Context\\.[^\\s]+", "", false, null),
+    new Property("Glacier2\\.Client\\.Router", "", false, null),
+    new Property("Glacier2\\.Client\\.ProxyOptions", "", false, null),
+    new Property("Glacier2\\.Client\\.ThreadPool\\.Size", "", false, null),
+    new Property("Glacier2\\.Client\\.ThreadPool\\.SizeMax", "", false, null),
+    new Property("Glacier2\\.Client\\.ThreadPool\\.SizeWarn", "", false, null),
+    new Property("Glacier2\\.Client\\.ThreadPool\\.StackSize", "", false, null),
+    new Property("Glacier2\\.Client\\.ThreadPool\\.Serialize", "", false, null),
+    new Property("Glacier2\\.Client\\.ThreadPool\\.ThreadIdleTime", "", false, null),
+    new Property("Glacier2\\.Client\\.ThreadPool\\.ThreadPriority", "", false, null),
+    new Property("Glacier2\\.Client\\.MessageSizeMax", "", false, null),
+    new Property("Glacier2\\.Client\\.Buffered", "", false, null),
+    new Property("Glacier2\\.Client\\.ForwardContext", "", false, null),
+    new Property("Glacier2\\.Client\\.SleepTime", "", false, null),
+    new Property("Glacier2\\.Client\\.Trace\\.Override", "", false, null),
+    new Property("Glacier2\\.Client\\.Trace\\.Reject", "", false, null),
+    new Property("Glacier2\\.Client\\.Trace\\.Request", "", false, null),
+    new Property("Glacier2\\.CryptPasswords", "", false, null),
+    new Property("Glacier2\\.Filter\\.Address\\.Reject", "", false, null),
+    new Property("Glacier2\\.Filter\\.Address\\.Accept", "", false, null),
+    new Property("Glacier2\\.Filter\\.ProxySizeMax", "", false, null),
+    new Property("Glacier2\\.Filter\\.Category\\.Accept", "", false, null),
+    new Property("Glacier2\\.Filter\\.Category\\.AcceptUser", "", false, null),
+    new Property("Glacier2\\.Filter\\.AdapterId\\.Accept", "", false, null),
+    new Property("Glacier2\\.Filter\\.Identity\\.Accept", "", false, null),
+    new Property("Glacier2\\.InstanceName", "", false, null),
+    new Property("Glacier2\\.PermissionsVerifier\\.EndpointSelection", "", false, null),
+    new Property("Glacier2\\.PermissionsVerifier\\.ConnectionCached", "", false, null),
+    new Property("Glacier2\\.PermissionsVerifier\\.PreferSecure", "", false, null),
+    new Property("Glacier2\\.PermissionsVerifier\\.LocatorCacheTimeout", "", false, null),
+    new Property("Glacier2\\.PermissionsVerifier\\.InvocationTimeout", "", false, null),
+    new Property("Glacier2\\.PermissionsVerifier\\.Locator", "", false, null),
+    new Property("Glacier2\\.PermissionsVerifier\\.Router", "", false, null),
+    new Property("Glacier2\\.PermissionsVerifier\\.CollocationOptimized", "", false, null),
+    new Property("Glacier2\\.PermissionsVerifier\\.Context\\.[^\\s]+", "", false, null),
+    new Property("Glacier2\\.PermissionsVerifier", "", false, null),
+    new Property("Glacier2\\.ReturnClientProxy", "", false, null),
+    new Property("Glacier2\\.SSLPermissionsVerifier\\.EndpointSelection", "", false, null),
+    new Property("Glacier2\\.SSLPermissionsVerifier\\.ConnectionCached", "", false, null),
+    new Property("Glacier2\\.SSLPermissionsVerifier\\.PreferSecure", "", false, null),
+    new Property("Glacier2\\.SSLPermissionsVerifier\\.LocatorCacheTimeout", "", false, null),
+    new Property("Glacier2\\.SSLPermissionsVerifier\\.InvocationTimeout", "", false, null),
+    new Property("Glacier2\\.SSLPermissionsVerifier\\.Locator", "", false, null),
+    new Property("Glacier2\\.SSLPermissionsVerifier\\.Router", "", false, null),
+    new Property("Glacier2\\.SSLPermissionsVerifier\\.CollocationOptimized", "", false, null),
+    new Property("Glacier2\\.SSLPermissionsVerifier\\.Context\\.[^\\s]+", "", false, null),
+    new Property("Glacier2\\.SSLPermissionsVerifier", "", false, null),
+    new Property("Glacier2\\.RoutingTable\\.MaxSize", "", false, null),
+    new Property("Glacier2\\.Server\\.ACM\\.Timeout", "", false, null),
+    new Property("Glacier2\\.Server\\.ACM\\.Heartbeat", "", false, null),
+    new Property("Glacier2\\.Server\\.ACM\\.Close", "", false, null),
+    new Property("Glacier2\\.Server\\.ACM", "", false, null),
+    new Property("Glacier2\\.Server\\.AdapterId", "", false, null),
+    new Property("Glacier2\\.Server\\.Connection\\.CloseTimeout", "10", false, null),
+    new Property("Glacier2\\.Server\\.Connection\\.ConnectTimeout", "10", false, null),
+    new Property("Glacier2\\.Server\\.Connection\\.EnableIdleCheck", "1", false, null),
+    new Property("Glacier2\\.Server\\.Connection\\.IdleTimeout", "60", false, null),
+    new Property("Glacier2\\.Server\\.Connection\\.InactivityTimeout", "300", false, null),
+    new Property("Glacier2\\.Server\\.Connection", "", false, null),
+    new Property("Glacier2\\.Server\\.Endpoints", "", false, null),
+    new Property("Glacier2\\.Server\\.Locator\\.EndpointSelection", "", false, null),
+    new Property("Glacier2\\.Server\\.Locator\\.ConnectionCached", "", false, null),
+    new Property("Glacier2\\.Server\\.Locator\\.PreferSecure", "", false, null),
+    new Property("Glacier2\\.Server\\.Locator\\.LocatorCacheTimeout", "", false, null),
+    new Property("Glacier2\\.Server\\.Locator\\.InvocationTimeout", "", false, null),
+    new Property("Glacier2\\.Server\\.Locator\\.Locator", "", false, null),
+    new Property("Glacier2\\.Server\\.Locator\\.Router", "", false, null),
+    new Property("Glacier2\\.Server\\.Locator\\.CollocationOptimized", "", false, null),
+    new Property("Glacier2\\.Server\\.Locator\\.Context\\.[^\\s]+", "", false, null),
+    new Property("Glacier2\\.Server\\.Locator", "", false, null),
+    new Property("Glacier2\\.Server\\.PublishedEndpoints", "", false, null),
+    new Property("Glacier2\\.Server\\.ReplicaGroupId", "", false, null),
+    new Property("Glacier2\\.Server\\.Router\\.EndpointSelection", "", false, null),
+    new Property("Glacier2\\.Server\\.Router\\.ConnectionCached", "", false, null),
+    new Property("Glacier2\\.Server\\.Router\\.PreferSecure", "", false, null),
+    new Property("Glacier2\\.Server\\.Router\\.LocatorCacheTimeout", "", false, null),
+    new Property("Glacier2\\.Server\\.Router\\.InvocationTimeout", "", false, null),
+    new Property("Glacier2\\.Server\\.Router\\.Locator", "", false, null),
+    new Property("Glacier2\\.Server\\.Router\\.Router", "", false, null),
+    new Property("Glacier2\\.Server\\.Router\\.CollocationOptimized", "", false, null),
+    new Property("Glacier2\\.Server\\.Router\\.Context\\.[^\\s]+", "", false, null),
+    new Property("Glacier2\\.Server\\.Router", "", false, null),
+    new Property("Glacier2\\.Server\\.ProxyOptions", "", false, null),
+    new Property("Glacier2\\.Server\\.ThreadPool\\.Size", "", false, null),
+    new Property("Glacier2\\.Server\\.ThreadPool\\.SizeMax", "", false, null),
+    new Property("Glacier2\\.Server\\.ThreadPool\\.SizeWarn", "", false, null),
+    new Property("Glacier2\\.Server\\.ThreadPool\\.StackSize", "", false, null),
+    new Property("Glacier2\\.Server\\.ThreadPool\\.Serialize", "", false, null),
+    new Property("Glacier2\\.Server\\.ThreadPool\\.ThreadIdleTime", "", false, null),
+    new Property("Glacier2\\.Server\\.ThreadPool\\.ThreadPriority", "", false, null),
+    new Property("Glacier2\\.Server\\.MessageSizeMax", "", false, null),
+    new Property("Glacier2\\.Server\\.Buffered", "", false, null),
+    new Property("Glacier2\\.Server\\.ForwardContext", "", false, null),
+    new Property("Glacier2\\.Server\\.SleepTime", "", false, null),
+    new Property("Glacier2\\.Server\\.Trace\\.Override", "", false, null),
+    new Property("Glacier2\\.Server\\.Trace\\.Request", "", false, null),
+    new Property("Glacier2\\.SessionManager\\.EndpointSelection", "", false, null),
+    new Property("Glacier2\\.SessionManager\\.ConnectionCached", "", false, null),
+    new Property("Glacier2\\.SessionManager\\.PreferSecure", "", false, null),
+    new Property("Glacier2\\.SessionManager\\.LocatorCacheTimeout", "", false, null),
+    new Property("Glacier2\\.SessionManager\\.InvocationTimeout", "", false, null),
+    new Property("Glacier2\\.SessionManager\\.Locator", "", false, null),
+    new Property("Glacier2\\.SessionManager\\.Router", "", false, null),
+    new Property("Glacier2\\.SessionManager\\.CollocationOptimized", "", false, null),
+    new Property("Glacier2\\.SessionManager\\.Context\\.[^\\s]+", "", false, null),
+    new Property("Glacier2\\.SessionManager", "", false, null),
+    new Property("Glacier2\\.SSLSessionManager\\.EndpointSelection", "", false, null),
+    new Property("Glacier2\\.SSLSessionManager\\.ConnectionCached", "", false, null),
+    new Property("Glacier2\\.SSLSessionManager\\.PreferSecure", "", false, null),
+    new Property("Glacier2\\.SSLSessionManager\\.LocatorCacheTimeout", "", false, null),
+    new Property("Glacier2\\.SSLSessionManager\\.InvocationTimeout", "", false, null),
+    new Property("Glacier2\\.SSLSessionManager\\.Locator", "", false, null),
+    new Property("Glacier2\\.SSLSessionManager\\.Router", "", false, null),
+    new Property("Glacier2\\.SSLSessionManager\\.CollocationOptimized", "", false, null),
+    new Property("Glacier2\\.SSLSessionManager\\.Context\\.[^\\s]+", "", false, null),
+    new Property("Glacier2\\.SSLSessionManager", "", false, null),
+    new Property("Glacier2\\.Trace\\.RoutingTable", "", false, null),
+    new Property("Glacier2\\.Trace\\.Session", "", false, null),
     null
   };
 
   public static final Property Glacier2CryptPermissionsVerifierProps[] = {
-    new Property("Glacier2CryptPermissionsVerifier\\.[^\\s]+\\.PermissionsVerifier", false, null),
     new Property(
-        "Glacier2CryptPermissionsVerifier\\.[^\\s]+\\.AdminPermissionsVerifier", false, null),
+        "Glacier2CryptPermissionsVerifier\\.[^\\s]+\\.PermissionsVerifier", "", false, null),
+    new Property(
+        "Glacier2CryptPermissionsVerifier\\.[^\\s]+\\.AdminPermissionsVerifier", "", false, null),
     null
   };
 
diff --git a/java/test/src/main/java/test/Ice/properties/Client.java b/java/test/src/main/java/test/Ice/properties/Client.java
index 943b7638de8..8c2e305b5fb 100644
--- a/java/test/src/main/java/test/Ice/properties/Client.java
+++ b/java/test/src/main/java/test/Ice/properties/Client.java
@@ -92,6 +92,50 @@ public void run(String[] args) {
       }
       System.out.println("ok");
     }
+
+    {
+      System.out.print("testing ice properties with set default values...");
+      Properties properties = Util.createProperties();
+
+      String toStringMode = properties.getIceProperty("Ice.ToStringMode");
+      test(toStringMode.equals("Unicode"));
+
+      int closeTimeout = properties.getIcePropertyAsInt("Ice.Connection.CloseTimeout");
+      test(closeTimeout == 10);
+
+      String[] retryIntervals = properties.getIcePropertyAsList("Ice.RetryIntervals");
+      test(retryIntervals.length == 1);
+      test(retryIntervals[0].equals("0"));
+
+      System.out.println("ok");
+    }
+
+    {
+      System.out.print("testing ice properties with unset default values...");
+      Properties properties = Util.createProperties();
+
+      String stringValue = properties.getIceProperty("IceSSL.CAs");
+      test(stringValue.isEmpty());
+
+      int intValue = properties.getIcePropertyAsInt("IceSSL.CAs");
+      test(intValue == 0);
+
+      String[] listValue = properties.getIcePropertyAsList("IceSSL.CAs");
+      test(listValue.length == 0);
+
+      System.out.println("ok");
+    }
+
+    {
+      System.out.print("testing that getting an unknown ice property throws an exception...");
+      Properties properties = Util.createProperties();
+      try {
+        properties.getIceProperty("Ice.UnknownProperty");
+        test(false);
+      } catch (IllegalArgumentException ex) {
+      }
+      System.out.println("ok");
+    }
   }
 
   private static String configPath = "./config/\u4E2D\u56FD_client.config";
diff --git a/js/src/Ice/PropertiesI.js b/js/src/Ice/PropertiesI.js
index 8b116462177..cd4487b8c0f 100644
--- a/js/src/Ice/PropertiesI.js
+++ b/js/src/Ice/PropertiesI.js
@@ -56,6 +56,11 @@ class Properties
         return this.getPropertyWithDefault(key, "");
     }
 
+    getIceProperty(key)
+    {
+        return this.getPropertyWithDefault(key, Properties.getDefaultProperty(key));
+    }
+
     getPropertyWithDefault(key, value)
     {
         const pv = this._properties.get(key);
@@ -75,6 +80,17 @@ class Properties
         return this.getPropertyAsIntWithDefault(key, 0);
     }
 
+    getIcePropertyAsInt(key)
+    {
+        const defaultValueString = Properties.getDefaultProperty(key);
+        var defaultValue = 0;
+        if (defaultValueString != "")
+        {
+            defaultValue = parseInt(defaultValueString);
+        }
+        return this.getPropertyAsIntWithDefault(key, defaultValue);
+    }
+
     getPropertyAsIntWithDefault(key, value)
     {
         const pv = this._properties.get(key);
@@ -94,6 +110,12 @@ class Properties
         return this.getPropertyAsListWithDefault(key, 0);
     }
 
+    getIcePropertyAsList(key)
+    {
+        var defaultPropertyList = StringUtil.splitString(Properties.getDefaultProperty(key), ", \t\r\n");
+        return this.getPropertyAsListWithDefault(key, defaultPropertyList);
+    }
+
     getPropertyAsListWithDefault(key, value)
     {
         if(value === undefined || value === null)
@@ -148,79 +170,18 @@ class Properties
             key = key.trim();
         }
 
-        //
-        // Check if the property is legal.
-        //
-        const logger = getProcessLogger();
         if(key === null || key.length === 0)
         {
             throw new InitializationException("Attempt to set property with empty key");
         }
 
-        let dotPos = key.indexOf(".");
-        if(dotPos !== -1)
-        {
-            const prefix = key.substr(0, dotPos);
-            for(let i = 0; i < PropertyNames.validProps.length; ++i)
-            {
-                let pattern = PropertyNames.validProps[i][0].pattern;
-                dotPos = pattern.indexOf(".");
-                //
-                // Each top level prefix describes a non-empty namespace. Having a string without a
-                // prefix followed by a dot is an error.
-                //
-                Debug.assert(dotPos != -1);
-                if(pattern.substring(0, dotPos - 1) != prefix)
-                {
-                    continue;
-                }
-
-                let found = false;
-                let mismatchCase = false;
-                let otherKey;
-                for(let j = 0; j < PropertyNames.validProps[i][j].length && !found; ++j)
-                {
-                    pattern = PropertyNames.validProps[i][j].pattern();
-                    let pComp = new RegExp(pattern);
-                    found = pComp.test(key);
-
-                    if(found && PropertyNames.validProps[i][j].deprecated)
-                    {
-                        logger.warning("deprecated property: " + key);
-                        if(PropertyNames.validProps[i][j].deprecatedBy !== null)
-                        {
-                            key = PropertyNames.validProps[i][j].deprecatedBy;
-                        }
-                    }
-
-                    if(found)
-                    {
-                        break;
-                    }
-                    else
-                    {
-                        pComp = new RegExp(pattern.toUpperCase());
-                        found = pComp.test(key.toUpperCase());
-                        if(found)
-                        {
-                            mismatchCase = true;
-                            otherKey = pattern.substr(2);
-                            otherKey = otherKey.substr(0, otherKey.length - 1);
-                            otherKey = otherKey.replace(/\\/g, "");
-                            break;
-                        }
-                    }
-                }
+        // Find the property, log warnings if necessary
+        const prop = Properties.findProperty(key, true);
 
-                if(!found)
-                {
-                    logger.warning("unknown property: " + key);
-                }
-                else if(mismatchCase)
-                {
-                    logger.warning("unknown property: `" + key + "'; did you mean `" + otherKey + "'");
-                }
-            }
+        // If the property is deprecated by another property, use the new property key
+        if (prop !== null && prop.deprecatedBy != null)
+        {
+            key = prop.deprecatedBy;
         }
 
         //
@@ -495,6 +456,84 @@ class Properties
     {
         return new Properties(args, defaults);
     }
+
+    static findProperty(key, logWarnings)
+    {
+        // Check if the property is a known Ice property and log warnings if necessary
+        const logger = getProcessLogger();
+
+        let dotPos = key.indexOf(".");
+        if(dotPos !== -1)
+        {
+            const prefix = key.substr(0, dotPos);
+            for(let i = 0; i < PropertyNames.validProps.length; ++i)
+            {
+                let pattern = PropertyNames.validProps[i][0].pattern;
+                dotPos = pattern.indexOf(".");
+                //
+                // Each top level prefix describes a non-empty namespace. Having a string without a
+                // prefix followed by a dot is an error.
+                //
+                Debug.assert(dotPos != -1);
+
+                // If the prefix is not the same, skip to the next set of properties
+                if(pattern.substring(1, dotPos) != prefix)
+                {
+                    continue;
+                }
+
+                for(let j = 0; j < PropertyNames.validProps[i].length; ++j)
+                {
+                    const prop = PropertyNames.validProps[i][j];
+                    let pComp = new RegExp(prop.pattern);
+
+                    if (pComp.test(key))
+                    {
+                        if (prop.deprecated && logWarnings)
+                        {
+                            logger.warning("deprecated property: " + key);
+                        }
+                        return prop;
+                    }
+
+                    // Check for case-insensitive match
+                    pComp = new RegExp(pattern.toUpperCase());
+                    if(pComp.test(key.toUpperCase()))
+                    {
+                        if (logWarnings)
+                        {
+                            var otherKey = pattern.substr(2);
+                            otherKey = otherKey.substr(0, otherKey.length - 1);
+                            otherKey = otherKey.replace(/\\/g, "");
+                            logger.warning("unknown property: `" + key + "'; did you mean `" + otherKey + "'");
+                        }
+                        return null;
+                    }
+                }
+
+                // If we get here, the prefix is valid but the property is unknown
+                if (logWarnings)
+                {
+                    logger.warning("unknown property: " + key);
+                }
+                return null;
+            }
+        }
+
+        // The key does not match a known Ice property
+        return null;
+    }
+
+    static getDefaultProperty(key)
+    {
+        // Find the property, don't log any warnings.
+        const prop = Properties.findProperty(key, false);
+        if (prop === null)
+        {
+            throw new Error("unknown ice property: " + key);
+        }
+        return prop.defaultValue;
+    }
 }
 
 Ice.Properties = Properties;
diff --git a/js/src/Ice/Property.js b/js/src/Ice/Property.js
index 62da110a6c1..f3f00312f9e 100644
--- a/js/src/Ice/Property.js
+++ b/js/src/Ice/Property.js
@@ -6,9 +6,10 @@ const Ice = require("../Ice/ModuleRegistry").Ice;
 
 Ice.Property = class
 {
-    constructor(pattern, deprecated, deprecatedBy)
+    constructor(pattern, defaultValue, deprecated, deprecatedBy)
     {
         this._pattern = pattern;
+        this._default = defaultValue;
         this._deprecated = deprecated;
         this._deprecatedBy = deprecatedBy;
     }
@@ -18,6 +19,11 @@ Ice.Property = class
         return this._pattern;
     }
 
+    get defaultValue()
+    {
+        return this._default;
+    }
+
     get deprecated()
     {
         return this._deprecated;
diff --git a/js/src/Ice/PropertyNames.js b/js/src/Ice/PropertyNames.js
index 723436cbc9d..b5556701296 100644
--- a/js/src/Ice/PropertyNames.js
+++ b/js/src/Ice/PropertyNames.js
@@ -1,7 +1,4 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Apr 26 11:24:58 2024
+// Copyright (c) ZeroC, Inc. All rights reserved.// Generated by makeprops.py from file ./config/PropertyNames.xml, Wed May  1 14:40:59 2024
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -14,195 +11,195 @@ const PropertyNames = {};
 const Property = Ice.Property;
 PropertyNames.IceProps =
 [
-    new Property("/^Ice\.AcceptClassCycles/", false, null),
-    new Property("/^Ice\.ACM\.Client/", true, null),
-    new Property("/^Ice\.ACM\.Server/", true, null),
-    new Property("/^Ice\.ACM\.Timeout/", false, null),
-    new Property("/^Ice\.ACM\.Heartbeat/", false, null),
-    new Property("/^Ice\.ACM\.Close/", false, null),
-    new Property("/^Ice\.ACM/", false, null),
-    new Property("/^Ice\.ACM\.Client\.Timeout/", false, null),
-    new Property("/^Ice\.ACM\.Client\.Heartbeat/", false, null),
-    new Property("/^Ice\.ACM\.Client\.Close/", false, null),
-    new Property("/^Ice\.ACM\.Client/", false, null),
-    new Property("/^Ice\.ACM\.Server\.Timeout/", false, null),
-    new Property("/^Ice\.ACM\.Server\.Heartbeat/", false, null),
-    new Property("/^Ice\.ACM\.Server\.Close/", false, null),
-    new Property("/^Ice\.ACM\.Server/", false, null),
-    new Property("/^Ice\.Admin\.ACM\.Timeout/", false, null),
-    new Property("/^Ice\.Admin\.ACM\.Heartbeat/", false, null),
-    new Property("/^Ice\.Admin\.ACM\.Close/", false, null),
-    new Property("/^Ice\.Admin\.ACM/", false, null),
-    new Property("/^Ice\.Admin\.AdapterId/", false, null),
-    new Property("/^Ice\.Admin\.Connection\.CloseTimeout/", false, null),
-    new Property("/^Ice\.Admin\.Connection\.ConnectTimeout/", false, null),
-    new Property("/^Ice\.Admin\.Connection\.EnableIdleCheck/", false, null),
-    new Property("/^Ice\.Admin\.Connection\.IdleTimeout/", false, null),
-    new Property("/^Ice\.Admin\.Connection\.InactivityTimeout/", false, null),
-    new Property("/^Ice\.Admin\.Connection/", false, null),
-    new Property("/^Ice\.Admin\.Endpoints/", false, null),
-    new Property("/^Ice\.Admin\.Locator\.EndpointSelection/", false, null),
-    new Property("/^Ice\.Admin\.Locator\.ConnectionCached/", false, null),
-    new Property("/^Ice\.Admin\.Locator\.PreferSecure/", false, null),
-    new Property("/^Ice\.Admin\.Locator\.LocatorCacheTimeout/", false, null),
-    new Property("/^Ice\.Admin\.Locator\.InvocationTimeout/", false, null),
-    new Property("/^Ice\.Admin\.Locator\.Locator/", false, null),
-    new Property("/^Ice\.Admin\.Locator\.Router/", false, null),
-    new Property("/^Ice\.Admin\.Locator\.CollocationOptimized/", false, null),
-    new Property("/^Ice\.Admin\.Locator\.Context\../", false, null),
-    new Property("/^Ice\.Admin\.Locator/", false, null),
-    new Property("/^Ice\.Admin\.PublishedEndpoints/", false, null),
-    new Property("/^Ice\.Admin\.ReplicaGroupId/", false, null),
-    new Property("/^Ice\.Admin\.Router\.EndpointSelection/", false, null),
-    new Property("/^Ice\.Admin\.Router\.ConnectionCached/", false, null),
-    new Property("/^Ice\.Admin\.Router\.PreferSecure/", false, null),
-    new Property("/^Ice\.Admin\.Router\.LocatorCacheTimeout/", false, null),
-    new Property("/^Ice\.Admin\.Router\.InvocationTimeout/", false, null),
-    new Property("/^Ice\.Admin\.Router\.Locator/", false, null),
-    new Property("/^Ice\.Admin\.Router\.Router/", false, null),
-    new Property("/^Ice\.Admin\.Router\.CollocationOptimized/", false, null),
-    new Property("/^Ice\.Admin\.Router\.Context\../", false, null),
-    new Property("/^Ice\.Admin\.Router/", false, null),
-    new Property("/^Ice\.Admin\.ProxyOptions/", false, null),
-    new Property("/^Ice\.Admin\.ThreadPool\.Size/", false, null),
-    new Property("/^Ice\.Admin\.ThreadPool\.SizeMax/", false, null),
-    new Property("/^Ice\.Admin\.ThreadPool\.SizeWarn/", false, null),
-    new Property("/^Ice\.Admin\.ThreadPool\.StackSize/", false, null),
-    new Property("/^Ice\.Admin\.ThreadPool\.Serialize/", false, null),
-    new Property("/^Ice\.Admin\.ThreadPool\.ThreadIdleTime/", false, null),
-    new Property("/^Ice\.Admin\.ThreadPool\.ThreadPriority/", false, null),
-    new Property("/^Ice\.Admin\.MessageSizeMax/", false, null),
-    new Property("/^Ice\.Admin\.DelayCreation/", false, null),
-    new Property("/^Ice\.Admin\.Enabled/", false, null),
-    new Property("/^Ice\.Admin\.Facets/", false, null),
-    new Property("/^Ice\.Admin\.InstanceName/", false, null),
-    new Property("/^Ice\.Admin\.Logger\.KeepLogs/", false, null),
-    new Property("/^Ice\.Admin\.Logger\.KeepTraces/", false, null),
-    new Property("/^Ice\.Admin\.Logger\.Properties/", false, null),
-    new Property("/^Ice\.Admin\.ServerId/", false, null),
-    new Property("/^Ice\.BackgroundLocatorCacheUpdates/", false, null),
-    new Property("/^Ice\.BatchAutoFlush/", true, null),
-    new Property("/^Ice\.BatchAutoFlushSize/", false, null),
-    new Property("/^Ice\.ChangeUser/", false, null),
-    new Property("/^Ice\.ClassGraphDepthMax/", false, null),
-    new Property("/^Ice\.ClientAccessPolicyProtocol/", false, null),
-    new Property("/^Ice\.Compression\.Level/", false, null),
-    new Property("/^Ice\.Config/", false, null),
-    new Property("/^Ice\.Connection\.CloseTimeout/", false, null),
-    new Property("/^Ice\.Connection\.ConnectTimeout/", false, null),
-    new Property("/^Ice\.Connection\.EnableIdleCheck/", false, null),
-    new Property("/^Ice\.Connection\.IdleTimeout/", false, null),
-    new Property("/^Ice\.Connection\.InactivityTimeout/", false, null),
-    new Property("/^Ice\.Connection/", false, null),
-    new Property("/^Ice\.ConsoleListener/", false, null),
-    new Property("/^Ice\.Default\.CollocationOptimized/", false, null),
-    new Property("/^Ice\.Default\.EncodingVersion/", false, null),
-    new Property("/^Ice\.Default\.EndpointSelection/", false, null),
-    new Property("/^Ice\.Default\.Host/", false, null),
-    new Property("/^Ice\.Default\.Locator\.EndpointSelection/", false, null),
-    new Property("/^Ice\.Default\.Locator\.ConnectionCached/", false, null),
-    new Property("/^Ice\.Default\.Locator\.PreferSecure/", false, null),
-    new Property("/^Ice\.Default\.Locator\.LocatorCacheTimeout/", false, null),
-    new Property("/^Ice\.Default\.Locator\.InvocationTimeout/", false, null),
-    new Property("/^Ice\.Default\.Locator\.Locator/", false, null),
-    new Property("/^Ice\.Default\.Locator\.Router/", false, null),
-    new Property("/^Ice\.Default\.Locator\.CollocationOptimized/", false, null),
-    new Property("/^Ice\.Default\.Locator\.Context\../", false, null),
-    new Property("/^Ice\.Default\.Locator/", false, null),
-    new Property("/^Ice\.Default\.LocatorCacheTimeout/", false, null),
-    new Property("/^Ice\.Default\.InvocationTimeout/", false, null),
-    new Property("/^Ice\.Default\.Package/", false, null),
-    new Property("/^Ice\.Default\.PreferSecure/", false, null),
-    new Property("/^Ice\.Default\.Protocol/", false, null),
-    new Property("/^Ice\.Default\.Router\.EndpointSelection/", false, null),
-    new Property("/^Ice\.Default\.Router\.ConnectionCached/", false, null),
-    new Property("/^Ice\.Default\.Router\.PreferSecure/", false, null),
-    new Property("/^Ice\.Default\.Router\.LocatorCacheTimeout/", false, null),
-    new Property("/^Ice\.Default\.Router\.InvocationTimeout/", false, null),
-    new Property("/^Ice\.Default\.Router\.Locator/", false, null),
-    new Property("/^Ice\.Default\.Router\.Router/", false, null),
-    new Property("/^Ice\.Default\.Router\.CollocationOptimized/", false, null),
-    new Property("/^Ice\.Default\.Router\.Context\../", false, null),
-    new Property("/^Ice\.Default\.Router/", false, null),
-    new Property("/^Ice\.Default\.SlicedFormat/", false, null),
-    new Property("/^Ice\.Default\.SourceAddress/", false, null),
-    new Property("/^Ice\.Default\.Timeout/", false, null),
-    new Property("/^Ice\.EventLog\.Source/", false, null),
-    new Property("/^Ice\.FactoryAssemblies/", false, null),
-    new Property("/^Ice\.HTTPProxyHost/", false, null),
-    new Property("/^Ice\.HTTPProxyPort/", false, null),
-    new Property("/^Ice\.ImplicitContext/", false, null),
-    new Property("/^Ice\.InitPlugins/", false, null),
-    new Property("/^Ice\.IPv4/", false, null),
-    new Property("/^Ice\.IPv6/", false, null),
-    new Property("/^Ice\.LogFile/", false, null),
-    new Property("/^Ice\.LogFile\.SizeMax/", false, null),
-    new Property("/^Ice\.LogStdErr\.Convert/", false, null),
-    new Property("/^Ice\.MessageSizeMax/", false, null),
-    new Property("/^Ice\.Nohup/", false, null),
-    new Property("/^Ice\.Override\.CloseTimeout/", false, null),
-    new Property("/^Ice\.Override\.Compress/", false, null),
-    new Property("/^Ice\.Override\.ConnectTimeout/", false, null),
-    new Property("/^Ice\.Override\.Timeout/", false, null),
-    new Property("/^Ice\.Override\.Secure/", false, null),
-    new Property("/^Ice\.Package\../", false, null),
-    new Property("/^Ice\.Plugin\../", false, null),
-    new Property("/^Ice\.PluginLoadOrder/", false, null),
-    new Property("/^Ice\.PreferIPv6Address/", false, null),
-    new Property("/^Ice\.PreloadAssemblies/", false, null),
-    new Property("/^Ice\.PrintAdapterReady/", false, null),
-    new Property("/^Ice\.PrintProcessId/", false, null),
-    new Property("/^Ice\.PrintStackTraces/", false, null),
-    new Property("/^Ice\.ProgramName/", false, null),
-    new Property("/^Ice\.RetryIntervals/", false, null),
-    new Property("/^Ice\.ServerIdleTime/", false, null),
-    new Property("/^Ice\.SOCKSProxyHost/", false, null),
-    new Property("/^Ice\.SOCKSProxyPort/", false, null),
-    new Property("/^Ice\.StdErr/", false, null),
-    new Property("/^Ice\.StdOut/", false, null),
-    new Property("/^Ice\.SyslogFacility/", false, null),
-    new Property("/^Ice\.ThreadPool\.Client\.Size/", false, null),
-    new Property("/^Ice\.ThreadPool\.Client\.SizeMax/", false, null),
-    new Property("/^Ice\.ThreadPool\.Client\.SizeWarn/", false, null),
-    new Property("/^Ice\.ThreadPool\.Client\.StackSize/", false, null),
-    new Property("/^Ice\.ThreadPool\.Client\.Serialize/", false, null),
-    new Property("/^Ice\.ThreadPool\.Client\.ThreadIdleTime/", false, null),
-    new Property("/^Ice\.ThreadPool\.Client\.ThreadPriority/", false, null),
-    new Property("/^Ice\.ThreadPool\.Server\.Size/", false, null),
-    new Property("/^Ice\.ThreadPool\.Server\.SizeMax/", false, null),
-    new Property("/^Ice\.ThreadPool\.Server\.SizeWarn/", false, null),
-    new Property("/^Ice\.ThreadPool\.Server\.StackSize/", false, null),
-    new Property("/^Ice\.ThreadPool\.Server\.Serialize/", false, null),
-    new Property("/^Ice\.ThreadPool\.Server\.ThreadIdleTime/", false, null),
-    new Property("/^Ice\.ThreadPool\.Server\.ThreadPriority/", false, null),
-    new Property("/^Ice\.ThreadPriority/", false, null),
-    new Property("/^Ice\.ToStringMode/", false, null),
-    new Property("/^Ice\.Trace\.Admin\.Properties/", false, null),
-    new Property("/^Ice\.Trace\.Admin\.Logger/", false, null),
-    new Property("/^Ice\.Trace\.Locator/", false, null),
-    new Property("/^Ice\.Trace\.Network/", false, null),
-    new Property("/^Ice\.Trace\.Protocol/", false, null),
-    new Property("/^Ice\.Trace\.Retry/", false, null),
-    new Property("/^Ice\.Trace\.Slicing/", false, null),
-    new Property("/^Ice\.Trace\.ThreadPool/", false, null),
-    new Property("/^Ice\.UDP\.RcvSize/", false, null),
-    new Property("/^Ice\.UDP\.SndSize/", false, null),
-    new Property("/^Ice\.TCP\.Backlog/", false, null),
-    new Property("/^Ice\.TCP\.RcvSize/", false, null),
-    new Property("/^Ice\.TCP\.SndSize/", false, null),
-    new Property("/^Ice\.UseApplicationClassLoader/", false, null),
-    new Property("/^Ice\.UseOSLog/", false, null),
-    new Property("/^Ice\.UseSyslog/", false, null),
-    new Property("/^Ice\.UseSystemdJournal/", false, null),
-    new Property("/^Ice\.Warn\.AMICallback/", false, null),
-    new Property("/^Ice\.Warn\.Connections/", false, null),
-    new Property("/^Ice\.Warn\.Datagrams/", false, null),
-    new Property("/^Ice\.Warn\.Dispatch/", false, null),
-    new Property("/^Ice\.Warn\.Endpoints/", false, null),
-    new Property("/^Ice\.Warn\.UnknownProperties/", false, null),
-    new Property("/^Ice\.Warn\.UnusedProperties/", false, null),
-    new Property("/^Ice\.CacheMessageBuffers/", false, null),
-    new Property("/^Ice\.ThreadInterruptSafe/", false, null),
+    new Property("^Ice\.AcceptClassCycles$", "", false, null),
+    new Property("^Ice\.ACM\.Client$", "", true, null),
+    new Property("^Ice\.ACM\.Server$", "", true, null),
+    new Property("^Ice\.ACM\.Timeout$", "", false, null),
+    new Property("^Ice\.ACM\.Heartbeat$", "", false, null),
+    new Property("^Ice\.ACM\.Close$", "", false, null),
+    new Property("^Ice\.ACM$", "", false, null),
+    new Property("^Ice\.ACM\.Client\.Timeout$", "", false, null),
+    new Property("^Ice\.ACM\.Client\.Heartbeat$", "", false, null),
+    new Property("^Ice\.ACM\.Client\.Close$", "", false, null),
+    new Property("^Ice\.ACM\.Client$", "", false, null),
+    new Property("^Ice\.ACM\.Server\.Timeout$", "", false, null),
+    new Property("^Ice\.ACM\.Server\.Heartbeat$", "", false, null),
+    new Property("^Ice\.ACM\.Server\.Close$", "", false, null),
+    new Property("^Ice\.ACM\.Server$", "", false, null),
+    new Property("^Ice\.Admin\.ACM\.Timeout$", "", false, null),
+    new Property("^Ice\.Admin\.ACM\.Heartbeat$", "", false, null),
+    new Property("^Ice\.Admin\.ACM\.Close$", "", false, null),
+    new Property("^Ice\.Admin\.ACM$", "", false, null),
+    new Property("^Ice\.Admin\.AdapterId$", "", false, null),
+    new Property("^Ice\.Admin\.Connection\.CloseTimeout$", "10", false, null),
+    new Property("^Ice\.Admin\.Connection\.ConnectTimeout$", "10", false, null),
+    new Property("^Ice\.Admin\.Connection\.EnableIdleCheck$", "1", false, null),
+    new Property("^Ice\.Admin\.Connection\.IdleTimeout$", "60", false, null),
+    new Property("^Ice\.Admin\.Connection\.InactivityTimeout$", "300", false, null),
+    new Property("^Ice\.Admin\.Connection$", "", false, null),
+    new Property("^Ice\.Admin\.Endpoints$", "", false, null),
+    new Property("^Ice\.Admin\.Locator\.EndpointSelection$", "", false, null),
+    new Property("^Ice\.Admin\.Locator\.ConnectionCached$", "", false, null),
+    new Property("^Ice\.Admin\.Locator\.PreferSecure$", "", false, null),
+    new Property("^Ice\.Admin\.Locator\.LocatorCacheTimeout$", "", false, null),
+    new Property("^Ice\.Admin\.Locator\.InvocationTimeout$", "", false, null),
+    new Property("^Ice\.Admin\.Locator\.Locator$", "", false, null),
+    new Property("^Ice\.Admin\.Locator\.Router$", "", false, null),
+    new Property("^Ice\.Admin\.Locator\.CollocationOptimized$", "", false, null),
+    new Property("^Ice\.Admin\.Locator\.Context\..$", "", false, null),
+    new Property("^Ice\.Admin\.Locator$", "", false, null),
+    new Property("^Ice\.Admin\.PublishedEndpoints$", "", false, null),
+    new Property("^Ice\.Admin\.ReplicaGroupId$", "", false, null),
+    new Property("^Ice\.Admin\.Router\.EndpointSelection$", "", false, null),
+    new Property("^Ice\.Admin\.Router\.ConnectionCached$", "", false, null),
+    new Property("^Ice\.Admin\.Router\.PreferSecure$", "", false, null),
+    new Property("^Ice\.Admin\.Router\.LocatorCacheTimeout$", "", false, null),
+    new Property("^Ice\.Admin\.Router\.InvocationTimeout$", "", false, null),
+    new Property("^Ice\.Admin\.Router\.Locator$", "", false, null),
+    new Property("^Ice\.Admin\.Router\.Router$", "", false, null),
+    new Property("^Ice\.Admin\.Router\.CollocationOptimized$", "", false, null),
+    new Property("^Ice\.Admin\.Router\.Context\..$", "", false, null),
+    new Property("^Ice\.Admin\.Router$", "", false, null),
+    new Property("^Ice\.Admin\.ProxyOptions$", "", false, null),
+    new Property("^Ice\.Admin\.ThreadPool\.Size$", "", false, null),
+    new Property("^Ice\.Admin\.ThreadPool\.SizeMax$", "", false, null),
+    new Property("^Ice\.Admin\.ThreadPool\.SizeWarn$", "", false, null),
+    new Property("^Ice\.Admin\.ThreadPool\.StackSize$", "", false, null),
+    new Property("^Ice\.Admin\.ThreadPool\.Serialize$", "", false, null),
+    new Property("^Ice\.Admin\.ThreadPool\.ThreadIdleTime$", "", false, null),
+    new Property("^Ice\.Admin\.ThreadPool\.ThreadPriority$", "", false, null),
+    new Property("^Ice\.Admin\.MessageSizeMax$", "", false, null),
+    new Property("^Ice\.Admin\.DelayCreation$", "", false, null),
+    new Property("^Ice\.Admin\.Enabled$", "", false, null),
+    new Property("^Ice\.Admin\.Facets$", "", false, null),
+    new Property("^Ice\.Admin\.InstanceName$", "", false, null),
+    new Property("^Ice\.Admin\.Logger\.KeepLogs$", "", false, null),
+    new Property("^Ice\.Admin\.Logger\.KeepTraces$", "", false, null),
+    new Property("^Ice\.Admin\.Logger\.Properties$", "", false, null),
+    new Property("^Ice\.Admin\.ServerId$", "", false, null),
+    new Property("^Ice\.BackgroundLocatorCacheUpdates$", "", false, null),
+    new Property("^Ice\.BatchAutoFlush$", "", true, null),
+    new Property("^Ice\.BatchAutoFlushSize$", "", false, null),
+    new Property("^Ice\.ChangeUser$", "", false, null),
+    new Property("^Ice\.ClassGraphDepthMax$", "", false, null),
+    new Property("^Ice\.ClientAccessPolicyProtocol$", "", false, null),
+    new Property("^Ice\.Compression\.Level$", "", false, null),
+    new Property("^Ice\.Config$", "", false, null),
+    new Property("^Ice\.Connection\.CloseTimeout$", "10", false, null),
+    new Property("^Ice\.Connection\.ConnectTimeout$", "10", false, null),
+    new Property("^Ice\.Connection\.EnableIdleCheck$", "1", false, null),
+    new Property("^Ice\.Connection\.IdleTimeout$", "60", false, null),
+    new Property("^Ice\.Connection\.InactivityTimeout$", "300", false, null),
+    new Property("^Ice\.Connection$", "", false, null),
+    new Property("^Ice\.ConsoleListener$", "", false, null),
+    new Property("^Ice\.Default\.CollocationOptimized$", "", false, null),
+    new Property("^Ice\.Default\.EncodingVersion$", "", false, null),
+    new Property("^Ice\.Default\.EndpointSelection$", "", false, null),
+    new Property("^Ice\.Default\.Host$", "", false, null),
+    new Property("^Ice\.Default\.Locator\.EndpointSelection$", "", false, null),
+    new Property("^Ice\.Default\.Locator\.ConnectionCached$", "", false, null),
+    new Property("^Ice\.Default\.Locator\.PreferSecure$", "", false, null),
+    new Property("^Ice\.Default\.Locator\.LocatorCacheTimeout$", "", false, null),
+    new Property("^Ice\.Default\.Locator\.InvocationTimeout$", "", false, null),
+    new Property("^Ice\.Default\.Locator\.Locator$", "", false, null),
+    new Property("^Ice\.Default\.Locator\.Router$", "", false, null),
+    new Property("^Ice\.Default\.Locator\.CollocationOptimized$", "", false, null),
+    new Property("^Ice\.Default\.Locator\.Context\..$", "", false, null),
+    new Property("^Ice\.Default\.Locator$", "", false, null),
+    new Property("^Ice\.Default\.LocatorCacheTimeout$", "", false, null),
+    new Property("^Ice\.Default\.InvocationTimeout$", "", false, null),
+    new Property("^Ice\.Default\.Package$", "", false, null),
+    new Property("^Ice\.Default\.PreferSecure$", "", false, null),
+    new Property("^Ice\.Default\.Protocol$", "", false, null),
+    new Property("^Ice\.Default\.Router\.EndpointSelection$", "", false, null),
+    new Property("^Ice\.Default\.Router\.ConnectionCached$", "", false, null),
+    new Property("^Ice\.Default\.Router\.PreferSecure$", "", false, null),
+    new Property("^Ice\.Default\.Router\.LocatorCacheTimeout$", "", false, null),
+    new Property("^Ice\.Default\.Router\.InvocationTimeout$", "", false, null),
+    new Property("^Ice\.Default\.Router\.Locator$", "", false, null),
+    new Property("^Ice\.Default\.Router\.Router$", "", false, null),
+    new Property("^Ice\.Default\.Router\.CollocationOptimized$", "", false, null),
+    new Property("^Ice\.Default\.Router\.Context\..$", "", false, null),
+    new Property("^Ice\.Default\.Router$", "", false, null),
+    new Property("^Ice\.Default\.SlicedFormat$", "", false, null),
+    new Property("^Ice\.Default\.SourceAddress$", "", false, null),
+    new Property("^Ice\.Default\.Timeout$", "", false, null),
+    new Property("^Ice\.EventLog\.Source$", "", false, null),
+    new Property("^Ice\.FactoryAssemblies$", "", false, null),
+    new Property("^Ice\.HTTPProxyHost$", "", false, null),
+    new Property("^Ice\.HTTPProxyPort$", "", false, null),
+    new Property("^Ice\.ImplicitContext$", "", false, null),
+    new Property("^Ice\.InitPlugins$", "", false, null),
+    new Property("^Ice\.IPv4$", "", false, null),
+    new Property("^Ice\.IPv6$", "", false, null),
+    new Property("^Ice\.LogFile$", "", false, null),
+    new Property("^Ice\.LogFile\.SizeMax$", "", false, null),
+    new Property("^Ice\.LogStdErr\.Convert$", "", false, null),
+    new Property("^Ice\.MessageSizeMax$", "", false, null),
+    new Property("^Ice\.Nohup$", "", false, null),
+    new Property("^Ice\.Override\.CloseTimeout$", "", false, null),
+    new Property("^Ice\.Override\.Compress$", "", false, null),
+    new Property("^Ice\.Override\.ConnectTimeout$", "", false, null),
+    new Property("^Ice\.Override\.Timeout$", "", false, null),
+    new Property("^Ice\.Override\.Secure$", "", false, null),
+    new Property("^Ice\.Package\..$", "", false, null),
+    new Property("^Ice\.Plugin\..$", "", false, null),
+    new Property("^Ice\.PluginLoadOrder$", "", false, null),
+    new Property("^Ice\.PreferIPv6Address$", "", false, null),
+    new Property("^Ice\.PreloadAssemblies$", "", false, null),
+    new Property("^Ice\.PrintAdapterReady$", "", false, null),
+    new Property("^Ice\.PrintProcessId$", "", false, null),
+    new Property("^Ice\.PrintStackTraces$", "", false, null),
+    new Property("^Ice\.ProgramName$", "", false, null),
+    new Property("^Ice\.RetryIntervals$", "0", false, null),
+    new Property("^Ice\.ServerIdleTime$", "", false, null),
+    new Property("^Ice\.SOCKSProxyHost$", "", false, null),
+    new Property("^Ice\.SOCKSProxyPort$", "", false, null),
+    new Property("^Ice\.StdErr$", "", false, null),
+    new Property("^Ice\.StdOut$", "", false, null),
+    new Property("^Ice\.SyslogFacility$", "", false, null),
+    new Property("^Ice\.ThreadPool\.Client\.Size$", "", false, null),
+    new Property("^Ice\.ThreadPool\.Client\.SizeMax$", "", false, null),
+    new Property("^Ice\.ThreadPool\.Client\.SizeWarn$", "", false, null),
+    new Property("^Ice\.ThreadPool\.Client\.StackSize$", "", false, null),
+    new Property("^Ice\.ThreadPool\.Client\.Serialize$", "", false, null),
+    new Property("^Ice\.ThreadPool\.Client\.ThreadIdleTime$", "", false, null),
+    new Property("^Ice\.ThreadPool\.Client\.ThreadPriority$", "", false, null),
+    new Property("^Ice\.ThreadPool\.Server\.Size$", "", false, null),
+    new Property("^Ice\.ThreadPool\.Server\.SizeMax$", "", false, null),
+    new Property("^Ice\.ThreadPool\.Server\.SizeWarn$", "", false, null),
+    new Property("^Ice\.ThreadPool\.Server\.StackSize$", "", false, null),
+    new Property("^Ice\.ThreadPool\.Server\.Serialize$", "", false, null),
+    new Property("^Ice\.ThreadPool\.Server\.ThreadIdleTime$", "", false, null),
+    new Property("^Ice\.ThreadPool\.Server\.ThreadPriority$", "", false, null),
+    new Property("^Ice\.ThreadPriority$", "", false, null),
+    new Property("^Ice\.ToStringMode$", "Unicode", false, null),
+    new Property("^Ice\.Trace\.Admin\.Properties$", "", false, null),
+    new Property("^Ice\.Trace\.Admin\.Logger$", "", false, null),
+    new Property("^Ice\.Trace\.Locator$", "", false, null),
+    new Property("^Ice\.Trace\.Network$", "", false, null),
+    new Property("^Ice\.Trace\.Protocol$", "", false, null),
+    new Property("^Ice\.Trace\.Retry$", "", false, null),
+    new Property("^Ice\.Trace\.Slicing$", "", false, null),
+    new Property("^Ice\.Trace\.ThreadPool$", "", false, null),
+    new Property("^Ice\.UDP\.RcvSize$", "", false, null),
+    new Property("^Ice\.UDP\.SndSize$", "", false, null),
+    new Property("^Ice\.TCP\.Backlog$", "", false, null),
+    new Property("^Ice\.TCP\.RcvSize$", "", false, null),
+    new Property("^Ice\.TCP\.SndSize$", "", false, null),
+    new Property("^Ice\.UseApplicationClassLoader$", "", false, null),
+    new Property("^Ice\.UseOSLog$", "", false, null),
+    new Property("^Ice\.UseSyslog$", "", false, null),
+    new Property("^Ice\.UseSystemdJournal$", "", false, null),
+    new Property("^Ice\.Warn\.AMICallback$", "", false, null),
+    new Property("^Ice\.Warn\.Connections$", "", false, null),
+    new Property("^Ice\.Warn\.Datagrams$", "", false, null),
+    new Property("^Ice\.Warn\.Dispatch$", "", false, null),
+    new Property("^Ice\.Warn\.Endpoints$", "", false, null),
+    new Property("^Ice\.Warn\.UnknownProperties$", "", false, null),
+    new Property("^Ice\.Warn\.UnusedProperties$", "", false, null),
+    new Property("^Ice\.CacheMessageBuffers$", "", false, null),
+    new Property("^Ice\.ThreadInterruptSafe$", "", false, null),
 ];
 
 PropertyNames.validProps =
diff --git a/js/test/Ice/properties/Client.js b/js/test/Ice/properties/Client.js
index cf8e436d11e..6abe3912c4a 100644
--- a/js/test/Ice/properties/Client.js
+++ b/js/test/Ice/properties/Client.js
@@ -83,6 +83,54 @@
                         });
             }
             out.writeLine("ok");
+
+            {
+                out.write("testing ice properties with set default values...");
+                const properties = Ice.createProperties();
+
+                const toStringMode = properties.getIceProperty("Ice.ToStringMode");
+                test(toStringMode == "Unicode");
+
+                const closeTimeout = properties.getIcePropertyAsInt("Ice.Connection.CloseTimeout");
+                test(closeTimeout == 10);
+
+                const retryIntervals = properties.getIcePropertyAsList("Ice.RetryIntervals");
+                test(retryIntervals.length == 1);
+                test(retryIntervals[0] == "0");
+
+                out.writeLine("ok");
+            }
+
+            {
+                out.write("testing ice properties with unset default values...");
+                const properties = Ice.createProperties();
+
+                const stringValue = properties.getIceProperty("Ice.Admin.Router");
+                test(stringValue == "");
+
+                const intValue = properties.getIcePropertyAsInt("Ice.Admin.Router");
+                test(intValue == 0);
+
+                const listValue = properties.getIcePropertyAsList("Ice.Admin.Router");
+                test(listValue.length == 0);
+
+                out.writeLine("ok");
+            }
+
+            {
+                out.write("testing that getting an unknown ice property throws an exception...");
+                const properties = Ice.createProperties();
+                try
+                {
+                    properties.getIceProperty("Ice.UnknownProperty");
+                    test(false);
+                }
+                catch(ex)
+                {
+                    test(ex.message == "unknown ice property: Ice.UnknownProperty");
+                }
+                out.writeLine("ok");
+            }
         }
 
         async run(args)
diff --git a/matlab/lib/+Ice/Properties.m b/matlab/lib/+Ice/Properties.m
index 13f2604df51..b5b562c321c 100644
--- a/matlab/lib/+Ice/Properties.m
+++ b/matlab/lib/+Ice/Properties.m
@@ -8,10 +8,13 @@
     %
     % Property Methods:
     %   getProperty - Get a property by key.
+    %   getIceProperty - Get an Ice property by key.
     %   getPropertyWithDefault - Get a property by key.
     %   getPropertyAsInt - Get a property as an integer.
+    %   getIcePropertyAsInt - Get an Ice property as an integer.
     %   getPropertyAsIntWithDefault - Get a property as an integer.
     %   getPropertyAsList - Get a property as a list of strings.
+    %   getIcePropertyAsList - Get an Ice property as a list of strings.
     %   getPropertyAsListWithDefault - Get a property as a list of strings.
     %   getPropertiesForPrefix - Get all properties whose keys begins with
     %     a prefix.
@@ -45,6 +48,17 @@
 
             r = obj.iceCallWithResult('getProperty', key);
         end
+        function r = getIceProperty(obj, key)
+            % getIceProperty - Get an Ice property by key. If the property is not set,
+            %   its default value is returned.
+            %
+            % Parameters:
+            %   key (char) - The property key.
+            %
+            % Returns (char) - The property value.
+
+            r = obj.iceCallWithResult('getIceProperty', key);
+        end
         function r = getPropertyWithDefault(obj, key, def)
             % getPropertyWithDefault - Get a property by key. If the property
             %   is not set, the given default value is returned.
@@ -71,6 +85,19 @@
             obj.iceCall('getPropertyAsInt', key, v);
             r = v.Value;
         end
+        function r = getIcePropertyAsInt(obj, key)
+            % getIcePropertyAsInt - Get an Ice property as an integer. If the property
+            %   is not set, its default value is returned.
+            %
+            % Parameters:
+            %   key (char) - The property key.
+            %
+            % Returns (int32) - The property value interpreted as an integer.
+
+            v = libpointer('int32Ptr', 0);
+            obj.iceCall('getIcePropertyAsInt', key, v);
+            r = v.Value;
+        end
         function r = getPropertyAsIntWithDefault(obj, key, def)
             % getPropertyAsIntWithDefault - Get a property as an integer. If
             %   the property is not set, the given default value is returned.
@@ -105,6 +132,24 @@
 
             r = obj.iceCallWithResult('getPropertyAsList', key);
         end
+        function r = getIcePropertyAsList(obj, key)
+            % getIcePropertyAsList - Get an Ice property as a list of strings. The
+            %   strings must be separated by whitespace or comma. If the
+            %   property is not set, its default is returned. The strings
+            %   in the list can contain whitespace and commas if they are
+            %   enclosed in single or double quotes. If quotes are mismatched,
+            %   an empty list is returned. Within single quotes or double
+            %   quotes, you can escape the quote in question with \, e.g.
+            %   O'Reilly can be written as O'Reilly, "O'Reilly" or 'O\'Reilly'.
+            %
+            % Parameters:
+            %   key (char) - The property key.
+            %
+            % Returns (cell arry of char) - The property value interpreted as
+            %   a list of strings.
+
+            r = obj.iceCallWithResult('getIcePropertyAsList', key);
+        end
         function r = getPropertyAsListWithDefault(obj, key, def)
             % getPropertyAsListWithDefault - Get a property as a list of
             %   strings. The strings must be separated by whitespace or comma.
diff --git a/matlab/src/Properties.cpp b/matlab/src/Properties.cpp
index 976c4ebae12..12e33772dad 100644
--- a/matlab/src/Properties.cpp
+++ b/matlab/src/Properties.cpp
@@ -55,6 +55,18 @@ extern "C"
         }
     }
 
+    mxArray* Ice_Properties_getIceProperty(void* self, const char* key)
+    {
+        try
+        {
+            return createResultValue(createStringFromUTF8(deref<Ice::Properties>(self)->getIceProperty(key)));
+        }
+        catch (...)
+        {
+            return createResultException(convertException(std::current_exception()));
+        }
+    }
+
     mxArray* Ice_Properties_getPropertyWithDefault(void* self, const char* key, const char* dflt)
     {
         try
@@ -81,6 +93,19 @@ extern "C"
         return 0;
     }
 
+    mxArray* Ice_Properties_getIcePropertyAsInt(void* self, const char* key, int* r)
+    {
+        try
+        {
+            *r = deref<Ice::Properties>(self)->getIcePropertyAsInt(key);
+        }
+        catch (...)
+        {
+            return convertException(std::current_exception());
+        }
+        return 0;
+    }
+
     mxArray* Ice_Properties_getPropertyAsIntWithDefault(void* self, const char* key, int dflt, int* r)
     {
         try
@@ -107,6 +132,19 @@ extern "C"
         }
     }
 
+    mxArray* Ice_Properties_getIcePropertyAsList(void* self, const char* key)
+    {
+        try
+        {
+            auto l = deref<Ice::Properties>(self)->getIcePropertyAsList(key);
+            return createResultValue(createStringList(l));
+        }
+        catch (...)
+        {
+            return createResultException(convertException(std::current_exception()));
+        }
+    }
+
     mxArray* Ice_Properties_getPropertyAsListWithDefault(void* self, const char* key, mxArray* dflt)
     {
         try
diff --git a/matlab/src/ice.h b/matlab/src/ice.h
index 33f99b7b728..e7abed36121 100644
--- a/matlab/src/ice.h
+++ b/matlab/src/ice.h
@@ -144,10 +144,13 @@ extern "C"
     ICE_MATLAB_API mxArray* Ice_createProperties(mxArray*, void*, void**);
     ICE_MATLAB_API mxArray* Ice_Properties_unref(void*);
     ICE_MATLAB_API mxArray* Ice_Properties_getProperty(void*, const char*);
+    ICE_MATLAB_API mxArray* Ice_Properties_getIceProperty(void*, const char*);
     ICE_MATLAB_API mxArray* Ice_Properties_getPropertyWithDefault(void*, const char*, const char*);
     ICE_MATLAB_API mxArray* Ice_Properties_getPropertyAsInt(void*, const char*, int*);
+    ICE_MATLAB_API mxArray* Ice_Properties_getIcePropertyAsInt(void*, const char*, int*);
     ICE_MATLAB_API mxArray* Ice_Properties_getPropertyAsIntWithDefault(void*, const char*, int, int*);
     ICE_MATLAB_API mxArray* Ice_Properties_getPropertyAsList(void*, const char*);
+    ICE_MATLAB_API mxArray* Ice_Properties_getIcePropertyAsList(void*, const char*);
     ICE_MATLAB_API mxArray* Ice_Properties_getPropertyAsListWithDefault(void*, const char*, mxArray*);
     ICE_MATLAB_API mxArray* Ice_Properties_getPropertiesForPrefix(void*, const char*);
     ICE_MATLAB_API mxArray* Ice_Properties_setProperty(void*, const char*, const char*);
diff --git a/matlab/test/Ice/properties/Client.m b/matlab/test/Ice/properties/Client.m
new file mode 100644
index 00000000000..8e30ca73f08
--- /dev/null
+++ b/matlab/test/Ice/properties/Client.m
@@ -0,0 +1,40 @@
+%
+% Copyright (c) ZeroC, Inc. All rights reserved.
+%
+
+function client(args)
+    if ~libisloaded('ice')
+        loadlibrary('ice', @iceproto)
+    end
+
+    props = Ice.createProperties()
+
+    fprintf('testing ice properties with set default values...');
+    toStringMode = props.getIceProperty('Ice.ToStringMode');
+    assert(strcmp(toStringMode, 'Unicode'));
+    closeTimeout = props.getIcePropertyAsInt('Ice.Connection.CloseTimeout');
+    assert(closeTimeout == 10);
+    retryIntervals = props.getIcePropertyAsList('Ice.RetryIntervals');
+    assert(length(retryIntervals) == 1);
+    assert(strcmp(retryIntervals{1}, '0'));
+    fprintf('ok\n');
+
+    fprintf('testing ice properties with unset default values...');
+    stringValue = props.getIceProperty('Ice.Admin.Router');
+    assert(strcmp(stringValue, ''));
+    intValue = props.getIcePropertyAsInt('Ice.Admin.Router');
+    assert(intValue == 0);
+    listValue = props.getIcePropertyAsList('Ice.Admin.Router');
+    assert(length(listValue) == 0);
+    fprintf('ok\n');
+
+    fprintf('testing that getting an unknown ice property throws an exception...');
+    try
+        props.getIceProperty('Ice.UnknownProperty');
+        assert(false);
+    catch ex
+    end
+    fprintf('ok\n');
+
+    clear('classes'); % Avoids conflicts with tests that define the same symbols.
+end
diff --git a/php/src/Properties.cpp b/php/src/Properties.cpp
index d6c2ee0d90b..91d6f9d9069 100644
--- a/php/src/Properties.cpp
+++ b/php/src/Properties.cpp
@@ -79,7 +79,7 @@ ZEND_METHOD(Ice_Properties, getProperty)
     Ice::PropertiesPtr _this = Wrapper<Ice::PropertiesPtr>::value(getThis());
     assert(_this);
 
-    string propName(name, nameLen);
+    string_view propName(name, nameLen);
     try
     {
         string val = _this->getProperty(propName);
@@ -92,6 +92,32 @@ ZEND_METHOD(Ice_Properties, getProperty)
     }
 }
 
+ZEND_METHOD(Ice_Properties, getIceProperty)
+{
+    char* name;
+    size_t nameLen;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), const_cast<char*>("s"), &name, &nameLen) == FAILURE)
+    {
+        RETURN_NULL();
+    }
+
+    Ice::PropertiesPtr _this = Wrapper<Ice::PropertiesPtr>::value(getThis());
+    assert(_this);
+
+    string_view propName(name, nameLen);
+    try
+    {
+        string val = _this->getIceProperty(propName);
+        RETURN_STRINGL(val.c_str(), static_cast<int>(val.length()));
+    }
+    catch (...)
+    {
+        throwException(current_exception());
+        RETURN_NULL();
+    }
+}
+
 ZEND_BEGIN_ARG_INFO_EX(Ice_Properties_getPropertyWithDefault_arginfo, 1, ZEND_RETURN_VALUE, static_cast<zend_ulong>(2))
 ZEND_ARG_INFO(0, name)
 ZEND_ARG_INFO(0, defaultValue)
@@ -112,7 +138,7 @@ ZEND_METHOD(Ice_Properties, getPropertyWithDefault)
     Ice::PropertiesPtr _this = Wrapper<Ice::PropertiesPtr>::value(getThis());
     assert(_this);
 
-    string propName(name, nameLen);
+    string_view propName(name, nameLen);
     string defaultValue;
     if (def)
     {
@@ -148,7 +174,7 @@ ZEND_METHOD(Ice_Properties, getPropertyAsInt)
     Ice::PropertiesPtr _this = Wrapper<Ice::PropertiesPtr>::value(getThis());
     assert(_this);
 
-    string propName(name, nameLen);
+    string_view propName(name, nameLen);
     try
     {
         int32_t val = _this->getPropertyAsInt(propName);
@@ -161,6 +187,32 @@ ZEND_METHOD(Ice_Properties, getPropertyAsInt)
     }
 }
 
+ZEND_METHOD(Ice_Properties, getIcePropertyAsInt)
+{
+    char* name;
+    size_t nameLen;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), const_cast<char*>("s"), &name, &nameLen) == FAILURE)
+    {
+        RETURN_NULL();
+    }
+
+    Ice::PropertiesPtr _this = Wrapper<Ice::PropertiesPtr>::value(getThis());
+    assert(_this);
+
+    string_view propName(name, nameLen);
+    try
+    {
+        int32_t val = _this->getIcePropertyAsInt(propName);
+        RETURN_LONG(static_cast<long>(val));
+    }
+    catch (...)
+    {
+        throwException(current_exception());
+        RETURN_NULL();
+    }
+}
+
 ZEND_BEGIN_ARG_INFO_EX(
     Ice_Properties_getPropertyAsIntWithDefault_arginfo,
     1,
@@ -184,7 +236,7 @@ ZEND_METHOD(Ice_Properties, getPropertyAsIntWithDefault)
     Ice::PropertiesPtr _this = Wrapper<Ice::PropertiesPtr>::value(getThis());
     assert(_this);
 
-    string propName(name, nameLen);
+    string_view propName(name, nameLen);
     try
     {
         // TODO: Range check
@@ -215,7 +267,7 @@ ZEND_METHOD(Ice_Properties, getPropertyAsList)
     Ice::PropertiesPtr _this = Wrapper<Ice::PropertiesPtr>::value(getThis());
     assert(_this);
 
-    string propName(name, nameLen);
+    string_view propName(name, nameLen);
     try
     {
         Ice::StringSeq val = _this->getPropertyAsList(propName);
@@ -231,6 +283,35 @@ ZEND_METHOD(Ice_Properties, getPropertyAsList)
     }
 }
 
+ZEND_METHOD(Ice_Properties, getIcePropertyAsList)
+{
+    char* name;
+    size_t nameLen;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), const_cast<char*>("s"), &name, &nameLen) == FAILURE)
+    {
+        RETURN_NULL();
+    }
+
+    Ice::PropertiesPtr _this = Wrapper<Ice::PropertiesPtr>::value(getThis());
+    assert(_this);
+
+    string_view propName(name, nameLen);
+    try
+    {
+        Ice::StringSeq val = _this->getIcePropertyAsList(propName);
+        if (!createStringArray(return_value, val))
+        {
+            RETURN_NULL();
+        }
+    }
+    catch (...)
+    {
+        throwException(current_exception());
+        RETURN_NULL();
+    }
+}
+
 ZEND_BEGIN_ARG_INFO_EX(
     Ice_Properties_getPropertyAsListWithDefault_arginfo,
     1,
@@ -254,7 +335,7 @@ ZEND_METHOD(Ice_Properties, getPropertyAsListWithDefault)
     Ice::PropertiesPtr _this = Wrapper<Ice::PropertiesPtr>::value(getThis());
     assert(_this);
 
-    string propName(name, nameLen);
+    string_view propName(name, nameLen);
     Ice::StringSeq defaultValue;
     if (def && !extractStringArray(def, defaultValue))
     {
@@ -334,7 +415,7 @@ ZEND_METHOD(Ice_Properties, setProperty)
     Ice::PropertiesPtr _this = Wrapper<Ice::PropertiesPtr>::value(getThis());
     assert(_this);
 
-    string propName(name, nameLen);
+    string_view propName(name, nameLen);
     string propValue;
     if (val)
     {
@@ -624,45 +705,54 @@ ZEND_FUNCTION(Ice_createProperties)
 static zend_function_entry _interfaceMethods[] = {{0, 0, 0}};
 
 static zend_function_entry _classMethods[] = {
-    ZEND_ME(Ice_Properties, __construct, ice_void_arginfo, ZEND_ACC_PRIVATE | ZEND_ACC_CTOR) ZEND_ME(
+    // constructor
+    ZEND_ME(Ice_Properties, __construct, ice_void_arginfo, ZEND_ACC_PRIVATE | ZEND_ACC_CTOR)
+    // toString
+    ZEND_ME(Ice_Properties, __toString, ice_to_string_arginfo, ZEND_ACC_PUBLIC)
+    // getProperty
+    ZEND_ME(Ice_Properties, getProperty, Ice_Properties_getProperty_arginfo, ZEND_ACC_PUBLIC)
+    // getIceProperty
+    ZEND_ME(Ice_Properties, getIceProperty, Ice_Properties_getProperty_arginfo, ZEND_ACC_PUBLIC)
+    // getPropertyWithDefault
+    ZEND_ME(Ice_Properties, getPropertyWithDefault, Ice_Properties_getPropertyWithDefault_arginfo, ZEND_ACC_PUBLIC)
+    // getPropertyAsInt
+    ZEND_ME(Ice_Properties, getPropertyAsInt, Ice_Properties_getPropertyAsInt_arginfo, ZEND_ACC_PUBLIC)
+    // getIcePropertyAsInt
+    ZEND_ME(Ice_Properties, getIcePropertyAsInt, Ice_Properties_getPropertyAsInt_arginfo, ZEND_ACC_PUBLIC)
+    // getPropertyAsIntWithDefault
+    ZEND_ME(
+        Ice_Properties,
+        getPropertyAsIntWithDefault,
+        Ice_Properties_getPropertyAsIntWithDefault_arginfo,
+        ZEND_ACC_PUBLIC)
+    // getPropertyAsList
+    ZEND_ME(Ice_Properties, getPropertyAsList, Ice_Properties_getPropertyAsList_arginfo, ZEND_ACC_PUBLIC)
+    // getIcePropertyAsList
+    ZEND_ME(Ice_Properties, getIcePropertyAsList, Ice_Properties_getPropertyAsList_arginfo, ZEND_ACC_PUBLIC)
+    // getPropertyAsListWithDefault
+    ZEND_ME(
+        Ice_Properties,
+        getPropertyAsListWithDefault,
+        Ice_Properties_getPropertyAsListWithDefault_arginfo,
+        ZEND_ACC_PUBLIC)
+    // getPropertiesForPrefix
+    ZEND_ME(Ice_Properties, getPropertiesForPrefix, Ice_Properties_getPropertiesForPrefix_arginfo, ZEND_ACC_PUBLIC)
+    // setProperty
+    ZEND_ME(Ice_Properties, setProperty, Ice_Properties_setProperty_arginfo, ZEND_ACC_PUBLIC)
+    // getCommandLineOptions
+    ZEND_ME(Ice_Properties, getCommandLineOptions, ice_void_arginfo, ZEND_ACC_PUBLIC)
+    // parseCommandLineOptions
+    ZEND_ME(Ice_Properties, parseCommandLineOptions, Ice_Properties_parseCommandLineOptions_arginfo, ZEND_ACC_PUBLIC)
+    // parseIceCommandLineOptions
+    ZEND_ME(
         Ice_Properties,
-        __toString,
-        ice_to_string_arginfo,
-        ZEND_ACC_PUBLIC) ZEND_ME(Ice_Properties, getProperty, Ice_Properties_getProperty_arginfo, ZEND_ACC_PUBLIC)
-        ZEND_ME(Ice_Properties, getPropertyWithDefault, Ice_Properties_getPropertyWithDefault_arginfo, ZEND_ACC_PUBLIC)
-            ZEND_ME(Ice_Properties, getPropertyAsInt, Ice_Properties_getPropertyAsInt_arginfo, ZEND_ACC_PUBLIC) ZEND_ME(
-                Ice_Properties,
-                getPropertyAsIntWithDefault,
-                Ice_Properties_getPropertyAsIntWithDefault_arginfo,
-                ZEND_ACC_PUBLIC)
-                ZEND_ME(Ice_Properties, getPropertyAsList, Ice_Properties_getPropertyAsList_arginfo, ZEND_ACC_PUBLIC)
-                    ZEND_ME(
-                        Ice_Properties,
-                        getPropertyAsListWithDefault,
-                        Ice_Properties_getPropertyAsListWithDefault_arginfo,
-                        ZEND_ACC_PUBLIC)
-                        ZEND_ME(
-                            Ice_Properties,
-                            getPropertiesForPrefix,
-                            Ice_Properties_getPropertiesForPrefix_arginfo,
-                            ZEND_ACC_PUBLIC)
-                            ZEND_ME(Ice_Properties, setProperty, Ice_Properties_setProperty_arginfo, ZEND_ACC_PUBLIC)
-                                ZEND_ME(Ice_Properties, getCommandLineOptions, ice_void_arginfo, ZEND_ACC_PUBLIC)
-                                    ZEND_ME(
-                                        Ice_Properties,
-                                        parseCommandLineOptions,
-                                        Ice_Properties_parseCommandLineOptions_arginfo,
-                                        ZEND_ACC_PUBLIC)
-                                        ZEND_ME(
-                                            Ice_Properties,
-                                            parseIceCommandLineOptions,
-                                            Ice_Properties_parseIceCommandLineOptions_arginfo,
-                                            ZEND_ACC_PUBLIC)
-                                            ZEND_ME(Ice_Properties, load, Ice_Properties_load_arginfo, ZEND_ACC_PUBLIC)
-                                                ZEND_ME(Ice_Properties, clone, ice_void_arginfo, ZEND_ACC_PUBLIC){
-                                                    0,
-                                                    0,
-                                                    0}};
+        parseIceCommandLineOptions,
+        Ice_Properties_parseIceCommandLineOptions_arginfo,
+        ZEND_ACC_PUBLIC)
+    // load
+    ZEND_ME(Ice_Properties, load, Ice_Properties_load_arginfo, ZEND_ACC_PUBLIC)
+    // clone
+    ZEND_ME(Ice_Properties, clone, ice_void_arginfo, ZEND_ACC_PUBLIC){0, 0, 0}};
 
 bool
 IcePHP::propertiesInit(void)
diff --git a/php/test/Ice/createProperties/Client.php b/php/test/Ice/createProperties/Client.php
deleted file mode 100644
index 8a08e709a31..00000000000
--- a/php/test/Ice/createProperties/Client.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-class Client extends TestHelper
-{
-    function run($args)
-    {
-        echo "testing create properties with no arguments... ";
-        $properties = Ice\createProperties();
-        echo "ok\n";
-
-        echo "testing create properties with args... ";
-        $properties = Ice\createProperties(array("--Ice.Trace.Network=3"));
-        test($properties->getProperty("Ice.Trace.Network"), "3");
-        echo "ok\n";
-
-        echo "testing create properties with defaults... ";
-        $defaults = Ice\createProperties(array("--Ice.Trace.Network=3", "--Ice.Trace.Protocol=1"));
-        $properties = Ice\createProperties(array("--Ice.Trace.Network=1"), $defaults);
-        test($properties->getProperty("Ice.Trace.Network"), "1");
-        test($properties->getProperty("Ice.Trace.Protocol"), "1");
-        echo "ok\n";
-    }
-}
-
-?>
diff --git a/php/test/Ice/properties/Client.php b/php/test/Ice/properties/Client.php
new file mode 100644
index 00000000000..bfad2ee396b
--- /dev/null
+++ b/php/test/Ice/properties/Client.php
@@ -0,0 +1,66 @@
+<?php
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+class Client extends TestHelper
+{
+    function run($args)
+    {
+        echo "testing create properties with no arguments... ";
+        $properties = Ice\createProperties();
+        echo "ok\n";
+
+        echo "testing create properties with args... ";
+        $properties = Ice\createProperties(array("--Ice.Trace.Network=3"));
+        test($properties->getProperty("Ice.Trace.Network"), "3");
+        echo "ok\n";
+
+        echo "testing create properties with defaults... ";
+        $defaults = Ice\createProperties(array("--Ice.Trace.Network=3", "--Ice.Trace.Protocol=1"));
+        $properties = Ice\createProperties(array("--Ice.Trace.Network=1"), $defaults);
+        test($properties->getProperty("Ice.Trace.Network"), "1");
+        test($properties->getProperty("Ice.Trace.Protocol"), "1");
+        echo "ok\n";
+
+        echo "testing ice properties with set default values...";
+        $properties = Ice\createProperties();
+
+        $toStringMode = $properties->getIceProperty("Ice.ToStringMode");
+        test($toStringMode == "Unicode");
+
+        $closeTimeout = $properties->getIcePropertyAsInt("Ice.Connection.CloseTimeout");
+        test($closeTimeout == 10);
+
+        $retryIntervals = $properties->getIcePropertyAsList("Ice.RetryIntervals");
+        test($retryIntervals == ["0"]);
+
+        echo "ok\n";
+
+        echo "testing ice properties with unset default values...";
+        $properties = Ice\createProperties();
+
+        $stringValue = $properties->getIceProperty("Ice.Admin.Router");
+        test($stringValue == "");
+
+        $intValue = $properties->getIcePropertyAsInt("Ice.Admin.Router");
+        test($intValue == 0);
+
+        $listValue = $properties->getIcePropertyAsList("Ice.Admin.Router");
+        test($listValue == []);
+
+        echo "ok\n";
+
+        echo "testing that getting an unknown ice property throws an exception...";
+
+        try {
+            $properties = Ice\createProperties();
+            $properties->getIceProperty("Ice.UnknownProperty");
+            test(False);
+        } catch (Ice\UnknownException $ex) {
+            // We don't have a specific exception for unknown properties
+            test($ex->unknown == "unknown ice property: Ice.UnknownProperty");
+        }
+        echo "ok\n";
+    }
+}
diff --git a/python/modules/IcePy/Properties.cpp b/python/modules/IcePy/Properties.cpp
index fea6ef032af..109483eaa16 100644
--- a/python/modules/IcePy/Properties.cpp
+++ b/python/modules/IcePy/Properties.cpp
@@ -196,6 +196,39 @@ extern "C"
     return createString(value);
 }
 
+#ifdef WIN32
+extern "C"
+#endif
+    static PyObject*
+    propertiesGetIceProperty(PropertiesObject* self, PyObject* args)
+{
+    PyObject* keyObj;
+    if (!PyArg_ParseTuple(args, STRCAST("O"), &keyObj))
+    {
+        return 0;
+    }
+
+    string key;
+    if (!getStringArg(keyObj, "key", key))
+    {
+        return 0;
+    }
+
+    assert(self->properties);
+    string value;
+    try
+    {
+        value = (*self->properties)->getIceProperty(key);
+    }
+    catch (...)
+    {
+        setPythonException(current_exception());
+        return 0;
+    }
+
+    return createString(value);
+}
+
 #ifdef WIN32
 extern "C"
 #endif
@@ -268,6 +301,39 @@ extern "C"
     return PyLong_FromLong(value);
 }
 
+#ifdef WIN32
+extern "C"
+#endif
+    static PyObject*
+    propertiesGetIcePropertyAsInt(PropertiesObject* self, PyObject* args)
+{
+    PyObject* keyObj;
+    if (!PyArg_ParseTuple(args, STRCAST("O"), &keyObj))
+    {
+        return 0;
+    }
+
+    string key;
+    if (!getStringArg(keyObj, "key", key))
+    {
+        return 0;
+    }
+
+    assert(self->properties);
+    int32_t value;
+    try
+    {
+        value = (*self->properties)->getIcePropertyAsInt(key);
+    }
+    catch (...)
+    {
+        setPythonException(current_exception());
+        return 0;
+    }
+
+    return PyLong_FromLong(value);
+}
+
 #ifdef WIN32
 extern "C"
 #endif
@@ -345,6 +411,49 @@ extern "C"
     return list;
 }
 
+#ifdef WIN32
+extern "C"
+#endif
+    static PyObject*
+    propertiesGetIcePropertyAsList(PropertiesObject* self, PyObject* args)
+{
+    PyObject* keyObj;
+    if (!PyArg_ParseTuple(args, STRCAST("O"), &keyObj))
+    {
+        return 0;
+    }
+
+    string key;
+    if (!getStringArg(keyObj, "key", key))
+    {
+        return 0;
+    }
+
+    assert(self->properties);
+    Ice::StringSeq value;
+    try
+    {
+        value = (*self->properties)->getIcePropertyAsList(key);
+    }
+    catch (...)
+    {
+        setPythonException(current_exception());
+        return 0;
+    }
+
+    PyObject* list = PyList_New(0);
+    if (!list)
+    {
+        return 0;
+    }
+    if (!stringSeqToList(value, list))
+    {
+        return 0;
+    }
+
+    return list;
+}
+
 #ifdef WIN32
 extern "C"
 #endif
@@ -664,6 +773,10 @@ static PyMethodDef PropertyMethods[] = {
      reinterpret_cast<PyCFunction>(propertiesGetProperty),
      METH_VARARGS,
      PyDoc_STR(STRCAST("getProperty(key) -> string"))},
+    {STRCAST("getIceProperty"),
+     reinterpret_cast<PyCFunction>(propertiesGetIceProperty),
+     METH_VARARGS,
+     PyDoc_STR(STRCAST("getIceProperty(key) -> string"))},
     {STRCAST("getPropertyWithDefault"),
      reinterpret_cast<PyCFunction>(propertiesGetPropertyWithDefault),
      METH_VARARGS,
@@ -672,6 +785,10 @@ static PyMethodDef PropertyMethods[] = {
      reinterpret_cast<PyCFunction>(propertiesGetPropertyAsInt),
      METH_VARARGS,
      PyDoc_STR(STRCAST("getPropertyAsInt(key) -> int"))},
+    {STRCAST("getIcePropertyAsInt"),
+     reinterpret_cast<PyCFunction>(propertiesGetIcePropertyAsInt),
+     METH_VARARGS,
+     PyDoc_STR(STRCAST("getIcePropertyAsInt(key) -> int"))},
     {STRCAST("getPropertyAsIntWithDefault"),
      reinterpret_cast<PyCFunction>(propertiesGetPropertyAsIntWithDefault),
      METH_VARARGS,
@@ -680,6 +797,10 @@ static PyMethodDef PropertyMethods[] = {
      reinterpret_cast<PyCFunction>(propertiesGetPropertyAsList),
      METH_VARARGS,
      PyDoc_STR(STRCAST("getPropertyAsList(key) -> list"))},
+    {STRCAST("getIcePropertyAsList"),
+     reinterpret_cast<PyCFunction>(propertiesGetIcePropertyAsList),
+     METH_VARARGS,
+     PyDoc_STR(STRCAST("getIcePropertyAsList(key) -> list"))},
     {STRCAST("getPropertyAsListWithDefault"),
      reinterpret_cast<PyCFunction>(propertiesGetPropertyAsListWithDefault),
      METH_VARARGS,
diff --git a/python/python/Ice/Properties_local.py b/python/python/Ice/Properties_local.py
index 74ca3717fee..088d611156a 100644
--- a/python/python/Ice/Properties_local.py
+++ b/python/python/Ice/Properties_local.py
@@ -48,6 +48,15 @@ def getProperty(self, key):
             """
             raise NotImplementedError("method 'getProperty' not implemented")
 
+        def getIceProperty(self, key):
+            """
+             Get an Ice property by key. If the property is not set, its default value is returned.
+            Arguments:
+            key -- The property key.
+            Returns: The property value or the default value.
+            """
+            raise NotImplementedError("method 'getIceProperty' not implemented")
+
         def getPropertyWithDefault(self, key, value):
             """
              Get a property by key. If the property is not set, the given default value is returned.
@@ -67,6 +76,15 @@ def getPropertyAsInt(self, key):
             """
             raise NotImplementedError("method 'getPropertyAsInt' not implemented")
 
+        def getIcePropertyAsInt(self, key):
+            """
+             Get an Ice property as an integer. If the property is not set, its default value is returned.
+            Arguments:
+            key -- The property key.
+            Returns: The property value interpreted as an integer, or the default value.
+            """
+            raise NotImplementedError("method 'getIcePropertyAsInt' not implemented")
+
         def getPropertyAsIntWithDefault(self, key, value):
             """
              Get a property as an integer. If the property is not set, the given default value is returned.
@@ -92,6 +110,19 @@ def getPropertyAsList(self, key):
             """
             raise NotImplementedError("method 'getPropertyAsList' not implemented")
 
+        def getIcePropertyAsList(self, key):
+            """
+             Get an Ice property as a list of strings. The strings must be separated by whitespace or comma. If the property
+             is not set, its default list is returned. The strings in the list can contain whitespace and commas if they are
+             enclosed in single or double quotes. If quotes are mismatched, the default list is returned. Within single
+             quotes or double quotes, you can escape the quote in question with a backslash, e.g. O'Reilly can be written as
+             O'Reilly, "O'Reilly" or 'O\'Reilly'.
+            Arguments:
+            key -- The property key.
+            Returns: The property value interpreted as list of strings, or the default value.
+            """
+            raise NotImplementedError("method 'getIcePropertyAsList' not implemented")
+
         def getPropertyAsListWithDefault(self, key, value):
             """
              Get a property as a list of strings.  The strings must be separated by whitespace or comma. If the property is
diff --git a/python/python/Ice/__init__.py b/python/python/Ice/__init__.py
index 0c95e796101..b0d87210431 100644
--- a/python/python/Ice/__init__.py
+++ b/python/python/Ice/__init__.py
@@ -303,6 +303,7 @@ def set_sent(self, sentSynchronously):
 
     def operation(self):
         return self._operation
+
     def _warn(self, msg):
         communicator = self.communicator()
         if communicator:
@@ -1239,18 +1240,27 @@ def __init__(self, impl):
     def getProperty(self, key):
         return self._impl.getProperty(key)
 
+    def getIceProperty(self, key):
+        return self._impl.getIceProperty(key)
+
     def getPropertyWithDefault(self, key, value):
         return self._impl.getPropertyWithDefault(key, value)
 
     def getPropertyAsInt(self, key):
         return self._impl.getPropertyAsInt(key)
 
+    def getIcePropertyAsInt(self, key):
+        return self._impl.getIcePropertyAsInt(key)
+
     def getPropertyAsIntWithDefault(self, key, value):
         return self._impl.getPropertyAsIntWithDefault(key, value)
 
     def getPropertyAsList(self, key):
         return self._impl.getPropertyAsList(key)
 
+    def getIcePropertyAsList(self, key):
+        return self._impl.getIcePropertyAsList(key)
+
     def getPropertyAsListWithDefault(self, key, value):
         return self._impl.getPropertyAsListWithDefault(key, value)
 
@@ -1932,9 +1942,7 @@ def _callbackOnInterruptCallback(self, sig):
 # Define Ice::Value and Ice::ObjectPrx.
 #
 IcePy._t_Object = IcePy.defineClass("::Ice::Object", Object, (), None, ())
-IcePy._t_Value = IcePy.defineValue(
-    "::Ice::Object", Value, -1, (), False, None, ()
-)
+IcePy._t_Value = IcePy.defineValue("::Ice::Object", Value, -1, (), False, None, ())
 IcePy._t_ObjectPrx = IcePy.defineProxy("::Ice::Object", ObjectPrx)
 Object._ice_type = IcePy._t_Object
 
diff --git a/python/test/Ice/properties/Client.py b/python/test/Ice/properties/Client.py
index 6b2e52f11a6..088dbd713e1 100644
--- a/python/test/Ice/properties/Client.py
+++ b/python/test/Ice/properties/Client.py
@@ -85,3 +85,46 @@ def run(sef, args):
         for k in props.keys():
             test(properties.getProperty(k) == props[k])
         print("ok")
+
+        sys.stdout.write("testing ice properties with set default values...")
+        sys.stdout.flush()
+        properties = Ice.createProperties()
+
+        toStringMode = properties.getIceProperty("Ice.ToStringMode")
+        test(toStringMode == "Unicode")
+
+        closeTimeout = properties.getIcePropertyAsInt("Ice.Connection.CloseTimeout")
+        test(closeTimeout == 10)
+
+        retryIntervals = properties.getIcePropertyAsList("Ice.RetryIntervals")
+        test(retryIntervals == ["0"])
+
+        print("ok")
+
+        sys.stdout.write("testing ice properties with unset default values...")
+        sys.stdout.flush()
+        properties = Ice.createProperties()
+
+        stringValue = properties.getIceProperty("Ice.Admin.Router")
+        test(stringValue == "")
+
+        intValue = properties.getIcePropertyAsInt("Ice.Admin.Router")
+        test(intValue == 0)
+
+        listValue = properties.getIcePropertyAsList("Ice.Admin.Router")
+        test(listValue == [])
+
+        print("ok")
+
+        sys.stdout.write(
+            "testing that getting an unknown ice property throws an exception..."
+        )
+        sys.stdout.flush()
+        try:
+            properties = Ice.createProperties()
+            properties.getIceProperty("Ice.UnknownProperty")
+            test(False)
+        except Ice.UnknownException:
+            # We dont' have a specific exception for unknown properties
+            pass
+        print("ok")
diff --git a/ruby/src/IceRuby/Properties.cpp b/ruby/src/IceRuby/Properties.cpp
index 5696aae3963..c472f2367cb 100644
--- a/ruby/src/IceRuby/Properties.cpp
+++ b/ruby/src/IceRuby/Properties.cpp
@@ -94,6 +94,20 @@ IceRuby_Properties_getProperty(VALUE self, VALUE key)
     return Qnil;
 }
 
+extern "C" VALUE
+IceRuby_Properties_getIceProperty(VALUE self, VALUE key)
+{
+    ICE_RUBY_TRY
+    {
+        Ice::PropertiesPtr p = getProperties(self);
+        string k = getString(key);
+        string v = p->getIceProperty(k);
+        return createString(v);
+    }
+    ICE_RUBY_CATCH
+    return Qnil;
+}
+
 extern "C" VALUE
 IceRuby_Properties_getPropertyWithDefault(VALUE self, VALUE key, VALUE def)
 {
@@ -123,6 +137,20 @@ IceRuby_Properties_getPropertyAsInt(VALUE self, VALUE key)
     return Qnil;
 }
 
+extern "C" VALUE
+IceRuby_Properties_getIcePropertyAsInt(VALUE self, VALUE key)
+{
+    ICE_RUBY_TRY
+    {
+        Ice::PropertiesPtr p = getProperties(self);
+        string k = getString(key);
+        int32_t v = p->getIcePropertyAsInt(k);
+        return INT2FIX(v);
+    }
+    ICE_RUBY_CATCH
+    return Qnil;
+}
+
 extern "C" VALUE
 IceRuby_Properties_getPropertyAsIntWithDefault(VALUE self, VALUE key, VALUE def)
 {
@@ -152,6 +180,20 @@ IceRuby_Properties_getPropertyAsList(VALUE self, VALUE key)
     return Qnil;
 }
 
+extern "C" VALUE
+IceRuby_Properties_getIcePropertyAsList(VALUE self, VALUE key)
+{
+    ICE_RUBY_TRY
+    {
+        Ice::PropertiesPtr p = getProperties(self);
+        string k = getString(key);
+        Ice::StringSeq v = p->getIcePropertyAsList(k);
+        return stringSeqToArray(v);
+    }
+    ICE_RUBY_CATCH
+    return Qnil;
+}
+
 extern "C" VALUE
 IceRuby_Properties_getPropertyAsListWithDefault(VALUE self, VALUE key, VALUE def)
 {
@@ -312,18 +354,21 @@ IceRuby::initProperties(VALUE iceModule)
     _propertiesClass = rb_define_class_under(iceModule, "PropertiesI", rb_cObject);
     rb_undef_alloc_func(_propertiesClass);
     rb_define_method(_propertiesClass, "getProperty", CAST_METHOD(IceRuby_Properties_getProperty), 1);
+    rb_define_method(_propertiesClass, "getIceProperty", CAST_METHOD(IceRuby_Properties_getIceProperty), 1);
     rb_define_method(
         _propertiesClass,
         "getPropertyWithDefault",
         CAST_METHOD(IceRuby_Properties_getPropertyWithDefault),
         2);
     rb_define_method(_propertiesClass, "getPropertyAsInt", CAST_METHOD(IceRuby_Properties_getPropertyAsInt), 1);
+    rb_define_method(_propertiesClass, "getIcePropertyAsInt", CAST_METHOD(IceRuby_Properties_getIcePropertyAsInt), 1);
     rb_define_method(
         _propertiesClass,
         "getPropertyAsIntWithDefault",
         CAST_METHOD(IceRuby_Properties_getPropertyAsIntWithDefault),
         2);
     rb_define_method(_propertiesClass, "getPropertyAsList", CAST_METHOD(IceRuby_Properties_getPropertyAsList), 1);
+    rb_define_method(_propertiesClass, "getIcePropertyAsList", CAST_METHOD(IceRuby_Properties_getIcePropertyAsList), 1);
     rb_define_method(
         _propertiesClass,
         "getPropertyAsListWithDefault",
diff --git a/ruby/test/Ice/properties/Client.rb b/ruby/test/Ice/properties/Client.rb
index 0c3d0b40fe6..9d7f23df1a7 100644
--- a/ruby/test/Ice/properties/Client.rb
+++ b/ruby/test/Ice/properties/Client.rb
@@ -71,5 +71,42 @@ def run(args)
             test(properties.getProperty(key) == value)
         end
         puts "ok"
+
+        print "testing ice properties with set default values..."
+        properties = Ice.createProperties(args)
+
+        toStringMode = properties.getIceProperty("Ice.ToStringMode")
+        test(toStringMode == "Unicode")
+
+        closeTimeout = properties.getIcePropertyAsInt("Ice.Connection.CloseTimeout")
+        test(closeTimeout == 10)
+
+        retryIntervals = properties.getIcePropertyAsList("Ice.RetryIntervals")
+        test(retryIntervals == ["0"])
+        puts "ok"
+
+        print "testing ice properties with unset default values..."
+        properties = Ice.createProperties(args)
+
+        stringValue = properties.getIceProperty("Ice.Admin.Router")
+        test(stringValue == "")
+
+        intValue = properties.getIcePropertyAsInt("Ice.Admin.Router")
+        test(intValue == 0)
+
+        listValue = properties.getIcePropertyAsList("Ice.Admin.Router")
+        test(listValue == [])
+        puts "ok"
+
+        print "testing that getting an unknown ice property throws an exception..."
+        begin
+            properties = Ice.createProperties(args)
+            properties.getIceProperty("Ice.UnknownProperty")
+            test(false)
+        rescue RuntimeError => ex
+            test ex.to_s == "unknown ice property: Ice.UnknownProperty"
+        end
+        puts "ok"
+
     end
 end
diff --git a/scripts/tests/Ice/properties.py b/scripts/tests/Ice/properties.py
index 536101f544b..14536d26a2f 100644
--- a/scripts/tests/Ice/properties.py
+++ b/scripts/tests/Ice/properties.py
@@ -3,11 +3,16 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 
-from Util import Client, ClientTestCase, TestSuite
+from Util import Client, ClientTestCase, MatlabMapping, PhpMapping, TestSuite
 
 
 class PropertiesTestSuite(TestSuite):
     def setup(self, current):
+        if isinstance(self.getMapping(), PhpMapping) or isinstance(
+            self.getMapping(), MatlabMapping
+        ):
+            return
+
         name = "\u4e2d\u56fd_client.config"
         current.createFile(
             "./config/" + name,
diff --git a/swift/src/Ice/Properties.swift b/swift/src/Ice/Properties.swift
index 3e60e1911d7..fb2592aa74c 100644
--- a/swift/src/Ice/Properties.swift
+++ b/swift/src/Ice/Properties.swift
@@ -26,6 +26,15 @@ public protocol Properties: Swift.AnyObject {
   /// - returns: `Swift.String` - The property value.
   func getProperty(_ key: Swift.String) -> Swift.String
 
+  /// Get an Ice property by key. If the property is not set, its default value is returned.
+  ///
+  /// - parameter key: `Swift.String` The property key.
+  ///
+  /// - returns: `Swift.String` - The property value or the default value.
+  ///
+  /// - throws: `NSException` if the key is not a valid Ice property
+  func getIceProperty(_ key: Swift.String) throws -> Swift.String
+
   /// Get a property by key. If the property is not set, the given default value is returned.
   ///
   /// - parameter key: `Swift.String` The property key.
@@ -42,6 +51,15 @@ public protocol Properties: Swift.AnyObject {
   /// - returns: `Swift.Int32` - The property value interpreted as an integer.
   func getPropertyAsInt(_ key: Swift.String) -> Swift.Int32
 
+  /// Get an Ice property as an integer. If the property is not set,its default value is returned.
+  ///
+  /// - parameter key: `Swift.String` The property key.
+  ///
+  /// - returns: `Swift.Int32` - The property value interpreted as an integer, or the default value.
+  ///
+  /// - throws: `NSException` if the key is not a valid Ice property
+  func getIcePropertyAsInt(_ key: Swift.String) throws -> Swift.Int32
+
   /// Get a property as an integer. If the property is not set, the given default value is returned.
   ///
   /// - parameter key: `Swift.String` The property key.
@@ -62,6 +80,19 @@ public protocol Properties: Swift.AnyObject {
   /// - returns: `StringSeq` - The property value interpreted as a list of strings.
   func getPropertyAsList(_ key: Swift.String) -> StringSeq
 
+  /// Get an Ice property as a list of strings.  The strings must be separated by whitespace or comma. If the property
+  /// is not set, its default list is returned. The strings in the list can contain whitespace and commas if they are
+  /// enclosed in single or double quotes. If quotes are mismatched, the default list is returned. Within single
+  /// quotes or double quotes, you can escape the quote in question with a backslash, e.g. O'Reilly can be written as
+  /// O'Reilly, "O'Reilly" or 'O\'Reilly'.
+  ///
+  /// - parameter key: `Swift.String` The property key.
+  ///
+  /// - returns: `StringSeq` - The property value interpreted as list of strings, or the default value.
+  ///
+  /// - throws: `NSException` if the key is not a valid Ice property
+  func getIcePropertyAsList(_ key: Swift.String) throws -> StringSeq
+
   /// Get a property as a list of strings.  The strings must be separated by whitespace or comma. If the property is
   /// not set, the default list is returned. The strings in the list can contain whitespace and commas if they are
   /// enclosed in single or double quotes. If quotes are mismatched, the default list is returned. Within single
diff --git a/swift/src/Ice/PropertiesI.swift b/swift/src/Ice/PropertiesI.swift
index 373062ac18b..3e6d4480af3 100644
--- a/swift/src/Ice/PropertiesI.swift
+++ b/swift/src/Ice/PropertiesI.swift
@@ -9,6 +9,13 @@ class PropertiesI: LocalObject<ICEProperties>, Properties {
     return handle.getProperty(key)
   }
 
+  public func getIceProperty(_ key: String) throws -> String {
+    guard let value = handle.getIceProperty(key) else {
+      throw RuntimeError("unknown ice property: \(key)")
+    }
+    return value
+  }
+
   public func getPropertyWithDefault(key: String, value: String) -> String {
     return handle.getPropertyWithDefault(key, value: value)
   }
@@ -17,6 +24,13 @@ class PropertiesI: LocalObject<ICEProperties>, Properties {
     return handle.getPropertyAsInt(key)
   }
 
+  public func getIcePropertyAsInt(_ key: String) throws -> Int32 {
+    guard let value = handle.getIcePropertyAsInt(key) as? Int32 else {
+      throw RuntimeError("unknown ice property: \(key)")
+    }
+    return value
+  }
+
   public func getPropertyAsIntWithDefault(key: String, value: Int32) -> Int32 {
     return handle.getPropertyAsIntWithDefault(key: key, value: value)
   }
@@ -25,6 +39,13 @@ class PropertiesI: LocalObject<ICEProperties>, Properties {
     return handle.getPropertyAsList(key)
   }
 
+  public func getIcePropertyAsList(_ key: String) throws -> StringSeq {
+    guard let value = handle.getIcePropertyAsList(key) else {
+      throw RuntimeError("unknown ice property: \(key)")
+    }
+    return value
+  }
+
   public func getPropertyAsListWithDefault(key: String, value: StringSeq) -> StringSeq {
     return handle.getPropertyAsListWithDefault(key: key, value: value)
   }
diff --git a/swift/src/IceImpl/Properties.h b/swift/src/IceImpl/Properties.h
index d6f80dd31d4..13a55ad9093 100644
--- a/swift/src/IceImpl/Properties.h
+++ b/swift/src/IceImpl/Properties.h
@@ -8,11 +8,14 @@ NS_ASSUME_NONNULL_BEGIN
 
 ICEIMPL_API @interface ICEProperties : ICELocalObject
 - (nonnull NSString*)getProperty:(NSString*)key;
+- (nullable NSString*)getIceProperty:(NSString*)key NS_SWIFT_NAME(getIceProperty(_:));
 - (nonnull NSString*)getPropertyWithDefault:(NSString*)key value:(NSString*)value;
 - (int32_t)getPropertyAsInt:(NSString*)key;
+- (nullable id)getIcePropertyAsInt:(NSString*)key NS_SWIFT_NAME(getIcePropertyAsInt(_:));
 - (int32_t)getPropertyAsIntWithDefault:(NSString*)key
                                  value:(int32_t)value NS_SWIFT_NAME(getPropertyAsIntWithDefault(key:value:));
 - (nonnull NSArray<NSString*>*)getPropertyAsList:(NSString* _Nonnull)key;
+- (nullable NSArray<NSString*>*)getIcePropertyAsList:(NSString* _Nonnull)key NS_SWIFT_NAME(getIcePropertyAsList(_:));
 - (nonnull NSArray<NSString*>*)getPropertyAsListWithDefault:(NSString* _Nonnull)key
                                                       value:(NSArray<NSString*>* _Nonnull)value
     NS_SWIFT_NAME(getPropertyAsListWithDefault(key:value:));
diff --git a/swift/src/IceImpl/Properties.mm b/swift/src/IceImpl/Properties.mm
index bb2cc2bbebb..01525ad4a9b 100644
--- a/swift/src/IceImpl/Properties.mm
+++ b/swift/src/IceImpl/Properties.mm
@@ -18,6 +18,19 @@ - (NSString*)getProperty:(NSString*)key
     return toNSString(self.properties->getProperty(fromNSString(key)));
 }
 
+- (NSString*)getIceProperty:(NSString*)key
+{
+    try
+    {
+        toNSString(self.properties->getIceProperty(fromNSString(key)));
+    }
+    catch (const std::invalid_argument&)
+    {
+        return nil;
+    }
+    return toNSString(self.properties->getIceProperty(fromNSString(key)));
+}
+
 - (NSString*)getPropertyWithDefault:(NSString*)key value:(NSString*)value
 {
     return toNSString(self.properties->getPropertyWithDefault(fromNSString(key), fromNSString(value)));
@@ -28,6 +41,19 @@ - (int32_t)getPropertyAsInt:(NSString*)key
     return self.properties->getPropertyAsInt(fromNSString(key));
 }
 
+- (id)getIcePropertyAsInt:(NSString*)key
+{
+    try
+    {
+        int32_t value = self.properties->getIcePropertyAsInt(fromNSString(key));
+        return [NSNumber numberWithInt:value];
+    }
+    catch (const std::invalid_argument&)
+    {
+        return nil;
+    }
+}
+
 - (int32_t)getPropertyAsIntWithDefault:(NSString*)key value:(int32_t)value
 {
     return self.properties->getPropertyAsIntWithDefault(fromNSString(key), value);
@@ -38,6 +64,11 @@ - (int32_t)getPropertyAsIntWithDefault:(NSString*)key value:(int32_t)value
     return toNSArray(self.properties->getPropertyAsList(fromNSString(key)));
 }
 
+- (NSArray<NSString*>*)getIcePropertyAsList:(NSString*)key
+{
+    return toNSArray(self.properties->getIcePropertyAsList(fromNSString(key)));
+}
+
 - (NSArray<NSString*>*)getPropertyAsListWithDefault:(NSString*)key value:(NSArray<NSString*>*)value
 {
     std::vector<std::string> s;
diff --git a/swift/test/Ice/properties/Client.swift b/swift/test/Ice/properties/Client.swift
index 98dba8e8040..6508e2db795 100644
--- a/swift/test/Ice/properties/Client.swift
+++ b/swift/test/Ice/properties/Client.swift
@@ -97,5 +97,51 @@ public class Client: TestHelperI {
       try test(args1 == ["--Foo=1", "-T", "--Bar=2"])
       output.writeLine("ok")
     }
+
+    do {
+      output.write("testing ice properties with set default values...")
+      let properties = Ice.createProperties()
+
+      let toStringMode = try properties.getIceProperty("Ice.ToStringMode")
+      try test(toStringMode == "Unicode")
+
+      let closeTimeout = try properties.getIcePropertyAsInt("Ice.Connection.CloseTimeout")
+      try test(closeTimeout == 10)
+
+      let retryIntervals = try properties.getIcePropertyAsList("Ice.RetryIntervals")
+      try test(retryIntervals == ["0"])
+
+      output.writeLine("ok")
+    }
+
+    do {
+      output.write("testing ice properties with unset default values...")
+      let properties = Ice.createProperties()
+
+      let stringValue = try properties.getIceProperty("Ice.Admin.Router")
+      try test(stringValue == "")
+
+      let intValue = try properties.getIcePropertyAsInt("Ice.Admin.Router")
+      try test(intValue == 0)
+
+      let listValue = try properties.getIcePropertyAsList("Ice.Admin.Router")
+      try test(listValue == [])
+
+      output.writeLine("ok")
+    }
+
+    do {
+      output.write("testing that getting an unknown ice property throws an exception...")
+      let properties = Ice.createProperties()
+
+      do {
+        _ = try properties.getIceProperty("Ice.UnknownProperty")
+        try test(false)
+      } catch let error as RuntimeError {
+        try test(error.description == "unknown ice property: Ice.UnknownProperty")
+      }
+
+      output.write("ok")
+    }
   }
 }