CPP: libphonenumber v5.1

cpp/src/phonenumbers/asyoutypeformatter.cc

@@ -52,6 +52,15 @@ const size_t kMinLeadingDigitsLength = 3;
 // the punctuation space.
 const char kDigitPlaceholder[] = "\xE2\x80\x88"; /* " " */
 
+// Character used when appropriate to separate a prefix, such as a long NDD or a
+// country calling code, from the national number.
+const char kSeparatorBeforeNationalNumber = ' ';
+
+// A set of characters that, if found in a national prefix formatting rules, are
+// an indicator to us that we should separate the national prefix from the
+// number when formatting.
+const char kNationalPrefixSeparatorsPattern[] = "[- ]";
+
 // Replaces any standalone digit in the pattern (not any inside a {} grouping)
 // with \d. This function replaces the standalone digit regex used in the Java
 // version which is currently not supported by RE2 because it uses a special
@@ -122,7 +131,7 @@ AsYouTypeFormatter::AsYouTypeFormatter(const string& region_code)
       accrued_input_without_formatting_(),
       able_to_format_(true),
       input_has_formatting_(false),
-      is_international_formatting_(false),
+      is_complete_number_(false),
       is_expecting_country_code_(false),
       phone_util_(*PhoneNumberUtil::GetInstance()),
       default_country_(region_code),
@@ -133,6 +142,7 @@ AsYouTypeFormatter::AsYouTypeFormatter(const string& region_code)
       original_position_(0),
       position_to_remember_(0),
       prefix_before_national_number_(),
+      should_add_space_after_national_prefix_(false),
       national_prefix_extracted_(),
       national_number_(),
       possible_formats_() {
@@ -170,6 +180,7 @@ bool AsYouTypeFormatter::MaybeCreateNewTemplate() {
     }
     if (CreateFormattingTemplate(number_format)) {
       current_formatting_pattern_ = pattern;
+      SetShouldAddSpaceAfterNationalPrefix(number_format);
       // With a new formatting template, the matched position using the old
       // template needs to be reset.
       last_match_position_ = 0;
@@ -183,15 +194,20 @@ bool AsYouTypeFormatter::MaybeCreateNewTemplate() {
 void AsYouTypeFormatter::GetAvailableFormats(
     const string& leading_three_digits) {
   const RepeatedPtrField<NumberFormat>& format_list =
-      (is_international_formatting_ &&
+      (is_complete_number_ &&
        current_metadata_->intl_number_format().size() > 0)
           ? current_metadata_->intl_number_format()
           : current_metadata_->number_format();
 
   for (RepeatedPtrField<NumberFormat>::const_iterator it = format_list.begin();
        it != format_list.end(); ++it) {
-    if (phone_util_.IsFormatEligibleForAsYouTypeFormatter(it->format())) {
-      possible_formats_.push_back(&*it);
+    if (is_complete_number_ ||
+        it->national_prefix_optional_when_formatting() ||
+        phone_util_.FormattingRuleHasFirstGroupOnly(
+            it->national_prefix_formatting_rule())) {
+      if (phone_util_.IsFormatEligibleForAsYouTypeFormatter(it->format())) {
+        possible_formats_.push_back(&*it);
+      }
     }
   }
   NarrowDownPossibleFormats(leading_three_digits);
@@ -222,6 +238,15 @@ void AsYouTypeFormatter::NarrowDownPossibleFormats(
   }
 }
 
+void AsYouTypeFormatter::SetShouldAddSpaceAfterNationalPrefix(
+    const NumberFormat& format) {
+  static const scoped_ptr<const RegExp> national_prefix_separators_pattern(
+      regexp_factory_->CreateRegExp(kNationalPrefixSeparatorsPattern));
+  should_add_space_after_national_prefix_ =
+      national_prefix_separators_pattern->PartialMatch(
+          format.national_prefix_formatting_rule());
+}
+
 bool AsYouTypeFormatter::CreateFormattingTemplate(const NumberFormat& format) {
   string number_pattern = format.pattern();
 
@@ -291,9 +316,10 @@ void AsYouTypeFormatter::Clear() {
   input_has_formatting_ = false;
   position_to_remember_ = 0;
   original_position_ = 0;
-  is_international_formatting_ = false;
+  is_complete_number_ = false;
   is_expecting_country_code_ = false;
   possible_formats_.clear();
+  should_add_space_after_national_prefix_ = false;
 
   if (current_metadata_ != default_metadata_) {
     current_metadata_ = GetMetadataForRegion(default_country_);
@@ -357,8 +383,10 @@ void AsYouTypeFormatter::InputDigitWithOptionToRememberPosition(
       }
     } else if (AbleToExtractLongerNdd()) {
       // Add an additional space to separate long NDD and national significant
-      // number for readability.
-      prefix_before_national_number_.append(" ");
+      // number for readability. We don't set
+      // should_add_space_after_national_prefix_ to true, since we don't want
+      // this to change later when we choose formatting templates.
+      prefix_before_national_number_.push_back(kSeparatorBeforeNationalNumber);
       AttemptToChoosePatternWithPrefixExtracted(phone_number);
       return;
     }
@@ -414,8 +442,7 @@ void AsYouTypeFormatter::InputDigitWithOptionToRememberPosition(
           return;
         }
         if (able_to_format_) {
-          phone_number->assign(
-              prefix_before_national_number_ + temp_national_number);
+          AppendNationalNumber(temp_national_number, phone_number);
         } else {
           phone_number->clear();
           accrued_input_.toUTF8String(*phone_number);
@@ -453,30 +480,27 @@ bool AsYouTypeFormatter::AbleToExtractLongerNdd() {
 }
 
 void AsYouTypeFormatter::AttemptToFormatAccruedDigits(
-    string* formatted_number) {
-  DCHECK(formatted_number);
+    string* formatted_result) {
+  DCHECK(formatted_result);
 
   for (list<const NumberFormat*>::const_iterator it = possible_formats_.begin();
        it != possible_formats_.end(); ++it) {
     DCHECK(*it);
-    const NumberFormat& num_format = **it;
-    string pattern = num_format.pattern();
+    const NumberFormat& number_format = **it;
+    const string& pattern = number_format.pattern();
 
     if (regexp_cache_.GetRegExp(pattern).FullMatch(national_number_)) {
-      formatted_number->assign(national_number_);
-      string new_formatted_number(*formatted_number);
-      string format = num_format.format();
+      SetShouldAddSpaceAfterNationalPrefix(number_format);
 
+      string formatted_number(national_number_);
       bool status = regexp_cache_.GetRegExp(pattern).GlobalReplace(
-          &new_formatted_number, format);
+          &formatted_number, number_format.format());
       DCHECK(status);
 
-      formatted_number->assign(prefix_before_national_number_);
-      formatted_number->append(new_formatted_number);
+      AppendNationalNumber(formatted_number, formatted_result);
       return;
     }
   }
-  formatted_number->clear();
 }
 
 int AsYouTypeFormatter::GetRememberedPosition() const {
@@ -498,6 +522,28 @@ int AsYouTypeFormatter::GetRememberedPosition() const {
   return ConvertUnicodeStringPosition(current_output, current_output_index);
 }
 
+void AsYouTypeFormatter::AppendNationalNumber(const string& national_number,
+                                              string* phone_number) const {
+  int prefix_before_national_number_length =
+      prefix_before_national_number_.size();
+  if (should_add_space_after_national_prefix_ &&
+      prefix_before_national_number_length > 0 &&
+      prefix_before_national_number_.at(
+          prefix_before_national_number_length - 1) !=
+      kSeparatorBeforeNationalNumber) {
+    // We want to add a space after the national prefix if the national prefix
+    // formatting rule indicates that this would normally be done, with the
+    // exception of the case where we already appended a space because the NDD
+    // was surprisingly long.
+    phone_number->assign(prefix_before_national_number_);
+    phone_number->push_back(kSeparatorBeforeNationalNumber);
+    StrAppend(phone_number, national_number);
+  } else {
+    phone_number->assign(
+        StrCat(prefix_before_national_number_, national_number));
+  }
+}
+
 void AsYouTypeFormatter::AttemptToChooseFormattingPattern(
     string* formatted_number) {
   DCHECK(formatted_number);
@@ -515,7 +561,7 @@ void AsYouTypeFormatter::AttemptToChooseFormattingPattern(
     }
     return;
   } else {
-    formatted_number->assign(prefix_before_national_number_ + national_number_);
+    AppendNationalNumber(national_number_, formatted_number);
   }
 }
 
@@ -531,7 +577,7 @@ void AsYouTypeFormatter::InputAccruedNationalNumber(string* number) {
       InputDigitHelper(national_number_[i], &temp_national_number);
     }
     if (able_to_format_) {
-      number->assign(prefix_before_national_number_ + temp_national_number);
+      AppendNationalNumber(temp_national_number, number);
     } else {
       number->clear();
       accrued_input_.toUTF8String(*number);
@@ -542,14 +588,26 @@ void AsYouTypeFormatter::InputAccruedNationalNumber(string* number) {
   }
 }
 
+bool AsYouTypeFormatter::IsNanpaNumberWithNationalPrefix() const {
+  // For NANPA numbers beginning with 1[2-9], treat the 1 as the national
+  // prefix. The reason is that national significant numbers in NANPA always
+  // start with [2-9] after the national prefix.  Numbers beginning with 1[01]
+  // can only be short/emergency numbers, which don't need the national
+  // prefix.
+  return (current_metadata_->country_code() == 1) &&
+         (national_number_[0] == '1') && (national_number_[1] != '0') &&
+         (national_number_[1] != '1');
+}
+
 void AsYouTypeFormatter::RemoveNationalPrefixFromNationalNumber(
     string* national_prefix) {
   int start_of_national_number = 0;
 
-  if (current_metadata_->country_code() == 1 && national_number_[0] == '1') {
+  if (IsNanpaNumberWithNationalPrefix()) {
     start_of_national_number = 1;
-    prefix_before_national_number_.append("1 ");
-    is_international_formatting_ = true;
+    prefix_before_national_number_.append("1");
+    prefix_before_national_number_.push_back(kSeparatorBeforeNationalNumber);
+    is_complete_number_ = true;
   } else if (current_metadata_->has_national_prefix_for_parsing()) {
     const scoped_ptr<RegExpInput> consumed_input(
         regexp_factory_->CreateInput(national_number_));
@@ -560,7 +618,7 @@ void AsYouTypeFormatter::RemoveNationalPrefixFromNationalNumber(
       // When the national prefix is detected, we use international formatting
       // rules instead of national ones, because national formatting rules could
       // countain local formatting rules for numbers entered without area code.
-      is_international_formatting_ = true;
+      is_complete_number_ = true;
       start_of_national_number =
           national_number_.length() - consumed_input->ToString().length();
       prefix_before_national_number_.append(
@@ -582,7 +640,7 @@ bool AsYouTypeFormatter::AttemptToExtractIdd() {
              current_metadata_->international_prefix()));
 
   if (international_prefix.Consume(consumed_input.get())) {
-    is_international_formatting_ = true;
+    is_complete_number_ = true;
     const int start_of_country_code =
         accrued_input_without_formatting_.length() -
         consumed_input->ToString().length();
@@ -598,7 +656,7 @@ bool AsYouTypeFormatter::AttemptToExtractIdd() {
     prefix_before_national_number_.append(before_country_code);
 
     if (accrued_input_without_formatting_[0] != kPlusSign) {
-      prefix_before_national_number_.append(" ");
+      prefix_before_national_number_.push_back(kSeparatorBeforeNationalNumber);
     }
     return true;
   }
@@ -624,7 +682,8 @@ bool AsYouTypeFormatter::AttemptToExtractCountryCode() {
   } else if (new_region_code != default_country_) {
     current_metadata_ = GetMetadataForRegion(new_region_code);
   }
-  StrAppend(&prefix_before_national_number_, country_code, " ");
+  StrAppend(&prefix_before_national_number_, country_code);
+  prefix_before_national_number_.push_back(kSeparatorBeforeNationalNumber);
 
   return true;
 }

cpp/src/phonenumbers/asyoutypeformatter.h

@@ -24,8 +24,9 @@
 // asyoutypeformatter_test.cc for more details on how the formatter is to be
 // used.
 //
-// This is a direct port from AsYouTypeFormatter.java.  Changes to this class
-// should also happen to the Java version, whenever it makes sense.
+// This is a direct port from AsYouTypeFormatter.java.
+// Changes to this class should also happen to the Java version, whenever it
+// makes sense.
 //
 // This class is NOT THREAD SAFE.
 
@@ -96,6 +97,10 @@ class AsYouTypeFormatter {
 
   void NarrowDownPossibleFormats(const string& leading_digits);
 
+  // Calculates whether we should be adding a space after the national prefix
+  // for this formatting rule or not.
+  void SetShouldAddSpaceAfterNationalPrefix(const NumberFormat& format);
+
   bool CreateFormattingTemplate(const NumberFormat& format);
 
   // Gets a formatting template which could be used to efficiently format a
@@ -115,8 +120,18 @@ class AsYouTypeFormatter {
   // can extract a longer version here.
   bool AbleToExtractLongerNdd();
 
+  // Check to see if there is an exact pattern match for these digits. If so, we
+  // should use this instead of any other formatting template whose
+  // leadingDigitsPattern also matches the input.
   void AttemptToFormatAccruedDigits(string* formatted_number);
 
+  // Combines the national number with any prefix (IDD/+ and country code or
+  // national prefix) that was collected. A space will be inserted between them
+  // if the current formatting template indicates this to be suitable.
+  // The result will be stored in phone_number.
+  void AppendNationalNumber(const string& national_number,
+                            string* phone_number) const;
+
   // Attempts to set the formatting template and assigns the passed-in string
   // parameter to the formatted version of the digits entered so far.
   void AttemptToChooseFormattingPattern(string* formatted_number);
@@ -125,6 +140,10 @@ class AsYouTypeFormatter {
   // assigns the passed-in string parameter to a formatted string in the end.
   void InputAccruedNationalNumber(string* number);
 
+  // Returns true if the current country is a NANPA country and the national
+  // number begins with the national prefix.
+  bool IsNanpaNumberWithNationalPrefix() const;
+
   // Extracts the national prefix into national_prefix, or sets it to empty
   // string if a national prefix is not present.
   void RemoveNationalPrefixFromNationalNumber(string* national_prefix);
@@ -170,7 +189,11 @@ class AsYouTypeFormatter {
   // Set to true when users enter their own formatting. AsYouTypeFormatter will
   // do no formatting at all when this is set to true.
   bool input_has_formatting_;
-  bool is_international_formatting_;
+  // This is set to true when we know the user is entering a full national
+  // significant number, since we have either detected a national prefix or an
+  // international dialing prefix. When this is true, we will no longer use
+  // local number formatting patterns.
+  bool is_complete_number_;
   bool is_expecting_country_code_;
 
   const PhoneNumberUtil& phone_util_;
@@ -196,6 +219,7 @@ class AsYouTypeFormatter {
   // significant number, and it is formatted (e.g. with space inserted). For
   // example, this can contain IDD, country code, and/or NDD, etc.
   string prefix_before_national_number_;
+  bool should_add_space_after_national_prefix_;
   // This contains the national prefix that has been extracted. It contains only
   // digits without formatting.
   string national_prefix_extracted_;

cpp/src/phonenumbers/phonenumbermatcher.cc

@@ -30,6 +30,7 @@
 #include <limits>
 #include <stddef.h>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <unicode/uchar.h>
@@ -764,15 +765,8 @@ bool PhoneNumberMatcher::IsNationalPrefixPresentIfRequired(
       // check if it was present.
       return true;
     }
-    // Remove the first-group symbol.
-    string candidate_national_prefix_rule(
-        format_rule->national_prefix_formatting_rule());
-    // We assume that the first-group symbol will never be _before_ the national
-    // prefix.
-    candidate_national_prefix_rule.erase(
-        candidate_national_prefix_rule.find("$1"));
-    phone_util_.NormalizeDigitsOnly(&candidate_national_prefix_rule);
-    if (candidate_national_prefix_rule.empty()) {
+    if (phone_util_.FormattingRuleHasFirstGroupOnly(
+        format_rule->national_prefix_formatting_rule())) {
       // National Prefix not needed for this number.
       return true;
     }

cpp/src/phonenumbers/phonenumberutil.cc

@@ -477,7 +477,10 @@ class PhoneNumberRegExpsAndMappings {
     }
   }
 
+  // Small string helpers since StrCat has a maximum number of arguments. These
+  // are both used to build valid_phone_number_.
   const string punctuation_and_star_sign_;
+  const string min_length_phone_number_pattern_;
 
   // Regular expression of viable phone numbers. This is location independent.
   // Checks we have at least three leading digits, and only valid punctuation,
@@ -486,8 +489,15 @@ class PhoneNumberRegExpsAndMappings {
   // used as a placeholder for carrier codes, for example in Brazilian phone
   // numbers. We also allow multiple plus-signs at the start.
   // Corresponds to the following:
+  // [digits]{minLengthNsn}|
   // plus_sign*(([punctuation]|[star])*[digits]){3,}
   // ([punctuation]|[star]|[digits]|[alpha])*
+  //
+  // The first reg-ex is to allow short numbers (two digits long) to be parsed
+  // if they are entered as "15" etc, but only if there is no punctuation in
+  // them. The second expression restricts the number of digits to three or
+  // more, but then allows them to be in international form, and to have
+  // alpha-characters and punctuation.
   const string valid_phone_number_;
 
   // Regexp of all possible ways to write extensions, for use when parsing. This
@@ -585,8 +595,11 @@ class PhoneNumberRegExpsAndMappings {
   PhoneNumberRegExpsAndMappings()
       : punctuation_and_star_sign_(StrCat(PhoneNumberUtil::kValidPunctuation,
                                           kStarSign)),
+        min_length_phone_number_pattern_(
+            StrCat(kDigits, "{", PhoneNumberUtil::kMinLengthForNsn, "}")),
         valid_phone_number_(
-            StrCat("[", PhoneNumberUtil::kPlusChars, "]*(?:[",
+            StrCat(min_length_phone_number_pattern_, "|[",
+                   PhoneNumberUtil::kPlusChars, "]*(?:[",
                    punctuation_and_star_sign_, "]*",
                    kDigits, "){3,}[", kValidAlpha,
                    punctuation_and_star_sign_, kDigits,
@@ -783,6 +796,17 @@ bool PhoneNumberUtil::IsFormatEligibleForAsYouTypeFormatter(
   return eligible_format_pattern.FullMatch(format);
 }
 
+bool PhoneNumberUtil::FormattingRuleHasFirstGroupOnly(
+    const string& national_prefix_formatting_rule) const {
+  // A pattern that is used to determine if the national prefix formatting rule
+  // has the first group only, i.e., does not start with the national prefix.
+  // Note that the pattern explicitly allows for unbalanced parentheses.
+  const RegExp& first_group_only_prefix_pattern =
+      reg_exps_->regexp_cache_->GetRegExp("\\(?\\$1\\)?");
+  return first_group_only_prefix_pattern.FullMatch(
+      national_prefix_formatting_rule);
+}
+
 void PhoneNumberUtil::GetNddPrefixForRegion(const string& region_code,
                                             bool strip_non_digits,
                                             string* national_prefix) const {

cpp/src/phonenumbers/phonenumberutil.h

@@ -51,7 +51,6 @@ class AsYouTypeFormatter;
 class Logger;
 class NumberFormat;
 class PhoneMetadata;
-class PhoneNumberMatcherRegExps;
 class PhoneNumberRegExpsAndMappings;
 class RegExp;
 
@@ -83,10 +82,11 @@ class PhoneNumberUtil : public Singleton<PhoneNumberUtil> {
   // in ITU-T Recommendation E. 123. For example, the number of the Google
   // Zürich office will be written as "+41 44 668 1800" in INTERNATIONAL
   // format, and as "044 668 1800" in NATIONAL format. E164 format is as per
-  // INTERNATIONAL format but with no formatting applied e.g. +41446681800.
+  // INTERNATIONAL format but with no formatting applied e.g. "+41446681800".
   // RFC3966 is as per INTERNATIONAL format, but with all spaces and other
   // separating symbols replaced with a hyphen, and with any phone number
-  // extension appended with ";ext=".
+  // extension appended with ";ext=". It also will have a prefix of "tel:"
+  // added, e.g. "tel:+41-44-668-1800".
   enum PhoneNumberFormat {
     E164,
     INTERNATIONAL,
@@ -632,9 +632,16 @@ class PhoneNumberUtil : public Singleton<PhoneNumberUtil> {
   // Checks whether a string contains only valid digits.
   bool ContainsOnlyValidDigits(const string& s) const;
 
-  // Checks if a format is eligible to be used by the AsYouTypeFormatter.
+  // Checks if a format is eligible to be used by the AsYouTypeFormatter. This
+  // method is here rather than in asyoutypeformatter.h since it depends on the
+  // valid punctuation declared by the phone number util.
   bool IsFormatEligibleForAsYouTypeFormatter(const string& format) const;
 
+  // Helper function to check if the national prefix formatting rule has the
+  // first group only, i.e., does not start with the national prefix.
+  bool FormattingRuleHasFirstGroupOnly(
+      const string& national_prefix_formatting_rule) const;
+
   // Trims unwanted end characters from a phone number string.
   void TrimUnwantedEndChars(string* number) const;
 

cpp/src/phonenumbers/regexp_adapter_icu.cc

@@ -190,18 +190,31 @@ class IcuRegExp : public RegExp {
     if (U_FAILURE(status)) {
       return false;
     }
-    UnicodeString result = global
-        ? matcher->replaceAll(
-            Utf8StringToUnicodeString(replacement_string), status)
-        : matcher->replaceFirst(
-            Utf8StringToUnicodeString(replacement_string), status);
-    if (U_FAILURE(status)) {
+
+    UnicodeString output;
+    // We reimplement ReplaceFirst and ReplaceAll such that their behaviour is
+    // consistent with the RE2 reg-ex matcher.
+    if (!matcher->find()) {
       return false;
     }
-    const string replaced_string = UnicodeStringToUtf8String(result);
-    if (replaced_string == *string_to_process) {
+    matcher->appendReplacement(output,
+                               Utf8StringToUnicodeString(replacement_string),
+                               status);
+    if (global) {
+      // Continue and look for more matches.
+      while (matcher->find()) {
+        matcher->appendReplacement(
+            output,
+            Utf8StringToUnicodeString(replacement_string),
+            status);
+      }
+    }
+
+    matcher->appendTail(output);
+    if (U_FAILURE(status)) {
       return false;
     }
+    const string replaced_string = UnicodeStringToUtf8String(output);
     *string_to_process = replaced_string;
     return true;
   }

cpp/src/phonenumbers/stringutil.cc

@@ -365,6 +365,32 @@ string StrCat(const StringHolder& s1, const StringHolder& s2,
   return result;
 }
 
+string StrCat(const StringHolder& s1, const StringHolder& s2,
+              const StringHolder& s3, const StringHolder& s4,
+              const StringHolder& s5, const StringHolder& s6,
+              const StringHolder& s7, const StringHolder& s8,
+              const StringHolder& s9, const StringHolder& s10,
+              const StringHolder& s11, const StringHolder& s12) {
+  string result;
+  result.reserve(s1.Length() + s2.Length()  + s3.Length() + s4.Length() +
+                 s5.Length() + s6.Length()  + s7.Length() + s8.Length() +
+                 s9.Length() + s10.Length() + s11.Length() + s12.Length());
+  result += s1;
+  result += s2;
+  result += s3;
+  result += s4;
+  result += s5;
+  result += s6;
+  result += s7;
+  result += s8;
+  result += s9;
+  result += s10;
+  result += s11;
+  result += s12;
+
+  return result;
+}
+
 // StrAppend
 
 void StrAppend(string* dest, const StringHolder& s1) {

cpp/src/phonenumbers/stringutil.h

@@ -149,6 +149,13 @@ string StrCat(const StringHolder& s1, const StringHolder& s2,
               const StringHolder& s9, const StringHolder& s10,
               const StringHolder& s11);
 
+string StrCat(const StringHolder& s1, const StringHolder& s2,
+              const StringHolder& s3, const StringHolder& s4,
+              const StringHolder& s5, const StringHolder& s6,
+              const StringHolder& s7, const StringHolder& s8,
+              const StringHolder& s9, const StringHolder& s10,
+              const StringHolder& s11, const StringHolder& s12);
+
 void StrAppend(string* dest, const StringHolder& s1);
 
 void StrAppend(string* dest, const StringHolder& s1, const StringHolder& s2);

cpp/src/phonenumbers/test_metadata.cc

@@ -52,7 +52,7 @@ static const unsigned char data[] = {
   0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xCA, 0x01, 0x08, 0x12, 0x02,
   0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xDA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41,
   0x1A, 0x02, 0x4E, 0x41, 0xE2, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02,
-  0x4E, 0x41, 0x0A, 0x91, 0x06, 0x0A, 0x1C, 0x12, 0x10, 0x5B, 0x31, 0x2D, 0x33,
+  0x4E, 0x41, 0x0A, 0xC4, 0x06, 0x0A, 0x1C, 0x12, 0x10, 0x5B, 0x31, 0x2D, 0x33,
   0x36, 0x38, 0x39, 0x5D, 0x5C, 0x64, 0x7B, 0x39, 0x2C, 0x31, 0x30, 0x7D, 0x1A,
   0x08, 0x5C, 0x64, 0x7B, 0x36, 0x2C, 0x31, 0x31, 0x7D, 0x12, 0x16, 0x12, 0x0A,
   0x5B, 0x31, 0x2D, 0x33, 0x5D, 0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x1A, 0x08, 0x5C,
@@ -90,89 +90,118 @@ static const unsigned char data[] = {
   0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C,
   0x64, 0x7B, 0x34, 0x7D, 0x29, 0x12, 0x08, 0x24, 0x31, 0x2D, 0x24, 0x32, 0x2D,
   0x24, 0x33, 0x1A, 0x04, 0x5B, 0x36, 0x38, 0x5D, 0x22, 0x03, 0x30, 0x24, 0x31,
-  0x2A, 0x00, 0x30, 0x00, 0xA2, 0x01, 0x25, 0x0A, 0x15, 0x28, 0x5C, 0x64, 0x7B,
+  0x2A, 0x00, 0x30, 0x00, 0xA2, 0x01, 0x32, 0x0A, 0x15, 0x28, 0x5C, 0x64, 0x7B,
   0x32, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x28, 0x5C, 0x64,
   0x7B, 0x34, 0x7D, 0x29, 0x12, 0x08, 0x24, 0x31, 0x20, 0x24, 0x32, 0x2D, 0x24,
-  0x33, 0x1A, 0x02, 0x31, 0x31, 0xA2, 0x01, 0x2F, 0x0A, 0x15, 0x28, 0x5C, 0x64,
+  0x33, 0x1A, 0x02, 0x31, 0x31, 0x1A, 0x02, 0x31, 0x31, 0x22, 0x03, 0x30, 0x24,
+  0x31, 0x2A, 0x00, 0x30, 0x00, 0xA2, 0x01, 0x46, 0x0A, 0x15, 0x28, 0x5C, 0x64,
   0x7B, 0x34, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x32, 0x7D, 0x29, 0x28, 0x5C,
   0x64, 0x7B, 0x34, 0x7D, 0x29, 0x12, 0x08, 0x24, 0x31, 0x20, 0x24, 0x32, 0x2D,
   0x24, 0x33, 0x1A, 0x0C, 0x31, 0x5B, 0x30, 0x32, 0x2D, 0x39, 0x5D, 0x7C, 0x5B,
-  0x32, 0x33, 0x5D, 0xA2, 0x01, 0x29, 0x0A, 0x15, 0x28, 0x39, 0x29, 0x28, 0x31,
-  0x31, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B,
-  0x34, 0x7D, 0x29, 0x12, 0x0B, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33,
-  0x20, 0x24, 0x34, 0x1A, 0x03, 0x39, 0x31, 0x31, 0xA2, 0x01, 0x3A, 0x0A, 0x18,
-  0x28, 0x39, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x28, 0x5C, 0x64,
-  0x7B, 0x32, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x12, 0x0B,
-  0x24, 0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0x20, 0x24, 0x34, 0x1A, 0x11,
-  0x39, 0x28, 0x3F, 0x3A, 0x31, 0x5B, 0x30, 0x32, 0x2D, 0x39, 0x5D, 0x7C, 0x5B,
-  0x32, 0x33, 0x5D, 0x29, 0xA2, 0x01, 0x27, 0x0A, 0x15, 0x28, 0x5C, 0x64, 0x7B,
-  0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64,
-  0x7B, 0x34, 0x7D, 0x29, 0x12, 0x08, 0x24, 0x31, 0x2D, 0x24, 0x32, 0x2D, 0x24,
-  0x33, 0x1A, 0x04, 0x5B, 0x36, 0x38, 0x5D, 0xAA, 0x01, 0x08, 0x12, 0x02, 0x4E,
-  0x41, 0x1A, 0x02, 0x4E, 0x41, 0xC2, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A,
-  0x02, 0x4E, 0x41, 0xCA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E,
-  0x41, 0xDA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xE2,
-  0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x0A, 0xCC, 0x02,
-  0x0A, 0x1B, 0x12, 0x0F, 0x5B, 0x31, 0x2D, 0x35, 0x37, 0x38, 0x5D, 0x5C, 0x64,
-  0x7B, 0x34, 0x2C, 0x31, 0x34, 0x7D, 0x1A, 0x08, 0x5C, 0x64, 0x7B, 0x35, 0x2C,
-  0x31, 0x35, 0x7D, 0x12, 0x14, 0x12, 0x0B, 0x5B, 0x32, 0x33, 0x37, 0x38, 0x5D,
-  0x5C, 0x64, 0x7B, 0x38, 0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x1A,
-  0x0F, 0x12, 0x06, 0x34, 0x5C, 0x64, 0x7B, 0x38, 0x7D, 0x1A, 0x05, 0x5C, 0x64,
-  0x7B, 0x39, 0x7D, 0x22, 0x13, 0x12, 0x09, 0x31, 0x38, 0x30, 0x30, 0x5C, 0x64,
-  0x7B, 0x36, 0x7D, 0x1A, 0x06, 0x5C, 0x64, 0x7B, 0x31, 0x30, 0x7D, 0x2A, 0x18,
-  0x12, 0x0E, 0x31, 0x39, 0x30, 0x5B, 0x30, 0x31, 0x32, 0x36, 0x5D, 0x5C, 0x64,
-  0x7B, 0x36, 0x7D, 0x1A, 0x06, 0x5C, 0x64, 0x7B, 0x31, 0x30, 0x7D, 0x32, 0x08,
-  0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x3A, 0x08, 0x12, 0x02, 0x4E,
-  0x41, 0x1A, 0x02, 0x4E, 0x41, 0x42, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02,
-  0x4E, 0x41, 0x4A, 0x02, 0x41, 0x55, 0x50, 0x3D, 0x5A, 0x07, 0x30, 0x30, 0x31,
-  0x5B, 0x31, 0x32, 0x5D, 0x62, 0x01, 0x30, 0x7A, 0x01, 0x30, 0x8A, 0x01, 0x04,
-  0x30, 0x30, 0x31, 0x31, 0x90, 0x01, 0x00, 0x9A, 0x01, 0x2C, 0x0A, 0x15, 0x28,
-  0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29,
-  0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x12, 0x08, 0x24, 0x31, 0x20, 0x24,
-  0x32, 0x20, 0x24, 0x33, 0x1A, 0x01, 0x31, 0x22, 0x02, 0x24, 0x31, 0x2A, 0x00,
-  0x30, 0x00, 0x9A, 0x01, 0x33, 0x0A, 0x15, 0x28, 0x5C, 0x64, 0x7B, 0x31, 0x7D,
-  0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34,
-  0x7D, 0x29, 0x12, 0x08, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0x1A,
-  0x07, 0x5B, 0x32, 0x2D, 0x34, 0x37, 0x38, 0x5D, 0x22, 0x03, 0x30, 0x24, 0x31,
-  0x2A, 0x00, 0x30, 0x00, 0xAA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02,
-  0x4E, 0x41, 0xC2, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41,
-  0xCA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xDA, 0x01,
-  0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xE2, 0x01, 0x08, 0x12,
-  0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x0A, 0x95, 0x01, 0x0A, 0x00, 0x12,
-  0x00, 0x1A, 0x00, 0x22, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41,
-  0x2A, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x32, 0x08, 0x12,
+  0x32, 0x33, 0x5D, 0x1A, 0x0C, 0x31, 0x5B, 0x30, 0x32, 0x2D, 0x39, 0x5D, 0x7C,
+  0x5B, 0x32, 0x33, 0x5D, 0x22, 0x03, 0x30, 0x24, 0x31, 0x2A, 0x00, 0x30, 0x00,
+  0xA2, 0x01, 0x29, 0x0A, 0x15, 0x28, 0x39, 0x29, 0x28, 0x31, 0x31, 0x29, 0x28,
+  0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29,
+  0x12, 0x0B, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0x20, 0x24, 0x34,
+  0x1A, 0x03, 0x39, 0x31, 0x31, 0xA2, 0x01, 0x3A, 0x0A, 0x18, 0x28, 0x39, 0x29,
+  0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x32, 0x7D,
+  0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x12, 0x0B, 0x24, 0x31, 0x20,
+  0x24, 0x32, 0x20, 0x24, 0x33, 0x20, 0x24, 0x34, 0x1A, 0x11, 0x39, 0x28, 0x3F,
+  0x3A, 0x31, 0x5B, 0x30, 0x32, 0x2D, 0x39, 0x5D, 0x7C, 0x5B, 0x32, 0x33, 0x5D,
+  0x29, 0xA2, 0x01, 0x36, 0x0A, 0x15, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29,
+  0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D,
+  0x29, 0x12, 0x08, 0x24, 0x31, 0x2D, 0x24, 0x32, 0x2D, 0x24, 0x33, 0x1A, 0x04,
+  0x5B, 0x36, 0x38, 0x5D, 0x1A, 0x04, 0x5B, 0x36, 0x38, 0x5D, 0x22, 0x03, 0x30,
+  0x24, 0x31, 0x2A, 0x00, 0x30, 0x00, 0xAA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41,
+  0x1A, 0x02, 0x4E, 0x41, 0xC2, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02,
+  0x4E, 0x41, 0xCA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41,
+  0xDA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xE2, 0x01,
+  0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x0A, 0xCC, 0x02, 0x0A,
+  0x1B, 0x12, 0x0F, 0x5B, 0x31, 0x2D, 0x35, 0x37, 0x38, 0x5D, 0x5C, 0x64, 0x7B,
+  0x34, 0x2C, 0x31, 0x34, 0x7D, 0x1A, 0x08, 0x5C, 0x64, 0x7B, 0x35, 0x2C, 0x31,
+  0x35, 0x7D, 0x12, 0x14, 0x12, 0x0B, 0x5B, 0x32, 0x33, 0x37, 0x38, 0x5D, 0x5C,
+  0x64, 0x7B, 0x38, 0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x1A, 0x0F,
+  0x12, 0x06, 0x34, 0x5C, 0x64, 0x7B, 0x38, 0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B,
+  0x39, 0x7D, 0x22, 0x13, 0x12, 0x09, 0x31, 0x38, 0x30, 0x30, 0x5C, 0x64, 0x7B,
+  0x36, 0x7D, 0x1A, 0x06, 0x5C, 0x64, 0x7B, 0x31, 0x30, 0x7D, 0x2A, 0x18, 0x12,
+  0x0E, 0x31, 0x39, 0x30, 0x5B, 0x30, 0x31, 0x32, 0x36, 0x5D, 0x5C, 0x64, 0x7B,
+  0x36, 0x7D, 0x1A, 0x06, 0x5C, 0x64, 0x7B, 0x31, 0x30, 0x7D, 0x32, 0x08, 0x12,
   0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x3A, 0x08, 0x12, 0x02, 0x4E, 0x41,
   0x1A, 0x02, 0x4E, 0x41, 0x42, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E,
-  0x41, 0x4A, 0x02, 0x42, 0x52, 0x50, 0x37, 0x5A, 0x04, 0x30, 0x30, 0x31, 0x34,
-  0x62, 0x01, 0x30, 0x7A, 0x01, 0x30, 0x90, 0x01, 0x01, 0xAA, 0x01, 0x08, 0x12,
-  0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xC2, 0x01, 0x08, 0x12, 0x02, 0x4E,
-  0x41, 0x1A, 0x02, 0x4E, 0x41, 0xCA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A,
-  0x02, 0x4E, 0x41, 0xDA, 0x01, 0x19, 0x12, 0x0B, 0x31, 0x39, 0x5B, 0x30, 0x32,
-  0x33, 0x5D, 0x7C, 0x39, 0x31, 0x31, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x33, 0x7D,
-  0x32, 0x03, 0x31, 0x39, 0x30, 0xE2, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A,
-  0x02, 0x4E, 0x41, 0x0A, 0xDA, 0x02, 0x0A, 0x29, 0x12, 0x1D, 0x28, 0x32, 0x34,
-  0x32, 0x7C, 0x38, 0x28, 0x30, 0x30, 0x7C, 0x36, 0x36, 0x7C, 0x37, 0x37, 0x7C,
-  0x38, 0x38, 0x29, 0x7C, 0x39, 0x30, 0x30, 0x29, 0x5C, 0x64, 0x7B, 0x37, 0x7D,
-  0x1A, 0x08, 0x5C, 0x64, 0x7B, 0x37, 0x2C, 0x31, 0x30, 0x7D, 0x12, 0x6C, 0x12,
-  0x60, 0x32, 0x34, 0x32, 0x28, 0x3F, 0x3A, 0x33, 0x28, 0x3F, 0x3A, 0x30, 0x32,
-  0x7C, 0x5B, 0x32, 0x33, 0x36, 0x5D, 0x5B, 0x31, 0x2D, 0x39, 0x5D, 0x7C, 0x34,
-  0x5B, 0x30, 0x2D, 0x32, 0x34, 0x2D, 0x39, 0x5D, 0x7C, 0x35, 0x5B, 0x30, 0x2D,
-  0x36, 0x38, 0x5D, 0x7C, 0x37, 0x5B, 0x33, 0x2D, 0x35, 0x37, 0x5D, 0x7C, 0x39,
-  0x5B, 0x32, 0x2D, 0x35, 0x5D, 0x29, 0x7C, 0x34, 0x28, 0x3F, 0x3A, 0x32, 0x5B,
-  0x32, 0x33, 0x37, 0x5D, 0x7C, 0x35, 0x31, 0x7C, 0x36, 0x34, 0x7C, 0x37, 0x37,
-  0x29, 0x7C, 0x35, 0x30, 0x32, 0x7C, 0x36, 0x33, 0x36, 0x7C, 0x37, 0x30, 0x32,
-  0x29, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x1A, 0x08, 0x5C, 0x64, 0x7B, 0x37, 0x2C,
-  0x31, 0x30, 0x7D, 0x1A, 0x23, 0x12, 0x19, 0x32, 0x34, 0x32, 0x28, 0x33, 0x35,
-  0x37, 0x7C, 0x33, 0x35, 0x39, 0x7C, 0x34, 0x35, 0x37, 0x7C, 0x35, 0x35, 0x37,
-  0x29, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x1A, 0x06, 0x5C, 0x64, 0x7B, 0x31, 0x30,
-  0x7D, 0x22, 0x1D, 0x12, 0x13, 0x38, 0x28, 0x30, 0x30, 0x7C, 0x36, 0x36, 0x7C,
-  0x37, 0x37, 0x7C, 0x38, 0x38, 0x29, 0x5C, 0x64, 0x7B, 0x37, 0x7D, 0x1A, 0x06,
-  0x5C, 0x64, 0x7B, 0x31, 0x30, 0x7D, 0x2A, 0x12, 0x12, 0x08, 0x39, 0x30, 0x30,
-  0x5C, 0x64, 0x7B, 0x37, 0x7D, 0x1A, 0x06, 0x5C, 0x64, 0x7B, 0x31, 0x30, 0x7D,
-  0x32, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x3A, 0x08, 0x12,
-  0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x42, 0x08, 0x12, 0x02, 0x4E, 0x41,
-  0x1A, 0x02, 0x4E, 0x41, 0x4A, 0x02, 0x42, 0x53, 0x50, 0x01, 0x5A, 0x03, 0x30,
-  0x31, 0x31, 0x62, 0x01, 0x31, 0x7A, 0x01, 0x31, 0x90, 0x01, 0x00, 0xAA, 0x01,
+  0x41, 0x4A, 0x02, 0x41, 0x55, 0x50, 0x3D, 0x5A, 0x07, 0x30, 0x30, 0x31, 0x5B,
+  0x31, 0x32, 0x5D, 0x62, 0x01, 0x30, 0x7A, 0x01, 0x30, 0x8A, 0x01, 0x04, 0x30,
+  0x30, 0x31, 0x31, 0x90, 0x01, 0x00, 0x9A, 0x01, 0x2C, 0x0A, 0x15, 0x28, 0x5C,
+  0x64, 0x7B, 0x34, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28,
+  0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x12, 0x08, 0x24, 0x31, 0x20, 0x24, 0x32,
+  0x20, 0x24, 0x33, 0x1A, 0x01, 0x31, 0x22, 0x02, 0x24, 0x31, 0x2A, 0x00, 0x30,
+  0x00, 0x9A, 0x01, 0x33, 0x0A, 0x15, 0x28, 0x5C, 0x64, 0x7B, 0x31, 0x7D, 0x29,
+  0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D,
+  0x29, 0x12, 0x08, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0x1A, 0x07,
+  0x5B, 0x32, 0x2D, 0x34, 0x37, 0x38, 0x5D, 0x22, 0x03, 0x30, 0x24, 0x31, 0x2A,
+  0x00, 0x30, 0x00, 0xAA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E,
+  0x41, 0xC2, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xCA,
+  0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xDA, 0x01, 0x08,
+  0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xE2, 0x01, 0x08, 0x12, 0x02,
+  0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x0A, 0x95, 0x01, 0x0A, 0x00, 0x12, 0x00,
+  0x1A, 0x00, 0x22, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x2A,
+  0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x32, 0x08, 0x12, 0x02,
+  0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x3A, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A,
+  0x02, 0x4E, 0x41, 0x42, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41,
+  0x4A, 0x02, 0x42, 0x52, 0x50, 0x37, 0x5A, 0x04, 0x30, 0x30, 0x31, 0x34, 0x62,
+  0x01, 0x30, 0x7A, 0x01, 0x30, 0x90, 0x01, 0x01, 0xAA, 0x01, 0x08, 0x12, 0x02,
+  0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xC2, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41,
+  0x1A, 0x02, 0x4E, 0x41, 0xCA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02,
+  0x4E, 0x41, 0xDA, 0x01, 0x19, 0x12, 0x0B, 0x31, 0x39, 0x5B, 0x30, 0x32, 0x33,
+  0x5D, 0x7C, 0x39, 0x31, 0x31, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x32,
+  0x03, 0x31, 0x39, 0x30, 0xE2, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02,
+  0x4E, 0x41, 0x0A, 0xDA, 0x02, 0x0A, 0x29, 0x12, 0x1D, 0x28, 0x32, 0x34, 0x32,
+  0x7C, 0x38, 0x28, 0x30, 0x30, 0x7C, 0x36, 0x36, 0x7C, 0x37, 0x37, 0x7C, 0x38,
+  0x38, 0x29, 0x7C, 0x39, 0x30, 0x30, 0x29, 0x5C, 0x64, 0x7B, 0x37, 0x7D, 0x1A,
+  0x08, 0x5C, 0x64, 0x7B, 0x37, 0x2C, 0x31, 0x30, 0x7D, 0x12, 0x6C, 0x12, 0x60,
+  0x32, 0x34, 0x32, 0x28, 0x3F, 0x3A, 0x33, 0x28, 0x3F, 0x3A, 0x30, 0x32, 0x7C,
+  0x5B, 0x32, 0x33, 0x36, 0x5D, 0x5B, 0x31, 0x2D, 0x39, 0x5D, 0x7C, 0x34, 0x5B,
+  0x30, 0x2D, 0x32, 0x34, 0x2D, 0x39, 0x5D, 0x7C, 0x35, 0x5B, 0x30, 0x2D, 0x36,
+  0x38, 0x5D, 0x7C, 0x37, 0x5B, 0x33, 0x2D, 0x35, 0x37, 0x5D, 0x7C, 0x39, 0x5B,
+  0x32, 0x2D, 0x35, 0x5D, 0x29, 0x7C, 0x34, 0x28, 0x3F, 0x3A, 0x32, 0x5B, 0x32,
+  0x33, 0x37, 0x5D, 0x7C, 0x35, 0x31, 0x7C, 0x36, 0x34, 0x7C, 0x37, 0x37, 0x29,
+  0x7C, 0x35, 0x30, 0x32, 0x7C, 0x36, 0x33, 0x36, 0x7C, 0x37, 0x30, 0x32, 0x29,
+  0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x1A, 0x08, 0x5C, 0x64, 0x7B, 0x37, 0x2C, 0x31,
+  0x30, 0x7D, 0x1A, 0x23, 0x12, 0x19, 0x32, 0x34, 0x32, 0x28, 0x33, 0x35, 0x37,
+  0x7C, 0x33, 0x35, 0x39, 0x7C, 0x34, 0x35, 0x37, 0x7C, 0x35, 0x35, 0x37, 0x29,
+  0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x1A, 0x06, 0x5C, 0x64, 0x7B, 0x31, 0x30, 0x7D,
+  0x22, 0x1D, 0x12, 0x13, 0x38, 0x28, 0x30, 0x30, 0x7C, 0x36, 0x36, 0x7C, 0x37,
+  0x37, 0x7C, 0x38, 0x38, 0x29, 0x5C, 0x64, 0x7B, 0x37, 0x7D, 0x1A, 0x06, 0x5C,
+  0x64, 0x7B, 0x31, 0x30, 0x7D, 0x2A, 0x12, 0x12, 0x08, 0x39, 0x30, 0x30, 0x5C,
+  0x64, 0x7B, 0x37, 0x7D, 0x1A, 0x06, 0x5C, 0x64, 0x7B, 0x31, 0x30, 0x7D, 0x32,
+  0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x3A, 0x08, 0x12, 0x02,
+  0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x42, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A,
+  0x02, 0x4E, 0x41, 0x4A, 0x02, 0x42, 0x53, 0x50, 0x01, 0x5A, 0x03, 0x30, 0x31,
+  0x31, 0x62, 0x01, 0x31, 0x7A, 0x01, 0x31, 0x90, 0x01, 0x00, 0xAA, 0x01, 0x08,
+  0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xC2, 0x01, 0x08, 0x12, 0x02,
+  0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xCA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41,
+  0x1A, 0x02, 0x4E, 0x41, 0xDA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02,
+  0x4E, 0x41, 0xE2, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41,
+  0x0A, 0xC3, 0x02, 0x0A, 0x13, 0x12, 0x0A, 0x5B, 0x31, 0x2D, 0x39, 0x5D, 0x5C,
+  0x64, 0x7B, 0x35, 0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x36, 0x7D, 0x12, 0x1B,
+  0x12, 0x0A, 0x5B, 0x31, 0x2D, 0x39, 0x5D, 0x5C, 0x64, 0x7B, 0x35, 0x7D, 0x1A,
+  0x05, 0x5C, 0x64, 0x7B, 0x36, 0x7D, 0x32, 0x06, 0x31, 0x31, 0x32, 0x33, 0x34,
+  0x35, 0x1A, 0x13, 0x12, 0x0A, 0x5B, 0x31, 0x2D, 0x39, 0x5D, 0x5C, 0x64, 0x7B,
+  0x35, 0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x36, 0x7D, 0x22, 0x08, 0x12, 0x02,
+  0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x2A, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A,
+  0x02, 0x4E, 0x41, 0x32, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41,
+  0x3A, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x42, 0x08, 0x12,
+  0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x4A, 0x02, 0x42, 0x59, 0x50, 0xF7,
+  0x02, 0x5A, 0x03, 0x38, 0x31, 0x30, 0x62, 0x01, 0x38, 0x7A, 0x09, 0x38, 0x30,
+  0x3F, 0x7C, 0x39, 0x39, 0x39, 0x39, 0x39, 0x90, 0x01, 0x01, 0x9A, 0x01, 0x1E,
+  0x0A, 0x07, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x12, 0x02, 0x24, 0x31,
+  0x1A, 0x05, 0x5B, 0x31, 0x2D, 0x38, 0x5D, 0x22, 0x04, 0x38, 0x20, 0x24, 0x31,
+  0x2A, 0x00, 0x30, 0x00, 0x9A, 0x01, 0x27, 0x0A, 0x0E, 0x28, 0x5C, 0x64, 0x7B,
+  0x32, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x12, 0x05, 0x24,
+  0x31, 0x20, 0x24, 0x32, 0x1A, 0x05, 0x5B, 0x31, 0x2D, 0x38, 0x5D, 0x22, 0x03,
+  0x38, 0x24, 0x31, 0x2A, 0x00, 0x30, 0x00, 0x9A, 0x01, 0x28, 0x0A, 0x0E, 0x28,
+  0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29,
+  0x12, 0x05, 0x24, 0x31, 0x20, 0x24, 0x32, 0x1A, 0x05, 0x5B, 0x31, 0x2D, 0x38,
+  0x5D, 0x22, 0x04, 0x38, 0x20, 0x24, 0x31, 0x2A, 0x00, 0x30, 0x00, 0xAA, 0x01,
   0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xC2, 0x01, 0x08, 0x12,
   0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xCA, 0x01, 0x08, 0x12, 0x02, 0x4E,
   0x41, 0x1A, 0x02, 0x4E, 0x41, 0xDA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A,
@@ -472,7 +501,7 @@ static const unsigned char data[] = {
   0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xCA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41,
   0x1A, 0x02, 0x4E, 0x41, 0xDA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02,
   0x4E, 0x41, 0xE2, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41,
-  0x0A, 0x8C, 0x07, 0x0A, 0x19, 0x12, 0x0D, 0x5B, 0x31, 0x2D, 0x39, 0x5D, 0x5C,
+  0x0A, 0xEA, 0x07, 0x0A, 0x19, 0x12, 0x0D, 0x5B, 0x31, 0x2D, 0x39, 0x5D, 0x5C,
   0x64, 0x7B, 0x39, 0x2C, 0x31, 0x30, 0x7D, 0x1A, 0x08, 0x5C, 0x64, 0x7B, 0x37,
   0x2C, 0x31, 0x31, 0x7D, 0x12, 0x16, 0x12, 0x0A, 0x5B, 0x32, 0x2D, 0x39, 0x5D,
   0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x1A, 0x08, 0x5C, 0x64, 0x7B, 0x37, 0x2C, 0x31,
@@ -514,249 +543,257 @@ static const unsigned char data[] = {
   0x39, 0x5D, 0x7C, 0x33, 0x5B, 0x30, 0x2D, 0x32, 0x34, 0x2D, 0x39, 0x5D, 0x7C,
   0x35, 0x5B, 0x30, 0x2D, 0x34, 0x36, 0x2D, 0x39, 0x5D, 0x7C, 0x38, 0x5B, 0x30,
   0x32, 0x2D, 0x39, 0x5D, 0x29, 0x22, 0x02, 0x24, 0x31, 0x2A, 0x00, 0x30, 0x00,
-  0xA2, 0x01, 0x29, 0x0A, 0x15, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28,
+  0xA2, 0x01, 0x3C, 0x0A, 0x15, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28,
   0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29,
   0x12, 0x08, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0x1A, 0x06, 0x5B,
-  0x38, 0x39, 0x5D, 0x30, 0x30, 0xA2, 0x01, 0x2B, 0x0A, 0x15, 0x28, 0x5C, 0x64,
+  0x38, 0x39, 0x5D, 0x30, 0x30, 0x1A, 0x06, 0x5B, 0x38, 0x39, 0x5D, 0x30, 0x30,
+  0x22, 0x05, 0x30, 0x31, 0x20, 0x24, 0x31, 0x2A, 0x00, 0x30, 0x01, 0xA2, 0x01,
+  0x40, 0x0A, 0x15, 0x28, 0x5C, 0x64, 0x7B, 0x32, 0x7D, 0x29, 0x28, 0x5C, 0x64,
+  0x7B, 0x34, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x12, 0x08,
+  0x24, 0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0x1A, 0x08, 0x33, 0x33, 0x7C,
+  0x35, 0x35, 0x7C, 0x38, 0x31, 0x1A, 0x08, 0x33, 0x33, 0x7C, 0x35, 0x35, 0x7C,
+  0x38, 0x31, 0x22, 0x05, 0x30, 0x31, 0x20, 0x24, 0x31, 0x2A, 0x00, 0x30, 0x01,
+  0xA2, 0x01, 0x80, 0x01, 0x0A, 0x15, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29,
+  0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D,
+  0x29, 0x12, 0x08, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0x1A, 0x28,
+  0x5B, 0x32, 0x34, 0x36, 0x37, 0x5D, 0x7C, 0x33, 0x5B, 0x30, 0x2D, 0x32, 0x34,
+  0x2D, 0x39, 0x5D, 0x7C, 0x35, 0x5B, 0x30, 0x2D, 0x34, 0x36, 0x2D, 0x39, 0x5D,
+  0x7C, 0x38, 0x5B, 0x32, 0x2D, 0x39, 0x5D, 0x7C, 0x39, 0x5B, 0x31, 0x2D, 0x39,
+  0x5D, 0x1A, 0x28, 0x5B, 0x32, 0x34, 0x36, 0x37, 0x5D, 0x7C, 0x33, 0x5B, 0x30,
+  0x2D, 0x32, 0x34, 0x2D, 0x39, 0x5D, 0x7C, 0x35, 0x5B, 0x30, 0x2D, 0x34, 0x36,
+  0x2D, 0x39, 0x5D, 0x7C, 0x38, 0x5B, 0x32, 0x2D, 0x39, 0x5D, 0x7C, 0x39, 0x5B,
+  0x31, 0x2D, 0x39, 0x5D, 0x22, 0x05, 0x30, 0x31, 0x20, 0x24, 0x31, 0x2A, 0x00,
+  0x30, 0x01, 0xA2, 0x01, 0x36, 0x0A, 0x18, 0x28, 0x31, 0x29, 0x28, 0x5C, 0x64,
   0x7B, 0x32, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x28, 0x5C,
-  0x64, 0x7B, 0x34, 0x7D, 0x29, 0x12, 0x08, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20,
-  0x24, 0x33, 0x1A, 0x08, 0x33, 0x33, 0x7C, 0x35, 0x35, 0x7C, 0x38, 0x31, 0xA2,
-  0x01, 0x4B, 0x0A, 0x15, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C,
-  0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x12,
-  0x08, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0x1A, 0x28, 0x5B, 0x32,
-  0x34, 0x36, 0x37, 0x5D, 0x7C, 0x33, 0x5B, 0x30, 0x2D, 0x32, 0x34, 0x2D, 0x39,
-  0x5D, 0x7C, 0x35, 0x5B, 0x30, 0x2D, 0x34, 0x36, 0x2D, 0x39, 0x5D, 0x7C, 0x38,
-  0x5B, 0x32, 0x2D, 0x39, 0x5D, 0x7C, 0x39, 0x5B, 0x31, 0x2D, 0x39, 0x5D, 0xA2,
-  0x01, 0x36, 0x0A, 0x18, 0x28, 0x31, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x32, 0x7D,
-  0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34,
-  0x7D, 0x29, 0x12, 0x0B, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0x20,
-  0x24, 0x34, 0x1A, 0x0D, 0x31, 0x28, 0x3F, 0x3A, 0x33, 0x33, 0x7C, 0x35, 0x35,
-  0x7C, 0x38, 0x31, 0x29, 0xA2, 0x01, 0x52, 0x0A, 0x18, 0x28, 0x31, 0x29, 0x28,
-  0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29,
-  0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x12, 0x0B, 0x24, 0x31, 0x20, 0x24,
-  0x32, 0x20, 0x24, 0x33, 0x20, 0x24, 0x34, 0x1A, 0x29, 0x31, 0x28, 0x3F, 0x3A,
-  0x5B, 0x31, 0x32, 0x34, 0x35, 0x37, 0x39, 0x5D, 0x7C, 0x33, 0x5B, 0x30, 0x2D,
-  0x32, 0x34, 0x2D, 0x39, 0x5D, 0x7C, 0x35, 0x5B, 0x30, 0x2D, 0x34, 0x36, 0x2D,
-  0x39, 0x5D, 0x7C, 0x38, 0x5B, 0x30, 0x32, 0x2D, 0x39, 0x5D, 0x29, 0xAA, 0x01,
-  0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xC2, 0x01, 0x08, 0x12,
-  0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xCA, 0x01, 0x08, 0x12, 0x02, 0x4E,
-  0x41, 0x1A, 0x02, 0x4E, 0x41, 0xDA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A,
-  0x02, 0x4E, 0x41, 0xE2, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E,
-  0x41, 0x0A, 0xFA, 0x03, 0x0A, 0x23, 0x12, 0x17, 0x5B, 0x32, 0x38, 0x39, 0x5D,
-  0x5C, 0x64, 0x7B, 0x37, 0x2C, 0x39, 0x7D, 0x7C, 0x5B, 0x33, 0x2D, 0x37, 0x5D,
-  0x5C, 0x64, 0x7B, 0x37, 0x7D, 0x1A, 0x08, 0x5C, 0x64, 0x7B, 0x37, 0x2C, 0x31,
-  0x30, 0x7D, 0x12, 0x3C, 0x12, 0x31, 0x32, 0x34, 0x30, 0x39, 0x39, 0x5C, 0x64,
-  0x7B, 0x33, 0x7D, 0x7C, 0x28, 0x3F, 0x3A, 0x33, 0x5B, 0x32, 0x2D, 0x37, 0x39,
-  0x5D, 0x7C, 0x5B, 0x34, 0x37, 0x39, 0x5D, 0x5B, 0x32, 0x2D, 0x36, 0x38, 0x39,
-  0x5D, 0x7C, 0x36, 0x5B, 0x32, 0x33, 0x35, 0x2D, 0x39, 0x5D, 0x29, 0x5C, 0x64,
-  0x7B, 0x36, 0x7D, 0x1A, 0x07, 0x5C, 0x64, 0x7B, 0x37, 0x2C, 0x38, 0x7D, 0x1A,
-  0x5E, 0x12, 0x52, 0x32, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x32, 0x37, 0x5D, 0x5C,
-  0x64, 0x7B, 0x37, 0x7D, 0x7C, 0x39, 0x5C, 0x64, 0x7B, 0x36, 0x2C, 0x37, 0x7D,
-  0x7C, 0x31, 0x28, 0x3F, 0x3A, 0x30, 0x5C, 0x64, 0x7B, 0x35, 0x2C, 0x37, 0x7D,
-  0x7C, 0x5B, 0x31, 0x32, 0x5D, 0x5C, 0x64, 0x7B, 0x35, 0x2C, 0x36, 0x7D, 0x7C,
-  0x5B, 0x33, 0x2D, 0x39, 0x5D, 0x5C, 0x64, 0x7B, 0x35, 0x7D, 0x29, 0x7C, 0x34,
-  0x5B, 0x31, 0x2D, 0x39, 0x5D, 0x5C, 0x64, 0x7B, 0x36, 0x7D, 0x7C, 0x38, 0x5C,
-  0x64, 0x7B, 0x37, 0x2C, 0x38, 0x7D, 0x29, 0x1A, 0x08, 0x5C, 0x64, 0x7B, 0x38,
-  0x2C, 0x31, 0x30, 0x7D, 0x22, 0x16, 0x12, 0x0A, 0x38, 0x30, 0x30, 0x5C, 0x64,
-  0x7B, 0x36, 0x2C, 0x37, 0x7D, 0x1A, 0x08, 0x5C, 0x64, 0x7B, 0x39, 0x2C, 0x31,
-  0x30, 0x7D, 0x2A, 0x16, 0x12, 0x0A, 0x39, 0x30, 0x30, 0x5C, 0x64, 0x7B, 0x36,
-  0x2C, 0x37, 0x7D, 0x1A, 0x08, 0x5C, 0x64, 0x7B, 0x39, 0x2C, 0x31, 0x30, 0x7D,
+  0x64, 0x7B, 0x34, 0x7D, 0x29, 0x12, 0x0B, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20,
+  0x24, 0x33, 0x20, 0x24, 0x34, 0x1A, 0x0D, 0x31, 0x28, 0x3F, 0x3A, 0x33, 0x33,
+  0x7C, 0x35, 0x35, 0x7C, 0x38, 0x31, 0x29, 0xA2, 0x01, 0x52, 0x0A, 0x18, 0x28,
+  0x31, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B,
+  0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x12, 0x0B, 0x24,
+  0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0x20, 0x24, 0x34, 0x1A, 0x29, 0x31,
+  0x28, 0x3F, 0x3A, 0x5B, 0x31, 0x32, 0x34, 0x35, 0x37, 0x39, 0x5D, 0x7C, 0x33,
+  0x5B, 0x30, 0x2D, 0x32, 0x34, 0x2D, 0x39, 0x5D, 0x7C, 0x35, 0x5B, 0x30, 0x2D,
+  0x34, 0x36, 0x2D, 0x39, 0x5D, 0x7C, 0x38, 0x5B, 0x30, 0x32, 0x2D, 0x39, 0x5D,
+  0x29, 0xAA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xC2,
+  0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xCA, 0x01, 0x08,
+  0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xDA, 0x01, 0x08, 0x12, 0x02,
+  0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xE2, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41,
+  0x1A, 0x02, 0x4E, 0x41, 0x0A, 0xFA, 0x03, 0x0A, 0x23, 0x12, 0x17, 0x5B, 0x32,
+  0x38, 0x39, 0x5D, 0x5C, 0x64, 0x7B, 0x37, 0x2C, 0x39, 0x7D, 0x7C, 0x5B, 0x33,
+  0x2D, 0x37, 0x5D, 0x5C, 0x64, 0x7B, 0x37, 0x7D, 0x1A, 0x08, 0x5C, 0x64, 0x7B,
+  0x37, 0x2C, 0x31, 0x30, 0x7D, 0x12, 0x3C, 0x12, 0x31, 0x32, 0x34, 0x30, 0x39,
+  0x39, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x7C, 0x28, 0x3F, 0x3A, 0x33, 0x5B, 0x32,
+  0x2D, 0x37, 0x39, 0x5D, 0x7C, 0x5B, 0x34, 0x37, 0x39, 0x5D, 0x5B, 0x32, 0x2D,
+  0x36, 0x38, 0x39, 0x5D, 0x7C, 0x36, 0x5B, 0x32, 0x33, 0x35, 0x2D, 0x39, 0x5D,
+  0x29, 0x5C, 0x64, 0x7B, 0x36, 0x7D, 0x1A, 0x07, 0x5C, 0x64, 0x7B, 0x37, 0x2C,
+  0x38, 0x7D, 0x1A, 0x5E, 0x12, 0x52, 0x32, 0x28, 0x3F, 0x3A, 0x5B, 0x30, 0x32,
+  0x37, 0x5D, 0x5C, 0x64, 0x7B, 0x37, 0x7D, 0x7C, 0x39, 0x5C, 0x64, 0x7B, 0x36,
+  0x2C, 0x37, 0x7D, 0x7C, 0x31, 0x28, 0x3F, 0x3A, 0x30, 0x5C, 0x64, 0x7B, 0x35,
+  0x2C, 0x37, 0x7D, 0x7C, 0x5B, 0x31, 0x32, 0x5D, 0x5C, 0x64, 0x7B, 0x35, 0x2C,
+  0x36, 0x7D, 0x7C, 0x5B, 0x33, 0x2D, 0x39, 0x5D, 0x5C, 0x64, 0x7B, 0x35, 0x7D,
+  0x29, 0x7C, 0x34, 0x5B, 0x31, 0x2D, 0x39, 0x5D, 0x5C, 0x64, 0x7B, 0x36, 0x7D,
+  0x7C, 0x38, 0x5C, 0x64, 0x7B, 0x37, 0x2C, 0x38, 0x7D, 0x29, 0x1A, 0x08, 0x5C,
+  0x64, 0x7B, 0x38, 0x2C, 0x31, 0x30, 0x7D, 0x22, 0x16, 0x12, 0x0A, 0x38, 0x30,
+  0x30, 0x5C, 0x64, 0x7B, 0x36, 0x2C, 0x37, 0x7D, 0x1A, 0x08, 0x5C, 0x64, 0x7B,
+  0x39, 0x2C, 0x31, 0x30, 0x7D, 0x2A, 0x16, 0x12, 0x0A, 0x39, 0x30, 0x30, 0x5C,
+  0x64, 0x7B, 0x36, 0x2C, 0x37, 0x7D, 0x1A, 0x08, 0x5C, 0x64, 0x7B, 0x39, 0x2C,
+  0x31, 0x30, 0x7D, 0x32, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41,
+  0x3A, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x42, 0x08, 0x12,
+  0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x4A, 0x02, 0x4E, 0x5A, 0x50, 0x40,
+  0x5A, 0x02, 0x30, 0x30, 0x62, 0x01, 0x30, 0x7A, 0x01, 0x30, 0x90, 0x01, 0x00,
+  0x9A, 0x01, 0x33, 0x0A, 0x12, 0x28, 0x5C, 0x64, 0x29, 0x28, 0x5C, 0x64, 0x7B,
+  0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x12, 0x08, 0x24,
+  0x31, 0x2D, 0x24, 0x32, 0x20, 0x24, 0x33, 0x1A, 0x0A, 0x32, 0x34, 0x7C, 0x5B,
+  0x33, 0x34, 0x36, 0x37, 0x39, 0x5D, 0x22, 0x03, 0x30, 0x24, 0x31, 0x2A, 0x00,
+  0x30, 0x00, 0x9A, 0x01, 0x31, 0x0A, 0x14, 0x28, 0x5C, 0x64, 0x29, 0x28, 0x5C,
+  0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x2C, 0x35, 0x7D,
+  0x29, 0x12, 0x08, 0x24, 0x31, 0x2D, 0x24, 0x32, 0x20, 0x24, 0x33, 0x1A, 0x06,
+  0x32, 0x5B, 0x31, 0x37, 0x39, 0x5D, 0x22, 0x03, 0x30, 0x24, 0x31, 0x2A, 0x00,
+  0x30, 0x00, 0x9A, 0x01, 0x32, 0x0A, 0x17, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D,
+  0x29, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x33,
+  0x2C, 0x34, 0x7D, 0x29, 0x12, 0x08, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20, 0x24,
+  0x33, 0x1A, 0x04, 0x5B, 0x38, 0x39, 0x5D, 0x22, 0x03, 0x30, 0x24, 0x31, 0x2A,
+  0x00, 0x30, 0x00, 0xAA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E,
+  0x41, 0xC2, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xCA,
+  0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xDA, 0x01, 0x08,
+  0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xE2, 0x01, 0x08, 0x12, 0x02,
+  0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x0A, 0x98, 0x02, 0x0A, 0x13, 0x12, 0x0A,
+  0x5B, 0x31, 0x2D, 0x39, 0x5D, 0x5C, 0x64, 0x7B, 0x38, 0x7D, 0x1A, 0x05, 0x5C,
+  0x64, 0x7B, 0x39, 0x7D, 0x12, 0x13, 0x12, 0x0A, 0x5B, 0x31, 0x2D, 0x39, 0x5D,
+  0x5C, 0x64, 0x7B, 0x38, 0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x1A,
+  0x28, 0x12, 0x1F, 0x28, 0x3F, 0x3A, 0x35, 0x5B, 0x30, 0x31, 0x5D, 0x7C, 0x36,
+  0x5B, 0x30, 0x36, 0x39, 0x5D, 0x7C, 0x37, 0x5B, 0x32, 0x38, 0x39, 0x5D, 0x7C,
+  0x38, 0x38, 0x29, 0x5C, 0x64, 0x7B, 0x37, 0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B,
+  0x39, 0x7D, 0x22, 0x11, 0x12, 0x08, 0x38, 0x30, 0x30, 0x5C, 0x64, 0x7B, 0x36,
+  0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x2A, 0x10, 0x12, 0x07, 0x37,
+  0x30, 0x5C, 0x64, 0x7B, 0x37, 0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x39, 0x7D,
   0x32, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x3A, 0x08, 0x12,
   0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x42, 0x08, 0x12, 0x02, 0x4E, 0x41,
-  0x1A, 0x02, 0x4E, 0x41, 0x4A, 0x02, 0x4E, 0x5A, 0x50, 0x40, 0x5A, 0x02, 0x30,
-  0x30, 0x62, 0x01, 0x30, 0x7A, 0x01, 0x30, 0x90, 0x01, 0x00, 0x9A, 0x01, 0x33,
-  0x0A, 0x12, 0x28, 0x5C, 0x64, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29,
-  0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x12, 0x08, 0x24, 0x31, 0x2D, 0x24,
-  0x32, 0x20, 0x24, 0x33, 0x1A, 0x0A, 0x32, 0x34, 0x7C, 0x5B, 0x33, 0x34, 0x36,
-  0x37, 0x39, 0x5D, 0x22, 0x03, 0x30, 0x24, 0x31, 0x2A, 0x00, 0x30, 0x00, 0x9A,
-  0x01, 0x31, 0x0A, 0x14, 0x28, 0x5C, 0x64, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x33,
-  0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x2C, 0x35, 0x7D, 0x29, 0x12, 0x08,
-  0x24, 0x31, 0x2D, 0x24, 0x32, 0x20, 0x24, 0x33, 0x1A, 0x06, 0x32, 0x5B, 0x31,
-  0x37, 0x39, 0x5D, 0x22, 0x03, 0x30, 0x24, 0x31, 0x2A, 0x00, 0x30, 0x00, 0x9A,
-  0x01, 0x32, 0x0A, 0x17, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C,
-  0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x2C, 0x34, 0x7D,
-  0x29, 0x12, 0x08, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0x1A, 0x04,
-  0x5B, 0x38, 0x39, 0x5D, 0x22, 0x03, 0x30, 0x24, 0x31, 0x2A, 0x00, 0x30, 0x00,
+  0x1A, 0x02, 0x4E, 0x41, 0x4A, 0x02, 0x50, 0x4C, 0x50, 0x30, 0x5A, 0x02, 0x30,
+  0x30, 0x62, 0x01, 0x30, 0x7A, 0x01, 0x30, 0x90, 0x01, 0x00, 0x9A, 0x01, 0x34,
+  0x0A, 0x1C, 0x28, 0x5C, 0x64, 0x7B, 0x32, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B,
+  0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x32, 0x7D, 0x29, 0x28, 0x5C, 0x64,
+  0x7B, 0x32, 0x7D, 0x29, 0x12, 0x0B, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20, 0x24,
+  0x33, 0x20, 0x24, 0x34, 0x22, 0x03, 0x30, 0x24, 0x31, 0x2A, 0x00, 0x30, 0x00,
   0xAA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xC2, 0x01,
   0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xCA, 0x01, 0x08, 0x12,
   0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xDA, 0x01, 0x08, 0x12, 0x02, 0x4E,
   0x41, 0x1A, 0x02, 0x4E, 0x41, 0xE2, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A,
-  0x02, 0x4E, 0x41, 0x0A, 0x98, 0x02, 0x0A, 0x13, 0x12, 0x0A, 0x5B, 0x31, 0x2D,
-  0x39, 0x5D, 0x5C, 0x64, 0x7B, 0x38, 0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x39,
-  0x7D, 0x12, 0x13, 0x12, 0x0A, 0x5B, 0x31, 0x2D, 0x39, 0x5D, 0x5C, 0x64, 0x7B,
-  0x38, 0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x1A, 0x28, 0x12, 0x1F,
-  0x28, 0x3F, 0x3A, 0x35, 0x5B, 0x30, 0x31, 0x5D, 0x7C, 0x36, 0x5B, 0x30, 0x36,
-  0x39, 0x5D, 0x7C, 0x37, 0x5B, 0x32, 0x38, 0x39, 0x5D, 0x7C, 0x38, 0x38, 0x29,
-  0x5C, 0x64, 0x7B, 0x37, 0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x22,
-  0x11, 0x12, 0x08, 0x38, 0x30, 0x30, 0x5C, 0x64, 0x7B, 0x36, 0x7D, 0x1A, 0x05,
-  0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x2A, 0x10, 0x12, 0x07, 0x37, 0x30, 0x5C, 0x64,
-  0x7B, 0x37, 0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x32, 0x08, 0x12,
-  0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x3A, 0x08, 0x12, 0x02, 0x4E, 0x41,
-  0x1A, 0x02, 0x4E, 0x41, 0x42, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E,
-  0x41, 0x4A, 0x02, 0x50, 0x4C, 0x50, 0x30, 0x5A, 0x02, 0x30, 0x30, 0x62, 0x01,
-  0x30, 0x7A, 0x01, 0x30, 0x90, 0x01, 0x00, 0x9A, 0x01, 0x34, 0x0A, 0x1C, 0x28,
-  0x5C, 0x64, 0x7B, 0x32, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29,
-  0x28, 0x5C, 0x64, 0x7B, 0x32, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x32, 0x7D,
-  0x29, 0x12, 0x0B, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0x20, 0x24,
-  0x34, 0x22, 0x03, 0x30, 0x24, 0x31, 0x2A, 0x00, 0x30, 0x00, 0xAA, 0x01, 0x08,
-  0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xC2, 0x01, 0x08, 0x12, 0x02,
-  0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xCA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41,
-  0x1A, 0x02, 0x4E, 0x41, 0xDA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02,
-  0x4E, 0x41, 0xE2, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41,
-  0x0A, 0xED, 0x02, 0x0A, 0x13, 0x12, 0x0A, 0x5B, 0x32, 0x36, 0x38, 0x5D, 0x5C,
-  0x64, 0x7B, 0x38, 0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x12, 0x1C,
-  0x12, 0x08, 0x32, 0x36, 0x32, 0x5C, 0x64, 0x7B, 0x36, 0x7D, 0x1A, 0x05, 0x5C,
-  0x64, 0x7B, 0x39, 0x7D, 0x32, 0x09, 0x32, 0x36, 0x32, 0x31, 0x36, 0x31, 0x32,
-  0x33, 0x34, 0x1A, 0x26, 0x12, 0x12, 0x36, 0x28, 0x3F, 0x3A, 0x39, 0x5B, 0x32,
-  0x33, 0x5D, 0x7C, 0x34, 0x37, 0x29, 0x5C, 0x64, 0x7B, 0x36, 0x7D, 0x1A, 0x05,
-  0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x32, 0x09, 0x36, 0x39, 0x32, 0x31, 0x32, 0x33,
-  0x34, 0x35, 0x36, 0x22, 0x1B, 0x12, 0x07, 0x38, 0x30, 0x5C, 0x64, 0x7B, 0x37,
-  0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x32, 0x09, 0x38, 0x30, 0x31,
-  0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x2A, 0x38, 0x12, 0x24, 0x38, 0x28, 0x3F,
-  0x3A, 0x31, 0x5B, 0x30, 0x31, 0x5D, 0x7C, 0x32, 0x5B, 0x30, 0x31, 0x35, 0x36,
-  0x5D, 0x7C, 0x38, 0x34, 0x7C, 0x39, 0x5B, 0x30, 0x2D, 0x33, 0x37, 0x2D, 0x39,
-  0x5D, 0x29, 0x5C, 0x64, 0x7B, 0x36, 0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x39,
-  0x7D, 0x32, 0x09, 0x38, 0x31, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x32,
-  0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x3A, 0x08, 0x12, 0x02,
-  0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x42, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A,
-  0x02, 0x4E, 0x41, 0x4A, 0x02, 0x52, 0x45, 0x50, 0x86, 0x02, 0x5A, 0x02, 0x30,
-  0x30, 0x62, 0x01, 0x30, 0x7A, 0x01, 0x30, 0x90, 0x01, 0x00, 0x9A, 0x01, 0x39,
-  0x0A, 0x21, 0x28, 0x5B, 0x32, 0x36, 0x38, 0x5D, 0x5C, 0x64, 0x7B, 0x32, 0x7D,
-  0x29, 0x28, 0x5C, 0x64, 0x7B, 0x32, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x32,
-  0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x32, 0x7D, 0x29, 0x12, 0x0B, 0x24, 0x31,
-  0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0x20, 0x24, 0x34, 0x22, 0x03, 0x30, 0x24,
-  0x31, 0x2A, 0x00, 0x30, 0x00, 0xAA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A,
-  0x02, 0x4E, 0x41, 0xBA, 0x01, 0x13, 0x32, 0x36, 0x32, 0x7C, 0x36, 0x28, 0x3F,
-  0x3A, 0x39, 0x5B, 0x32, 0x33, 0x5D, 0x7C, 0x34, 0x37, 0x29, 0x7C, 0x38, 0xC2,
-  0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xCA, 0x01, 0x08,
-  0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xDA, 0x01, 0x08, 0x12, 0x02,
-  0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xE2, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41,
-  0x1A, 0x02, 0x4E, 0x41, 0x0A, 0xFB, 0x02, 0x0A, 0x22, 0x12, 0x0F, 0x5B, 0x31,
-  0x33, 0x36, 0x38, 0x39, 0x5D, 0x5C, 0x64, 0x7B, 0x37, 0x2C, 0x31, 0x30, 0x7D,
-  0x1A, 0x0F, 0x5C, 0x64, 0x7B, 0x38, 0x7D, 0x7C, 0x5C, 0x64, 0x7B, 0x31, 0x30,
-  0x2C, 0x31, 0x31, 0x7D, 0x12, 0x12, 0x12, 0x09, 0x5B, 0x33, 0x36, 0x5D, 0x5C,
-  0x64, 0x7B, 0x37, 0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x38, 0x7D, 0x1A, 0x12,
-  0x12, 0x09, 0x5B, 0x38, 0x39, 0x5D, 0x5C, 0x64, 0x7B, 0x37, 0x7D, 0x1A, 0x05,
-  0x5C, 0x64, 0x7B, 0x38, 0x7D, 0x22, 0x17, 0x12, 0x0A, 0x31, 0x3F, 0x38, 0x30,
-  0x30, 0x5C, 0x64, 0x7B, 0x37, 0x7D, 0x1A, 0x09, 0x5C, 0x64, 0x7B, 0x31, 0x30,
-  0x2C, 0x31, 0x31, 0x7D, 0x2A, 0x13, 0x12, 0x09, 0x31, 0x39, 0x30, 0x30, 0x5C,
-  0x64, 0x7B, 0x37, 0x7D, 0x1A, 0x06, 0x5C, 0x64, 0x7B, 0x31, 0x31, 0x7D, 0x32,
-  0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x3A, 0x08, 0x12, 0x02,
-  0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x42, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A,
-  0x02, 0x4E, 0x41, 0x4A, 0x02, 0x53, 0x47, 0x50, 0x41, 0x5A, 0x0B, 0x30, 0x5B,
-  0x30, 0x2D, 0x33, 0x5D, 0x5B, 0x30, 0x2D, 0x39, 0x5D, 0x7A, 0x06, 0x37, 0x37,
-  0x37, 0x37, 0x37, 0x37, 0x90, 0x01, 0x00, 0x9A, 0x01, 0x2B, 0x0A, 0x0E, 0x28,
-  0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29,
-  0x12, 0x05, 0x24, 0x31, 0x20, 0x24, 0x32, 0x1A, 0x0C, 0x5B, 0x33, 0x36, 0x39,
-  0x5D, 0x7C, 0x38, 0x5B, 0x31, 0x2D, 0x39, 0x5D, 0x22, 0x00, 0x2A, 0x00, 0x30,
-  0x00, 0x9A, 0x01, 0x2E, 0x0A, 0x15, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29,
+  0x02, 0x4E, 0x41, 0x0A, 0xED, 0x02, 0x0A, 0x13, 0x12, 0x0A, 0x5B, 0x32, 0x36,
+  0x38, 0x5D, 0x5C, 0x64, 0x7B, 0x38, 0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x39,
+  0x7D, 0x12, 0x1C, 0x12, 0x08, 0x32, 0x36, 0x32, 0x5C, 0x64, 0x7B, 0x36, 0x7D,
+  0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x32, 0x09, 0x32, 0x36, 0x32, 0x31,
+  0x36, 0x31, 0x32, 0x33, 0x34, 0x1A, 0x26, 0x12, 0x12, 0x36, 0x28, 0x3F, 0x3A,
+  0x39, 0x5B, 0x32, 0x33, 0x5D, 0x7C, 0x34, 0x37, 0x29, 0x5C, 0x64, 0x7B, 0x36,
+  0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x32, 0x09, 0x36, 0x39, 0x32,
+  0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x22, 0x1B, 0x12, 0x07, 0x38, 0x30, 0x5C,
+  0x64, 0x7B, 0x37, 0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x32, 0x09,
+  0x38, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x2A, 0x38, 0x12, 0x24,
+  0x38, 0x28, 0x3F, 0x3A, 0x31, 0x5B, 0x30, 0x31, 0x5D, 0x7C, 0x32, 0x5B, 0x30,
+  0x31, 0x35, 0x36, 0x5D, 0x7C, 0x38, 0x34, 0x7C, 0x39, 0x5B, 0x30, 0x2D, 0x33,
+  0x37, 0x2D, 0x39, 0x5D, 0x29, 0x5C, 0x64, 0x7B, 0x36, 0x7D, 0x1A, 0x05, 0x5C,
+  0x64, 0x7B, 0x39, 0x7D, 0x32, 0x09, 0x38, 0x31, 0x30, 0x31, 0x32, 0x33, 0x34,
+  0x35, 0x36, 0x32, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x3A,
+  0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x42, 0x08, 0x12, 0x02,
+  0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x4A, 0x02, 0x52, 0x45, 0x50, 0x86, 0x02,
+  0x5A, 0x02, 0x30, 0x30, 0x62, 0x01, 0x30, 0x7A, 0x01, 0x30, 0x90, 0x01, 0x00,
+  0x9A, 0x01, 0x39, 0x0A, 0x21, 0x28, 0x5B, 0x32, 0x36, 0x38, 0x5D, 0x5C, 0x64,
+  0x7B, 0x32, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x32, 0x7D, 0x29, 0x28, 0x5C,
+  0x64, 0x7B, 0x32, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x32, 0x7D, 0x29, 0x12,
+  0x0B, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0x20, 0x24, 0x34, 0x22,
+  0x03, 0x30, 0x24, 0x31, 0x2A, 0x00, 0x30, 0x00, 0xAA, 0x01, 0x08, 0x12, 0x02,
+  0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xBA, 0x01, 0x13, 0x32, 0x36, 0x32, 0x7C,
+  0x36, 0x28, 0x3F, 0x3A, 0x39, 0x5B, 0x32, 0x33, 0x5D, 0x7C, 0x34, 0x37, 0x29,
+  0x7C, 0x38, 0xC2, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41,
+  0xCA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xDA, 0x01,
+  0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xE2, 0x01, 0x08, 0x12,
+  0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x0A, 0xFB, 0x02, 0x0A, 0x22, 0x12,
+  0x0F, 0x5B, 0x31, 0x33, 0x36, 0x38, 0x39, 0x5D, 0x5C, 0x64, 0x7B, 0x37, 0x2C,
+  0x31, 0x30, 0x7D, 0x1A, 0x0F, 0x5C, 0x64, 0x7B, 0x38, 0x7D, 0x7C, 0x5C, 0x64,
+  0x7B, 0x31, 0x30, 0x2C, 0x31, 0x31, 0x7D, 0x12, 0x12, 0x12, 0x09, 0x5B, 0x33,
+  0x36, 0x5D, 0x5C, 0x64, 0x7B, 0x37, 0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x38,
+  0x7D, 0x1A, 0x12, 0x12, 0x09, 0x5B, 0x38, 0x39, 0x5D, 0x5C, 0x64, 0x7B, 0x37,
+  0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x38, 0x7D, 0x22, 0x17, 0x12, 0x0A, 0x31,
+  0x3F, 0x38, 0x30, 0x30, 0x5C, 0x64, 0x7B, 0x37, 0x7D, 0x1A, 0x09, 0x5C, 0x64,
+  0x7B, 0x31, 0x30, 0x2C, 0x31, 0x31, 0x7D, 0x2A, 0x13, 0x12, 0x09, 0x31, 0x39,
+  0x30, 0x30, 0x5C, 0x64, 0x7B, 0x37, 0x7D, 0x1A, 0x06, 0x5C, 0x64, 0x7B, 0x31,
+  0x31, 0x7D, 0x32, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x3A,
+  0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x42, 0x08, 0x12, 0x02,
+  0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x4A, 0x02, 0x53, 0x47, 0x50, 0x41, 0x5A,
+  0x0B, 0x30, 0x5B, 0x30, 0x2D, 0x33, 0x5D, 0x5B, 0x30, 0x2D, 0x39, 0x5D, 0x7A,
+  0x06, 0x37, 0x37, 0x37, 0x37, 0x37, 0x37, 0x90, 0x01, 0x00, 0x9A, 0x01, 0x2B,
+  0x0A, 0x0E, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B,
+  0x34, 0x7D, 0x29, 0x12, 0x05, 0x24, 0x31, 0x20, 0x24, 0x32, 0x1A, 0x0C, 0x5B,
+  0x33, 0x36, 0x39, 0x5D, 0x7C, 0x38, 0x5B, 0x31, 0x2D, 0x39, 0x5D, 0x22, 0x00,
+  0x2A, 0x00, 0x30, 0x00, 0x9A, 0x01, 0x2E, 0x0A, 0x15, 0x28, 0x5C, 0x64, 0x7B,
+  0x34, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64,
+  0x7B, 0x34, 0x7D, 0x29, 0x12, 0x08, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20, 0x24,
+  0x33, 0x1A, 0x05, 0x31, 0x5B, 0x38, 0x39, 0x5D, 0x22, 0x00, 0x2A, 0x00, 0x30,
+  0x00, 0x9A, 0x01, 0x2C, 0x0A, 0x15, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29,
   0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D,
-  0x29, 0x12, 0x08, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0x1A, 0x05,
-  0x31, 0x5B, 0x38, 0x39, 0x5D, 0x22, 0x00, 0x2A, 0x00, 0x30, 0x00, 0x9A, 0x01,
-  0x2C, 0x0A, 0x15, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64,
-  0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x12, 0x08,
-  0x24, 0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0x1A, 0x03, 0x38, 0x30, 0x30,
-  0x22, 0x00, 0x2A, 0x00, 0x30, 0x00, 0xAA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41,
-  0x1A, 0x02, 0x4E, 0x41, 0xC2, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02,
-  0x4E, 0x41, 0xCA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41,
-  0xDA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xE2, 0x01,
-  0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x0A, 0x8A, 0x04, 0x0A,
-  0x3B, 0x12, 0x1C, 0x5B, 0x31, 0x33, 0x2D, 0x36, 0x38, 0x39, 0x5D, 0x5C, 0x64,
-  0x7B, 0x39, 0x7D, 0x7C, 0x32, 0x5B, 0x30, 0x2D, 0x33, 0x35, 0x2D, 0x39, 0x5D,
-  0x5C, 0x64, 0x7B, 0x38, 0x7D, 0x1A, 0x0F, 0x5C, 0x64, 0x7B, 0x37, 0x7D, 0x28,
-  0x3F, 0x3A, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x3F, 0x32, 0x0A, 0x31, 0x32,
-  0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30, 0x12, 0x3B, 0x12, 0x1C, 0x5B,
-  0x31, 0x33, 0x2D, 0x36, 0x38, 0x39, 0x5D, 0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x7C,
-  0x32, 0x5B, 0x30, 0x2D, 0x33, 0x35, 0x2D, 0x39, 0x5D, 0x5C, 0x64, 0x7B, 0x38,
-  0x7D, 0x1A, 0x0F, 0x5C, 0x64, 0x7B, 0x37, 0x7D, 0x28, 0x3F, 0x3A, 0x5C, 0x64,
-  0x7B, 0x33, 0x7D, 0x29, 0x3F, 0x32, 0x0A, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
-  0x37, 0x38, 0x39, 0x30, 0x1A, 0x3B, 0x12, 0x1C, 0x5B, 0x31, 0x33, 0x2D, 0x36,
-  0x38, 0x39, 0x5D, 0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x7C, 0x32, 0x5B, 0x30, 0x2D,
-  0x33, 0x35, 0x2D, 0x39, 0x5D, 0x5C, 0x64, 0x7B, 0x38, 0x7D, 0x1A, 0x0F, 0x5C,
-  0x64, 0x7B, 0x37, 0x7D, 0x28, 0x3F, 0x3A, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29,
-  0x3F, 0x32, 0x0A, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30,
-  0x22, 0x2B, 0x12, 0x15, 0x38, 0x28, 0x3F, 0x3A, 0x30, 0x30, 0x7C, 0x36, 0x36,
-  0x7C, 0x37, 0x37, 0x7C, 0x38, 0x38, 0x29, 0x5C, 0x64, 0x7B, 0x37, 0x7D, 0x1A,
-  0x06, 0x5C, 0x64, 0x7B, 0x31, 0x30, 0x7D, 0x32, 0x0A, 0x31, 0x32, 0x33, 0x34,
-  0x35, 0x36, 0x37, 0x38, 0x39, 0x30, 0x2A, 0x1E, 0x12, 0x08, 0x39, 0x30, 0x30,
-  0x5C, 0x64, 0x7B, 0x37, 0x7D, 0x1A, 0x06, 0x5C, 0x64, 0x7B, 0x31, 0x30, 0x7D,
-  0x32, 0x0A, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30, 0x32,
-  0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x3A, 0x08, 0x12, 0x02,
-  0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x42, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A,
-  0x02, 0x4E, 0x41, 0x4A, 0x02, 0x55, 0x53, 0x50, 0x01, 0x5A, 0x03, 0x30, 0x31,
-  0x31, 0x62, 0x01, 0x31, 0x6A, 0x07, 0x20, 0x65, 0x78, 0x74, 0x6E, 0x2E, 0x20,
-  0x7A, 0x01, 0x31, 0x90, 0x01, 0x01, 0x9A, 0x01, 0x1D, 0x0A, 0x0E, 0x28, 0x5C,
-  0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x12,
-  0x05, 0x24, 0x31, 0x20, 0x24, 0x32, 0x22, 0x00, 0x2A, 0x00, 0x30, 0x00, 0x9A,
-  0x01, 0x27, 0x0A, 0x15, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C,
-  0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x12,
-  0x08, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0x22, 0x00, 0x2A, 0x00,
-  0x30, 0x00, 0xA2, 0x01, 0x21, 0x0A, 0x15, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D,
-  0x29, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34,
-  0x7D, 0x29, 0x12, 0x08, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0xAA,
-  0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xB0, 0x01, 0x01,
-  0xC2, 0x01, 0x1E, 0x12, 0x08, 0x38, 0x30, 0x30, 0x5C, 0x64, 0x7B, 0x37, 0x7D,
-  0x1A, 0x06, 0x5C, 0x64, 0x7B, 0x31, 0x30, 0x7D, 0x32, 0x0A, 0x31, 0x32, 0x33,
-  0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30, 0xCA, 0x01, 0x08, 0x12, 0x02, 0x4E,
-  0x41, 0x1A, 0x02, 0x4E, 0x41, 0xDA, 0x01, 0x15, 0x12, 0x07, 0x31, 0x31, 0x39,
-  0x7C, 0x39, 0x31, 0x31, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x32, 0x03,
-  0x39, 0x31, 0x31, 0xE2, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E,
-  0x41, 0x0A, 0xF1, 0x01, 0x0A, 0x13, 0x12, 0x0A, 0x5B, 0x32, 0x36, 0x38, 0x5D,
-  0x5C, 0x64, 0x7B, 0x38, 0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x12,
-  0x22, 0x12, 0x0E, 0x32, 0x36, 0x39, 0x36, 0x5B, 0x30, 0x2D, 0x34, 0x5D, 0x5C,
-  0x64, 0x7B, 0x34, 0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x32, 0x09,
-  0x32, 0x36, 0x39, 0x36, 0x30, 0x31, 0x32, 0x33, 0x34, 0x1A, 0x1C, 0x12, 0x08,
-  0x36, 0x33, 0x39, 0x5C, 0x64, 0x7B, 0x36, 0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B,
-  0x39, 0x7D, 0x32, 0x09, 0x36, 0x33, 0x39, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
-  0x22, 0x1B, 0x12, 0x07, 0x38, 0x30, 0x5C, 0x64, 0x7B, 0x37, 0x7D, 0x1A, 0x05,
-  0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x32, 0x09, 0x38, 0x30, 0x31, 0x32, 0x33, 0x34,
-  0x35, 0x36, 0x37, 0x2A, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41,
-  0x32, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x3A, 0x08, 0x12,
-  0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x42, 0x08, 0x12, 0x02, 0x4E, 0x41,
-  0x1A, 0x02, 0x4E, 0x41, 0x4A, 0x02, 0x59, 0x54, 0x50, 0x86, 0x02, 0x5A, 0x02,
-  0x30, 0x30, 0x62, 0x01, 0x30, 0x7A, 0x01, 0x30, 0x90, 0x01, 0x00, 0xAA, 0x01,
-  0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xBA, 0x01, 0x07, 0x32,
-  0x36, 0x39, 0x7C, 0x36, 0x33, 0x39, 0xC2, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41,
-  0x1A, 0x02, 0x4E, 0x41, 0xCA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02,
-  0x4E, 0x41, 0xDA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41,
-  0xE2, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x0A, 0xE8,
-  0x01, 0x0A, 0x18, 0x12, 0x05, 0x5C, 0x64, 0x7B, 0x38, 0x7D, 0x1A, 0x05, 0x5C,
-  0x64, 0x7B, 0x38, 0x7D, 0x32, 0x08, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
-  0x38, 0x12, 0x12, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x32, 0x08,
-  0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x1A, 0x12, 0x12, 0x02, 0x4E,
-  0x41, 0x1A, 0x02, 0x4E, 0x41, 0x32, 0x08, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
-  0x37, 0x38, 0x22, 0x18, 0x12, 0x05, 0x5C, 0x64, 0x7B, 0x38, 0x7D, 0x1A, 0x05,
-  0x5C, 0x64, 0x7B, 0x38, 0x7D, 0x32, 0x08, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
-  0x37, 0x38, 0x2A, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x32,
-  0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x3A, 0x08, 0x12, 0x02,
-  0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x42, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A,
-  0x02, 0x4E, 0x41, 0x4A, 0x03, 0x30, 0x30, 0x31, 0x50, 0xA0, 0x06, 0x5A, 0x00,
-  0x90, 0x01, 0x01, 0x9A, 0x01, 0x1D, 0x0A, 0x0E, 0x28, 0x5C, 0x64, 0x7B, 0x34,
-  0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x12, 0x05, 0x24, 0x31,
-  0x20, 0x24, 0x32, 0x22, 0x00, 0x2A, 0x00, 0x30, 0x00, 0xAA, 0x01, 0x08, 0x12,
+  0x29, 0x12, 0x08, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0x1A, 0x03,
+  0x38, 0x30, 0x30, 0x22, 0x00, 0x2A, 0x00, 0x30, 0x00, 0xAA, 0x01, 0x08, 0x12,
   0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xC2, 0x01, 0x08, 0x12, 0x02, 0x4E,
   0x41, 0x1A, 0x02, 0x4E, 0x41, 0xCA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A,
   0x02, 0x4E, 0x41, 0xDA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E,
   0x41, 0xE2, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x0A,
-  0xF3, 0x01, 0x0A, 0x19, 0x12, 0x05, 0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x1A, 0x05,
-  0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x32, 0x09, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
-  0x37, 0x38, 0x39, 0x12, 0x13, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41,
-  0x32, 0x09, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x1A, 0x13,
-  0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x32, 0x09, 0x31, 0x32, 0x33,
-  0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x22, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A,
-  0x02, 0x4E, 0x41, 0x2A, 0x19, 0x12, 0x05, 0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x1A,
-  0x05, 0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x32, 0x09, 0x31, 0x32, 0x33, 0x34, 0x35,
-  0x36, 0x37, 0x38, 0x39, 0x32, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E,
-  0x41, 0x3A, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x42, 0x08,
-  0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x4A, 0x03, 0x30, 0x30, 0x31,
-  0x50, 0xD3, 0x07, 0x5A, 0x00, 0x90, 0x01, 0x01, 0x9A, 0x01, 0x24, 0x0A, 0x12,
-  0x28, 0x5C, 0x64, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x28, 0x5C,
+  0x90, 0x04, 0x0A, 0x3B, 0x12, 0x1C, 0x5B, 0x31, 0x33, 0x2D, 0x36, 0x38, 0x39,
+  0x5D, 0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x7C, 0x32, 0x5B, 0x30, 0x2D, 0x33, 0x35,
+  0x2D, 0x39, 0x5D, 0x5C, 0x64, 0x7B, 0x38, 0x7D, 0x1A, 0x0F, 0x5C, 0x64, 0x7B,
+  0x37, 0x7D, 0x28, 0x3F, 0x3A, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x3F, 0x32,
+  0x0A, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30, 0x12, 0x3B,
+  0x12, 0x1C, 0x5B, 0x31, 0x33, 0x2D, 0x36, 0x38, 0x39, 0x5D, 0x5C, 0x64, 0x7B,
+  0x39, 0x7D, 0x7C, 0x32, 0x5B, 0x30, 0x2D, 0x33, 0x35, 0x2D, 0x39, 0x5D, 0x5C,
+  0x64, 0x7B, 0x38, 0x7D, 0x1A, 0x0F, 0x5C, 0x64, 0x7B, 0x37, 0x7D, 0x28, 0x3F,
+  0x3A, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x3F, 0x32, 0x0A, 0x31, 0x32, 0x33,
+  0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30, 0x1A, 0x3B, 0x12, 0x1C, 0x5B, 0x31,
+  0x33, 0x2D, 0x36, 0x38, 0x39, 0x5D, 0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x7C, 0x32,
+  0x5B, 0x30, 0x2D, 0x33, 0x35, 0x2D, 0x39, 0x5D, 0x5C, 0x64, 0x7B, 0x38, 0x7D,
+  0x1A, 0x0F, 0x5C, 0x64, 0x7B, 0x37, 0x7D, 0x28, 0x3F, 0x3A, 0x5C, 0x64, 0x7B,
+  0x33, 0x7D, 0x29, 0x3F, 0x32, 0x0A, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+  0x38, 0x39, 0x30, 0x22, 0x2B, 0x12, 0x15, 0x38, 0x28, 0x3F, 0x3A, 0x30, 0x30,
+  0x7C, 0x36, 0x36, 0x7C, 0x37, 0x37, 0x7C, 0x38, 0x38, 0x29, 0x5C, 0x64, 0x7B,
+  0x37, 0x7D, 0x1A, 0x06, 0x5C, 0x64, 0x7B, 0x31, 0x30, 0x7D, 0x32, 0x0A, 0x31,
+  0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30, 0x2A, 0x1E, 0x12, 0x08,
+  0x39, 0x30, 0x30, 0x5C, 0x64, 0x7B, 0x37, 0x7D, 0x1A, 0x06, 0x5C, 0x64, 0x7B,
+  0x31, 0x30, 0x7D, 0x32, 0x0A, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38,
+  0x39, 0x30, 0x32, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x3A,
+  0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x42, 0x08, 0x12, 0x02,
+  0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x4A, 0x02, 0x55, 0x53, 0x50, 0x01, 0x5A,
+  0x03, 0x30, 0x31, 0x31, 0x62, 0x01, 0x31, 0x6A, 0x07, 0x20, 0x65, 0x78, 0x74,
+  0x6E, 0x2E, 0x20, 0x7A, 0x01, 0x31, 0x90, 0x01, 0x01, 0x9A, 0x01, 0x1D, 0x0A,
+  0x0E, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34,
+  0x7D, 0x29, 0x12, 0x05, 0x24, 0x31, 0x20, 0x24, 0x32, 0x22, 0x00, 0x2A, 0x00,
+  0x30, 0x01, 0x9A, 0x01, 0x27, 0x0A, 0x15, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D,
+  0x29, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34,
+  0x7D, 0x29, 0x12, 0x08, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0x22,
+  0x00, 0x2A, 0x00, 0x30, 0x01, 0xA2, 0x01, 0x27, 0x0A, 0x15, 0x28, 0x5C, 0x64,
+  0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x29, 0x28, 0x5C,
   0x64, 0x7B, 0x34, 0x7D, 0x29, 0x12, 0x08, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20,
-  0x24, 0x33, 0x22, 0x00, 0x2A, 0x00, 0x30, 0x00, 0xAA, 0x01, 0x08, 0x12, 0x02,
-  0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xC2, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41,
-  0x1A, 0x02, 0x4E, 0x41, 0xCA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02,
-  0x4E, 0x41, 0xDA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41,
-  0xE2, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41
+  0x24, 0x33, 0x22, 0x00, 0x2A, 0x00, 0x30, 0x01, 0xAA, 0x01, 0x08, 0x12, 0x02,
+  0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xB0, 0x01, 0x01, 0xC2, 0x01, 0x1E, 0x12,
+  0x08, 0x38, 0x30, 0x30, 0x5C, 0x64, 0x7B, 0x37, 0x7D, 0x1A, 0x06, 0x5C, 0x64,
+  0x7B, 0x31, 0x30, 0x7D, 0x32, 0x0A, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+  0x38, 0x39, 0x30, 0xCA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E,
+  0x41, 0xDA, 0x01, 0x15, 0x12, 0x07, 0x31, 0x31, 0x39, 0x7C, 0x39, 0x31, 0x31,
+  0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x33, 0x7D, 0x32, 0x03, 0x39, 0x31, 0x31, 0xE2,
+  0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x0A, 0xF1, 0x01,
+  0x0A, 0x13, 0x12, 0x0A, 0x5B, 0x32, 0x36, 0x38, 0x5D, 0x5C, 0x64, 0x7B, 0x38,
+  0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x12, 0x22, 0x12, 0x0E, 0x32,
+  0x36, 0x39, 0x36, 0x5B, 0x30, 0x2D, 0x34, 0x5D, 0x5C, 0x64, 0x7B, 0x34, 0x7D,
+  0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x32, 0x09, 0x32, 0x36, 0x39, 0x36,
+  0x30, 0x31, 0x32, 0x33, 0x34, 0x1A, 0x1C, 0x12, 0x08, 0x36, 0x33, 0x39, 0x5C,
+  0x64, 0x7B, 0x36, 0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x32, 0x09,
+  0x36, 0x33, 0x39, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x22, 0x1B, 0x12, 0x07,
+  0x38, 0x30, 0x5C, 0x64, 0x7B, 0x37, 0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x39,
+  0x7D, 0x32, 0x09, 0x38, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x2A,
+  0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x32, 0x08, 0x12, 0x02,
+  0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x3A, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A,
+  0x02, 0x4E, 0x41, 0x42, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41,
+  0x4A, 0x02, 0x59, 0x54, 0x50, 0x86, 0x02, 0x5A, 0x02, 0x30, 0x30, 0x62, 0x01,
+  0x30, 0x7A, 0x01, 0x30, 0x90, 0x01, 0x00, 0xAA, 0x01, 0x08, 0x12, 0x02, 0x4E,
+  0x41, 0x1A, 0x02, 0x4E, 0x41, 0xBA, 0x01, 0x07, 0x32, 0x36, 0x39, 0x7C, 0x36,
+  0x33, 0x39, 0xC2, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41,
+  0xCA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xDA, 0x01,
+  0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xE2, 0x01, 0x08, 0x12,
+  0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x0A, 0xE8, 0x01, 0x0A, 0x18, 0x12,
+  0x05, 0x5C, 0x64, 0x7B, 0x38, 0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x38, 0x7D,
+  0x32, 0x08, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x12, 0x12, 0x12,
+  0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x32, 0x08, 0x31, 0x32, 0x33, 0x34,
+  0x35, 0x36, 0x37, 0x38, 0x1A, 0x12, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E,
+  0x41, 0x32, 0x08, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x22, 0x18,
+  0x12, 0x05, 0x5C, 0x64, 0x7B, 0x38, 0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x38,
+  0x7D, 0x32, 0x08, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x2A, 0x08,
+  0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x32, 0x08, 0x12, 0x02, 0x4E,
+  0x41, 0x1A, 0x02, 0x4E, 0x41, 0x3A, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02,
+  0x4E, 0x41, 0x42, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x4A,
+  0x03, 0x30, 0x30, 0x31, 0x50, 0xA0, 0x06, 0x5A, 0x00, 0x90, 0x01, 0x01, 0x9A,
+  0x01, 0x1D, 0x0A, 0x0E, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x28, 0x5C,
+  0x64, 0x7B, 0x34, 0x7D, 0x29, 0x12, 0x05, 0x24, 0x31, 0x20, 0x24, 0x32, 0x22,
+  0x00, 0x2A, 0x00, 0x30, 0x00, 0xAA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A,
+  0x02, 0x4E, 0x41, 0xC2, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E,
+  0x41, 0xCA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xDA,
+  0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xE2, 0x01, 0x08,
+  0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x0A, 0xF3, 0x01, 0x0A, 0x19,
+  0x12, 0x05, 0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B, 0x39,
+  0x7D, 0x32, 0x09, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x12,
+  0x13, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x32, 0x09, 0x31, 0x32,
+  0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x1A, 0x13, 0x12, 0x02, 0x4E, 0x41,
+  0x1A, 0x02, 0x4E, 0x41, 0x32, 0x09, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+  0x38, 0x39, 0x22, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x2A,
+  0x19, 0x12, 0x05, 0x5C, 0x64, 0x7B, 0x39, 0x7D, 0x1A, 0x05, 0x5C, 0x64, 0x7B,
+  0x39, 0x7D, 0x32, 0x09, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
+  0x32, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x3A, 0x08, 0x12,
+  0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x42, 0x08, 0x12, 0x02, 0x4E, 0x41,
+  0x1A, 0x02, 0x4E, 0x41, 0x4A, 0x03, 0x30, 0x30, 0x31, 0x50, 0xD3, 0x07, 0x5A,
+  0x00, 0x90, 0x01, 0x01, 0x9A, 0x01, 0x24, 0x0A, 0x12, 0x28, 0x5C, 0x64, 0x29,
+  0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D, 0x29, 0x28, 0x5C, 0x64, 0x7B, 0x34, 0x7D,
+  0x29, 0x12, 0x08, 0x24, 0x31, 0x20, 0x24, 0x32, 0x20, 0x24, 0x33, 0x22, 0x00,
+  0x2A, 0x00, 0x30, 0x00, 0xAA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02,
+  0x4E, 0x41, 0xC2, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41,
+  0xCA, 0x01, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xDA, 0x01,
+  0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xE2, 0x01, 0x08, 0x12,
+  0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41
 };
 }  // namespace
 

cpp/test/phonenumbers/asyoutypeformatter_test.cc

@@ -13,6 +13,10 @@
 // limitations under the License.
 
 // Unit tests for asyoutypeformatter.cc, ported from AsYouTypeFormatterTest.java
+//
+// Note that these tests use the test metadata, not the normal metadata file,
+// so should not be used for regression test purposes - these tests are
+// illustrative only and test functionality.
 
 #include "phonenumbers/asyoutypeformatter.h"
 
@@ -107,6 +111,38 @@ TEST_F(AsYouTypeFormatterTest, TooLongNumberMatchingMultipleLeadingDigits) {
   EXPECT_EQ("+819012345678901", formatter_->InputDigit('1', &result_));
 }
 
+TEST_F(AsYouTypeFormatterTest, CountryWithSpaceInNationalPrefixFormattingRule) {
+  formatter_.reset(phone_util_.GetAsYouTypeFormatter(RegionCode::BY()));
+
+  EXPECT_EQ("8", formatter_->InputDigit('8', &result_));
+  EXPECT_EQ("88", formatter_->InputDigit('8', &result_));
+  EXPECT_EQ("881", formatter_->InputDigit('1', &result_));
+  EXPECT_EQ("8 819", formatter_->InputDigit('9', &result_));
+  EXPECT_EQ("8 8190", formatter_->InputDigit('0', &result_));
+  // The formatting rule for 5 digit numbers states that no space should be
+  // present after the national prefix.
+  EXPECT_EQ("881 901", formatter_->InputDigit('1', &result_));
+  EXPECT_EQ("8 819 012", formatter_->InputDigit('2', &result_));
+  // Too long, no formatting rule applies.
+  EXPECT_EQ("88190123", formatter_->InputDigit('3', &result_));
+}
+
+TEST_F(AsYouTypeFormatterTest,
+       CountryWithSpaceInNationalPrefixFormattingRuleAndLongNdd) {
+  formatter_.reset(phone_util_.GetAsYouTypeFormatter(RegionCode::BY()));
+
+  EXPECT_EQ("9", formatter_->InputDigit('9', &result_));
+  EXPECT_EQ("99", formatter_->InputDigit('9', &result_));
+  EXPECT_EQ("999", formatter_->InputDigit('9', &result_));
+  EXPECT_EQ("9999", formatter_->InputDigit('9', &result_));
+  EXPECT_EQ("99999 ", formatter_->InputDigit('9', &result_));
+  EXPECT_EQ("99999 1", formatter_->InputDigit('1', &result_));
+  EXPECT_EQ("99999 12", formatter_->InputDigit('2', &result_));
+  EXPECT_EQ("99999 123", formatter_->InputDigit('3', &result_));
+  EXPECT_EQ("99999 1234", formatter_->InputDigit('4', &result_));
+  EXPECT_EQ("99999 12 345", formatter_->InputDigit('5', &result_));
+}
+
 TEST_F(AsYouTypeFormatterTest, AYTF_US) {
   formatter_.reset(phone_util_.GetAsYouTypeFormatter(RegionCode::US()));
 
@@ -932,5 +968,185 @@ TEST_F(AsYouTypeFormatterTest, AYTF_LongNDD_SG) {
   EXPECT_EQ("777777 9876 7890", formatter_->InputDigit('0', &result_));
 }
 
+TEST_F(AsYouTypeFormatterTest, AYTF_ShortNumberFormattingFix_AU) {
+  // For Australia, the national prefix is not optional when formatting.
+  formatter_.reset(phone_util_.GetAsYouTypeFormatter(RegionCode::AU()));
+
+  // 1234567890 - For leading digit 1, the national prefix formatting rule has
+  // first group only.
+  EXPECT_EQ("1", formatter_->InputDigit('1', &result_));
+  EXPECT_EQ("12", formatter_->InputDigit('2', &result_));
+  EXPECT_EQ("123", formatter_->InputDigit('3', &result_));
+  EXPECT_EQ("1234", formatter_->InputDigit('4', &result_));
+  EXPECT_EQ("1234 5", formatter_->InputDigit('5', &result_));
+  EXPECT_EQ("1234 56", formatter_->InputDigit('6', &result_));
+  EXPECT_EQ("1234 567", formatter_->InputDigit('7', &result_));
+  EXPECT_EQ("1234 567 8", formatter_->InputDigit('8', &result_));
+  EXPECT_EQ("1234 567 89", formatter_->InputDigit('9', &result_));
+  EXPECT_EQ("1234 567 890", formatter_->InputDigit('0', &result_));
+
+  // +61 1234 567 890 - Test the same number, but with the country code.
+  formatter_->Clear();
+  EXPECT_EQ("+", formatter_->InputDigit('+', &result_));
+  EXPECT_EQ("+6", formatter_->InputDigit('6', &result_));
+  EXPECT_EQ("+61 ", formatter_->InputDigit('1', &result_));
+  EXPECT_EQ("+61 1", formatter_->InputDigit('1', &result_));
+  EXPECT_EQ("+61 12", formatter_->InputDigit('2', &result_));
+  EXPECT_EQ("+61 123", formatter_->InputDigit('3', &result_));
+  EXPECT_EQ("+61 1234", formatter_->InputDigit('4', &result_));
+  EXPECT_EQ("+61 1234 5", formatter_->InputDigit('5', &result_));
+  EXPECT_EQ("+61 1234 56", formatter_->InputDigit('6', &result_));
+  EXPECT_EQ("+61 1234 567", formatter_->InputDigit('7', &result_));
+  EXPECT_EQ("+61 1234 567 8", formatter_->InputDigit('8', &result_));
+  EXPECT_EQ("+61 1234 567 89", formatter_->InputDigit('9', &result_));
+  EXPECT_EQ("+61 1234 567 890", formatter_->InputDigit('0', &result_));
+
+  // 212345678 - For leading digit 2, the national prefix formatting rule puts
+  // the national prefix before the first group.
+  formatter_->Clear();
+  EXPECT_EQ("0", formatter_->InputDigit('0', &result_));
+  EXPECT_EQ("02", formatter_->InputDigit('2', &result_));
+  EXPECT_EQ("021", formatter_->InputDigit('1', &result_));
+  EXPECT_EQ("02 12", formatter_->InputDigit('2', &result_));
+  EXPECT_EQ("02 123", formatter_->InputDigit('3', &result_));
+  EXPECT_EQ("02 1234", formatter_->InputDigit('4', &result_));
+  EXPECT_EQ("02 1234 5", formatter_->InputDigit('5', &result_));
+  EXPECT_EQ("02 1234 56", formatter_->InputDigit('6', &result_));
+  EXPECT_EQ("02 1234 567", formatter_->InputDigit('7', &result_));
+  EXPECT_EQ("02 1234 5678", formatter_->InputDigit('8', &result_));
+
+  // 212345678 - Test the same number, but without the leading 0.
+  formatter_->Clear();
+  EXPECT_EQ("2", formatter_->InputDigit('2', &result_));
+  EXPECT_EQ("21", formatter_->InputDigit('1', &result_));
+  EXPECT_EQ("212", formatter_->InputDigit('2', &result_));
+  EXPECT_EQ("2123", formatter_->InputDigit('3', &result_));
+  EXPECT_EQ("21234", formatter_->InputDigit('4', &result_));
+  EXPECT_EQ("212345", formatter_->InputDigit('5', &result_));
+  EXPECT_EQ("2123456", formatter_->InputDigit('6', &result_));
+  EXPECT_EQ("21234567", formatter_->InputDigit('7', &result_));
+  EXPECT_EQ("212345678", formatter_->InputDigit('8', &result_));
+
+  // +61 2 1234 5678 - Test the same number, but with the country code.
+  formatter_->Clear();
+  EXPECT_EQ("+", formatter_->InputDigit('+', &result_));
+  EXPECT_EQ("+6", formatter_->InputDigit('6', &result_));
+  EXPECT_EQ("+61 ", formatter_->InputDigit('1', &result_));
+  EXPECT_EQ("+61 2", formatter_->InputDigit('2', &result_));
+  EXPECT_EQ("+61 21", formatter_->InputDigit('1', &result_));
+  EXPECT_EQ("+61 2 12", formatter_->InputDigit('2', &result_));
+  EXPECT_EQ("+61 2 123", formatter_->InputDigit('3', &result_));
+  EXPECT_EQ("+61 2 1234", formatter_->InputDigit('4', &result_));
+  EXPECT_EQ("+61 2 1234 5", formatter_->InputDigit('5', &result_));
+  EXPECT_EQ("+61 2 1234 56", formatter_->InputDigit('6', &result_));
+  EXPECT_EQ("+61 2 1234 567", formatter_->InputDigit('7', &result_));
+  EXPECT_EQ("+61 2 1234 5678", formatter_->InputDigit('8', &result_));
+}
+
+TEST_F(AsYouTypeFormatterTest, AYTF_ShortNumberFormattingFix_KR) {
+  // For Korea, the national prefix is not optional when formatting, and the
+  // national prefix formatting rule doesn't consist of only the first group.
+  formatter_.reset(phone_util_.GetAsYouTypeFormatter(RegionCode::KR()));
+
+  // 111
+  EXPECT_EQ("1", formatter_->InputDigit('1', &result_));
+  EXPECT_EQ("11", formatter_->InputDigit('1', &result_));
+  EXPECT_EQ("111", formatter_->InputDigit('1', &result_));
+
+  // 114
+  formatter_->Clear();
+  EXPECT_EQ("1", formatter_->InputDigit('1', &result_));
+  EXPECT_EQ("11", formatter_->InputDigit('1', &result_));
+  EXPECT_EQ("114", formatter_->InputDigit('4', &result_));
+
+  // 131212345 - Test a mobile number without the national prefix. Even though
+  // it is not an emergency number, it should be formatted as a block.
+  formatter_->Clear();
+  EXPECT_EQ("1", formatter_->InputDigit('1', &result_));
+  EXPECT_EQ("13", formatter_->InputDigit('3', &result_));
+  EXPECT_EQ("131", formatter_->InputDigit('1', &result_));
+  EXPECT_EQ("1312", formatter_->InputDigit('2', &result_));
+  EXPECT_EQ("13121", formatter_->InputDigit('1', &result_));
+  EXPECT_EQ("131212", formatter_->InputDigit('2', &result_));
+  EXPECT_EQ("1312123", formatter_->InputDigit('3', &result_));
+  EXPECT_EQ("13121234", formatter_->InputDigit('4', &result_));
+
+  // +82 131-2-1234 - Test the same number, but with the country code.
+  formatter_->Clear();
+  EXPECT_EQ("+", formatter_->InputDigit('+', &result_));
+  EXPECT_EQ("+8", formatter_->InputDigit('8', &result_));
+  EXPECT_EQ("+82 ", formatter_->InputDigit('2', &result_));
+  EXPECT_EQ("+82 1", formatter_->InputDigit('1', &result_));
+  EXPECT_EQ("+82 13", formatter_->InputDigit('3', &result_));
+  EXPECT_EQ("+82 131", formatter_->InputDigit('1', &result_));
+  EXPECT_EQ("+82 131-2", formatter_->InputDigit('2', &result_));
+  EXPECT_EQ("+82 131-2-1", formatter_->InputDigit('1', &result_));
+  EXPECT_EQ("+82 131-2-12", formatter_->InputDigit('2', &result_));
+  EXPECT_EQ("+82 131-2-123", formatter_->InputDigit('3', &result_));
+  EXPECT_EQ("+82 131-2-1234", formatter_->InputDigit('4', &result_));
+}
+
+TEST_F(AsYouTypeFormatterTest, AYTF_ShortNumberFormattingFix_MX) {
+  // For Mexico, the national prefix is optional when formatting.
+  formatter_.reset(phone_util_.GetAsYouTypeFormatter(RegionCode::MX()));
+
+  // 911
+  EXPECT_EQ("9", formatter_->InputDigit('9', &result_));
+  EXPECT_EQ("91", formatter_->InputDigit('1', &result_));
+  EXPECT_EQ("911", formatter_->InputDigit('1', &result_));
+
+  // 800 123 4567 - Test a toll-free number, which should have a formatting rule
+  // applied to it even though it doesn't begin with the national prefix.
+  formatter_->Clear();
+  EXPECT_EQ("8", formatter_->InputDigit('8', &result_));
+  EXPECT_EQ("80", formatter_->InputDigit('0', &result_));
+  EXPECT_EQ("800", formatter_->InputDigit('0', &result_));
+  EXPECT_EQ("800 1", formatter_->InputDigit('1', &result_));
+  EXPECT_EQ("800 12", formatter_->InputDigit('2', &result_));
+  EXPECT_EQ("800 123", formatter_->InputDigit('3', &result_));
+  EXPECT_EQ("800 123 4", formatter_->InputDigit('4', &result_));
+  EXPECT_EQ("800 123 45", formatter_->InputDigit('5', &result_));
+  EXPECT_EQ("800 123 456", formatter_->InputDigit('6', &result_));
+  EXPECT_EQ("800 123 4567", formatter_->InputDigit('7', &result_));
+
+  // +52 800 123 4567 - Test the same number, but with the country code.
+  formatter_->Clear();
+  EXPECT_EQ("+", formatter_->InputDigit('+', &result_));
+  EXPECT_EQ("+5", formatter_->InputDigit('5', &result_));
+  EXPECT_EQ("+52 ", formatter_->InputDigit('2', &result_));
+  EXPECT_EQ("+52 8", formatter_->InputDigit('8', &result_));
+  EXPECT_EQ("+52 80", formatter_->InputDigit('0', &result_));
+  EXPECT_EQ("+52 800", formatter_->InputDigit('0', &result_));
+  EXPECT_EQ("+52 800 1", formatter_->InputDigit('1', &result_));
+  EXPECT_EQ("+52 800 12", formatter_->InputDigit('2', &result_));
+  EXPECT_EQ("+52 800 123", formatter_->InputDigit('3', &result_));
+  EXPECT_EQ("+52 800 123 4", formatter_->InputDigit('4', &result_));
+  EXPECT_EQ("+52 800 123 45", formatter_->InputDigit('5', &result_));
+  EXPECT_EQ("+52 800 123 456", formatter_->InputDigit('6', &result_));
+  EXPECT_EQ("+52 800 123 4567", formatter_->InputDigit('7', &result_));
+}
+
+TEST_F(AsYouTypeFormatterTest, AYTF_ShortNumberFormattingFix_US) {
+  // For the US, an initial 1 is treated specially.
+  formatter_.reset(phone_util_.GetAsYouTypeFormatter(RegionCode::US()));
+
+  // 101 - Test that the initial 1 is not treated as a national prefix.
+  EXPECT_EQ("1", formatter_->InputDigit('1', &result_));
+  EXPECT_EQ("10", formatter_->InputDigit('0', &result_));
+  EXPECT_EQ("101", formatter_->InputDigit('1', &result_));
+
+  // 112 - Test that the initial 1 is not treated as a national prefix.
+  formatter_->Clear();
+  EXPECT_EQ("1", formatter_->InputDigit('1', &result_));
+  EXPECT_EQ("11", formatter_->InputDigit('1', &result_));
+  EXPECT_EQ("112", formatter_->InputDigit('2', &result_));
+
+  // 122 - Test that the initial 1 is treated as a national prefix.
+  formatter_->Clear();
+  EXPECT_EQ("1", formatter_->InputDigit('1', &result_));
+  EXPECT_EQ("12", formatter_->InputDigit('2', &result_));
+  EXPECT_EQ("1 22", formatter_->InputDigit('2', &result_));
+}
+
 }  // namespace phonenumbers
 }  // namespace i18n

cpp/test/phonenumbers/phonenumbermatcher_test.cc

@@ -224,7 +224,7 @@ class PhoneNumberMatcherTest : public testing::Test {
     // With a second number later.
     context_pairs.push_back(NumberContext("Call ", " or +1800-123-4567!"));
     // With a Month-Day date.
-    context_pairs.push_back(NumberContext("Call me on June 21 at", ""));
+    context_pairs.push_back(NumberContext("Call me on June 2 at", ""));
     // With publication pages.
     context_pairs.push_back(NumberContext(
         "As quoted by Alfonso 12-15 (2009), you may call me at ", ""));
@@ -742,7 +742,8 @@ static const NumberTest kValidCases[] = {
   NumberTest("030-3-2 23 12 34", RegionCode::DE()),
   NumberTest("03 0 -3 2 23 12 34", RegionCode::DE()),
   NumberTest("(0)3 0 -3 2 23 12 34", RegionCode::DE()),
-  NumberTest("0 3 0 -3 2 23 12 34", RegionCode::DE()),};
+  NumberTest("0 3 0 -3 2 23 12 34", RegionCode::DE()),
+};
 
 // Strings with number-like things that should only be found up to and including
 // the "strict_grouping" leniency level.

cpp/test/phonenumbers/phonenumberutil_test.cc

@@ -15,6 +15,12 @@
 // Author: Shaopeng Jia
 // Author: Lara Rennie
 // Open-sourced by: Philippe Liard
+//
+// Note that these tests use the metadata contained in the test metadata file,
+// not the normal metadata file, so should not be used for regression test
+// purposes - these tests are illustrative only and test functionality.
+
+#include "phonenumbers/phonenumberutil.h"
 
 #include <iostream>
 #include <set>
@@ -25,7 +31,6 @@
 #include "phonenumbers/phonemetadata.pb.h"
 #include "phonenumbers/phonenumber.h"
 #include "phonenumbers/phonenumber.pb.h"
-#include "phonenumbers/phonenumberutil.h"
 #include "phonenumbers/test_util.h"
 
 namespace i18n {
@@ -2091,16 +2096,23 @@ TEST_F(PhoneNumberUtilTest, GetNationalDiallingPrefixForRegion) {
 }
 
 TEST_F(PhoneNumberUtilTest, IsViablePhoneNumber) {
+  EXPECT_FALSE(IsViablePhoneNumber("1"));
   // Only one or two digits before strange non-possible punctuation.
-  EXPECT_FALSE(IsViablePhoneNumber("12. March"));
   EXPECT_FALSE(IsViablePhoneNumber("1+1+1"));
   EXPECT_FALSE(IsViablePhoneNumber("80+0"));
-  EXPECT_FALSE(IsViablePhoneNumber("00"));
-  // Three digits is viable.
+  // Two digits is viable.
+  EXPECT_TRUE(IsViablePhoneNumber("00"));
   EXPECT_TRUE(IsViablePhoneNumber("111"));
   // Alpha numbers.
   EXPECT_TRUE(IsViablePhoneNumber("0800-4-pizza"));
   EXPECT_TRUE(IsViablePhoneNumber("0800-4-PIZZA"));
+  // We need at least three digits before any alpha characters.
+  EXPECT_FALSE(IsViablePhoneNumber("08-PIZZA"));
+  EXPECT_FALSE(IsViablePhoneNumber("8-PIZZA"));
+  EXPECT_FALSE(IsViablePhoneNumber("12. March"));
+}
+
+TEST_F(PhoneNumberUtilTest, IsViablePhoneNumberNonAscii) {
   // Only one or two digits before possible punctuation followed by more digits.
   // The punctuation used here is the unicode character u+3000.
   EXPECT_TRUE(IsViablePhoneNumber("1\xE3\x80\x80" "34" /* "1　34" */));
@@ -2555,7 +2567,7 @@ TEST_F(PhoneNumberUtilTest, IsNumberMatchNonMatches) {
                                                     "3 331 6005#1234"));
   // Invalid numbers that can't be parsed.
   EXPECT_EQ(PhoneNumberUtil::INVALID_NUMBER,
-            phone_util_.IsNumberMatchWithTwoStrings("43", "3 331 6043"));
+            phone_util_.IsNumberMatchWithTwoStrings("4", "3 331 6043"));
   // Invalid numbers that can't be parsed.
   EXPECT_EQ(PhoneNumberUtil::INVALID_NUMBER,
             phone_util_.IsNumberMatchWithTwoStrings("+43", "+64 3 331 6005"));
@@ -2840,6 +2852,14 @@ TEST_F(PhoneNumberUtilTest, ParseNationalNumber) {
   EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR,
             phone_util_.Parse("+81 *2345", RegionCode::JP(), &test_number));
   EXPECT_EQ(star_number, test_number);
+
+  PhoneNumber short_number;
+  short_number.set_country_code(64);
+  short_number.set_national_number(12ULL);
+  test_number.Clear();
+  EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR,
+            phone_util_.Parse("12", RegionCode::NZ(), &test_number));
+  EXPECT_EQ(short_number, test_number);
 }
 
 TEST_F(PhoneNumberUtilTest, ParseNumberWithAlphaCharacters) {
@@ -3157,6 +3177,21 @@ TEST_F(PhoneNumberUtilTest, FailedParseOnInvalidNumbers) {
                               &test_number));
   EXPECT_EQ(PhoneNumber::default_instance(), test_number);
 
+  EXPECT_EQ(PhoneNumberUtil::NOT_A_NUMBER,
+            phone_util_.Parse("1 Still not a number", RegionCode::NZ(),
+                              &test_number));
+  EXPECT_EQ(PhoneNumber::default_instance(), test_number);
+
+  EXPECT_EQ(PhoneNumberUtil::NOT_A_NUMBER,
+            phone_util_.Parse("1 MICROSOFT", RegionCode::NZ(),
+                              &test_number));
+  EXPECT_EQ(PhoneNumber::default_instance(), test_number);
+
+  EXPECT_EQ(PhoneNumberUtil::NOT_A_NUMBER,
+            phone_util_.Parse("12 MICROSOFT", RegionCode::NZ(),
+                              &test_number));
+  EXPECT_EQ(PhoneNumber::default_instance(), test_number);
+
   EXPECT_EQ(PhoneNumberUtil::TOO_LONG_NSN,
             phone_util_.Parse("01495 72553301873 810104", RegionCode::GB(),
                               &test_number));
@@ -3617,19 +3652,15 @@ TEST_F(PhoneNumberUtilTest, CanBeInternationallyDialled) {
 }
 
 TEST_F(PhoneNumberUtilTest, IsAlphaNumber) {
-  static const string kAlphaNumber("1800 six-flags");
-  EXPECT_TRUE(phone_util_.IsAlphaNumber(kAlphaNumber));
-  static const string kAlphaNumberWithExtension = "1800 six-flags ext. 1234";
-  EXPECT_TRUE(phone_util_.IsAlphaNumber(kAlphaNumberWithExtension));
-  static const string kI18nAlphaNumber("+800 six-flags");
-  EXPECT_TRUE(phone_util_.IsAlphaNumber(kI18nAlphaNumber));
-  static const string kNonAlphaNumber("1800 123-1234");
-  EXPECT_FALSE(phone_util_.IsAlphaNumber(kNonAlphaNumber));
-  static const string kNonAlphaNumberWithExtension(
-      "1800 123-1234 extension: 1234");
-  EXPECT_FALSE(phone_util_.IsAlphaNumber(kNonAlphaNumberWithExtension));
-  static const string kI18nNonAlphaNumber("+800 1234-1234");
-  EXPECT_FALSE(phone_util_.IsAlphaNumber(kI18nNonAlphaNumber));
+  EXPECT_TRUE(phone_util_.IsAlphaNumber("1800 six-flags"));
+  EXPECT_TRUE(phone_util_.IsAlphaNumber("1800 six-flags ext. 1234"));
+  EXPECT_TRUE(phone_util_.IsAlphaNumber("+800 six-flags"));
+  EXPECT_TRUE(phone_util_.IsAlphaNumber("180 six-flags"));
+  EXPECT_FALSE(phone_util_.IsAlphaNumber("1800 123-1234"));
+  EXPECT_FALSE(phone_util_.IsAlphaNumber("1 six-flags"));
+  EXPECT_FALSE(phone_util_.IsAlphaNumber("18 six-flags"));
+  EXPECT_FALSE(phone_util_.IsAlphaNumber("1800 123-1234 extension: 1234"));
+  EXPECT_FALSE(phone_util_.IsAlphaNumber("+800 1234-1234"));
 }
 
 }  // namespace phonenumbers

cpp/test/phonenumbers/test_util.h

@@ -77,6 +77,10 @@ class RegionCode {
     return "BS";
   }
 
+  static const char* BY() {
+    return "BY";
+  }
+
   static const char* CA() {
     return "CA";
   }