<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>226770</bug_id>
          
          <creation_ts>2021-06-08 08:02:40 -0700</creation_ts>
          <short_desc>CSSOM test for serializing font-variant fails</short_desc>
          <delta_ts>2021-06-21 11:19:05 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>CSS</component>
          <version>Other</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Rob Buis">rbuis</reporter>
          <assigned_to name="Rob Buis">rbuis</assigned_to>
          <cc>darin</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>glenn</cc>
    
    <cc>gyuyoung.kim</cc>
    
    <cc>macpherson</cc>
    
    <cc>menard</cc>
    
    <cc>sam</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1767781</commentid>
    <comment_count>0</comment_count>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-06-08 08:02:40 -0700</bug_when>
    <thetext>CSSOM test for serializing font-variant fails, see css/cssom/serialize-values.html.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1767798</commentid>
    <comment_count>1</comment_count>
      <attachid>430850</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-06-08 09:33:28 -0700</bug_when>
    <thetext>Created attachment 430850
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1767836</commentid>
    <comment_count>2</comment_count>
      <attachid>430866</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-06-08 11:12:44 -0700</bug_when>
    <thetext>Created attachment 430866
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1767876</commentid>
    <comment_count>3</comment_count>
      <attachid>430882</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-06-08 13:18:49 -0700</bug_when>
    <thetext>Created attachment 430882
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1769801</commentid>
    <comment_count>4</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-06-15 08:03:16 -0700</bug_when>
    <thetext>&lt;rdar://problem/79342847&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1771057</commentid>
    <comment_count>5</comment_count>
      <attachid>431785</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-06-18 13:09:06 -0700</bug_when>
    <thetext>Created attachment 431785
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1771082</commentid>
    <comment_count>6</comment_count>
      <attachid>431791</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-06-19 01:07:36 -0700</bug_when>
    <thetext>Created attachment 431791
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1771089</commentid>
    <comment_count>7</comment_count>
      <attachid>431793</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-06-19 03:10:58 -0700</bug_when>
    <thetext>Created attachment 431793
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1771207</commentid>
    <comment_count>8</comment_count>
      <attachid>431793</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2021-06-20 19:19:25 -0700</bug_when>
    <thetext>Comment on attachment 431793
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=431793&amp;action=review

&gt; Source/WebCore/css/parser/CSSPropertyParser.cpp:758
&gt; +    if (variant) {
&gt; +        switch (*variant) {

Could write this instead:

    switch (variant.value_or(FontVariantEastAsianVariant::Normal)) {

Then we don’t have to nest the entire switch statement inside an if statement. It’s also such a mess how these functions map an enumeration value to a CSS value but don’t share any of the code to create the identifier and append. We could make this a lot tidier with a bit of refactoring.

&gt; Source/WebCore/css/parser/CSSPropertyParser.cpp:4969
&gt; +        addProperty(CSSPropertyFontVariantCaps, CSSPropertyFontVariant, CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important, true);
&gt; +        addProperty(CSSPropertyFontVariantEastAsian, CSSPropertyFontVariant, CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important, true);
&gt; +        addProperty(CSSPropertyFontVariantPosition, CSSPropertyFontVariant, CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important, true);

This &quot;, true&quot; stuff is unreadable. This is why we don}t use booleans for arguments where we pass constants.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1771329</commentid>
    <comment_count>9</comment_count>
      <attachid>431872</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-06-21 10:11:43 -0700</bug_when>
    <thetext>Created attachment 431872
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1771330</commentid>
    <comment_count>10</comment_count>
      <attachid>431793</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-06-21 10:15:46 -0700</bug_when>
    <thetext>Comment on attachment 431793
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=431793&amp;action=review

&gt;&gt; Source/WebCore/css/parser/CSSPropertyParser.cpp:758
&gt;&gt; +        switch (*variant) {
&gt; 
&gt; Could write this instead:
&gt; 
&gt;     switch (variant.value_or(FontVariantEastAsianVariant::Normal)) {
&gt; 
&gt; Then we don’t have to nest the entire switch statement inside an if statement. It’s also such a mess how these functions map an enumeration value to a CSS value but don’t share any of the code to create the identifier and append. We could make this a lot tidier with a bit of refactoring.

That does seem nicer, fixed.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1771363</commentid>
    <comment_count>11</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-06-21 11:19:02 -0700</bug_when>
    <thetext>Committed r279070 (238990@main): &lt;https://commits.webkit.org/238990@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 431872.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>430850</attachid>
            <date>2021-06-08 09:33:28 -0700</date>
            <delta_ts>2021-06-08 11:12:38 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-226770-20210608183327.patch</filename>
            <type>text/plain</type>
            <size>11277</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2YzOGEzNTBkOTdlODM0
OWJmZGM1YWVjMjgxYWI4YmFjNjQ1YTU0ZS4uNmY0NWVhY2VlNDUyMDVlMjU2MjI4ZjM2Mzk3YzE1
NDYzZjdlYTNmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTA2LTA4ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ1NTT00gdGVzdCBmb3Igc2VyaWFs
aXppbmcgZm9udC12YXJpYW50IGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD0yMjY3NzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P
UFMhKS4KKworICAgICAgICBXSVAuCisKKyAgICAgICAgKiBjc3MvU3R5bGVQcm9wZXJ0aWVzLmNw
cDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUHJvcGVydGllczo6Z2V0UHJvcGVydHlWYWx1ZSBj
b25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVByb3BlcnRpZXM6OmFwcGVuZEZvbnRMb25n
aGFuZFZhbHVlSWZFeHBsaWNpdCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVByb3Bl
cnRpZXM6OmZvbnRWYXJpYW50VmFsdWUgY29uc3QpOgorICAgICAgICAqIGNzcy9TdHlsZVByb3Bl
cnRpZXMuaDoKKyAgICAgICAgKiBjc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VyLmNwcDoKKyAg
ICAgICAgKFdlYkNvcmU6OkNTU1Byb3BlcnR5UGFyc2VyOjpjb25zdW1lRm9udFZhcmlhbnRTaG9y
dGhhbmQpOgorCiAyMDIxLTA2LTA3ICBBbGljaWEgQm95YSBHYXJjw61hICA8YWJveWFAaWdhbGlh
LmNvbT4KIAogICAgICAgICBbR1N0cmVhbWVyXSBBZGQgY2xhbmcgVFNBIGFubm90YXRpb25zOiBN
YWluVGhyZWFkTm90aWZpZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVBy
b3BlcnRpZXMuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVydGllcy5jcHAKaW5k
ZXggNmY2Y2U0MWQ5NzFmYTI0MTUxNWYwYmNlNDRlZTVmODBmNDNiZGFkYS4uNDlmYWU1ZjEzM2U2
ZTZmYTQxNzdjOGY2NTgyNzVlODY1MDdlYTlmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv
Y3NzL1N0eWxlUHJvcGVydGllcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJv
cGVydGllcy5jcHAKQEAgLTIzNyw2ICsyMzcsOCBAQCBTdHJpbmcgU3R5bGVQcm9wZXJ0aWVzOjpn
ZXRQcm9wZXJ0eVZhbHVlKENTU1Byb3BlcnR5SUQgcHJvcGVydHlJRCkgY29uc3QKICAgICAgICAg
cmV0dXJuIGdldEFsaWdubWVudFNob3J0aGFuZFZhbHVlKHBsYWNlU2VsZlNob3J0aGFuZCgpKTsK
ICAgICBjYXNlIENTU1Byb3BlcnR5Rm9udDoKICAgICAgICAgcmV0dXJuIGZvbnRWYWx1ZSgpOwor
ICAgIGNhc2UgQ1NTUHJvcGVydHlGb250VmFyaWFudDoKKyAgICAgICAgcmV0dXJuIGZvbnRWYXJp
YW50VmFsdWUoKTsKICAgICBjYXNlIENTU1Byb3BlcnR5SW5zZXQ6CiAgICAgICAgIHJldHVybiBn
ZXQ0VmFsdWVzKGluc2V0U2hvcnRoYW5kKCkpOwogICAgIGNhc2UgQ1NTUHJvcGVydHlJbnNldEJs
b2NrOgpAQCAtMzYzLDYgKzM2NSw5IEBAIHZvaWQgU3R5bGVQcm9wZXJ0aWVzOjphcHBlbmRGb250
TG9uZ2hhbmRWYWx1ZUlmRXhwbGljaXQoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlECiAgICAgICAg
IGJyZWFrOyAvLyBObyBwcmVmaXguCiAgICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRGYW1pbHk6CiAg
ICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50Q2FwczoKKyAgICBjYXNlIENTU1Byb3BlcnR5
Rm9udFZhcmlhbnRMaWdhdHVyZXM6CisgICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50TnVt
ZXJpYzoKKyAgICBjYXNlIENTU1Byb3BlcnR5Rm9udFZhcmlhbnRFYXN0QXNpYW46CiAgICAgY2Fz
ZSBDU1NQcm9wZXJ0eUZvbnRXZWlnaHQ6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRTdHJldGNo
OgogICAgICAgICBwcmVmaXggPSAnICc7CkBAIC00MTIsNiArNDE3LDE5IEBAIFN0cmluZyBTdHls
ZVByb3BlcnRpZXM6OmZvbnRWYWx1ZSgpIGNvbnN0CiAgICAgcmV0dXJuIHJlc3VsdC50b1N0cmlu
ZygpOwogfQogCitTdHJpbmcgU3R5bGVQcm9wZXJ0aWVzOjpmb250VmFyaWFudFZhbHVlKCkgY29u
c3QKK3sKKyAgICBTdHJpbmcgY29tbW9uVmFsdWU7CisgICAgU3RyaW5nQnVpbGRlciByZXN1bHQ7
CisgICAgYXBwZW5kRm9udExvbmdoYW5kVmFsdWVJZkV4cGxpY2l0KENTU1Byb3BlcnR5Rm9udFZh
cmlhbnRMaWdhdHVyZXMsIHJlc3VsdCwgY29tbW9uVmFsdWUpOworICAgIGlmIChpc0NTU1dpZGVW
YWx1ZUtleXdvcmQocmVzdWx0LnRvU3RyaW5nKCkpKQorICAgICAgICByZXR1cm4gcmVzdWx0LnRv
U3RyaW5nKCk7CisgICAgYXBwZW5kRm9udExvbmdoYW5kVmFsdWVJZkV4cGxpY2l0KENTU1Byb3Bl
cnR5Rm9udFZhcmlhbnRDYXBzLCByZXN1bHQsIGNvbW1vblZhbHVlKTsKKyAgICBhcHBlbmRGb250
TG9uZ2hhbmRWYWx1ZUlmRXhwbGljaXQoQ1NTUHJvcGVydHlGb250VmFyaWFudEVhc3RBc2lhbiwg
cmVzdWx0LCBjb21tb25WYWx1ZSk7CisgICAgYXBwZW5kRm9udExvbmdoYW5kVmFsdWVJZkV4cGxp
Y2l0KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRQb3NpdGlvbiwgcmVzdWx0LCBjb21tb25WYWx1ZSk7
CisgICAgcmV0dXJuIHJlc3VsdC50b1N0cmluZygpOworfQorCiBTdHJpbmcgU3R5bGVQcm9wZXJ0
aWVzOjpnZXQyVmFsdWVzKGNvbnN0IFN0eWxlUHJvcGVydHlTaG9ydGhhbmQmIHNob3J0aGFuZCkg
Y29uc3QKIHsKICAgICAvLyBBc3N1bWUgdGhlIHByb3BlcnRpZXMgYXJlIGluIHRoZSB1c3VhbCBv
cmRlciBzdGFydCwgZW5kLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJv
cGVydGllcy5oIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVydGllcy5oCmluZGV4IGIw
MjFhZWI3YzIwMzcwYzlmYzE3YmU1ZmI0YzVmZjZlNDE3ZmI3ZDcuLmRhN2Q5ZjY2ZGYwZTBjODYx
ZGUxZDQ2MmFiYzUwYzhkYWEzMTQ4OWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9T
dHlsZVByb3BlcnRpZXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQcm9wZXJ0aWVz
LmgKQEAgLTE3Miw2ICsxNzIsNyBAQCBwcml2YXRlOgogICAgIFN0cmluZyBnZXQ0VmFsdWVzKGNv
bnN0IFN0eWxlUHJvcGVydHlTaG9ydGhhbmQmKSBjb25zdDsKICAgICBTdHJpbmcgYm9yZGVyU3Bh
Y2luZ1ZhbHVlKGNvbnN0IFN0eWxlUHJvcGVydHlTaG9ydGhhbmQmKSBjb25zdDsKICAgICBTdHJp
bmcgZm9udFZhbHVlKCkgY29uc3Q7CisgICAgU3RyaW5nIGZvbnRWYXJpYW50VmFsdWUoKSBjb25z
dDsKICAgICB2b2lkIGFwcGVuZEZvbnRMb25naGFuZFZhbHVlSWZFeHBsaWNpdChDU1NQcm9wZXJ0
eUlELCBTdHJpbmdCdWlsZGVyJiByZXN1bHQsIFN0cmluZyYgdmFsdWUpIGNvbnN0OwogCiAgICAg
ZnJpZW5kIGNsYXNzIFByb3BlcnR5U2V0Q1NTU3R5bGVEZWNsYXJhdGlvbjsKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwIGIvU291cmNl
L1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHAKaW5kZXggNjg0NTIzNzg2
OTMyNjA4NmNiY2FlMGVkOTRkYmMzYTU2ZGViNTJmNS4uNDJjZjEzYWYxM2VkYjVjYTllYjFjYWY3
ZjczZmFiMTRmZGNlYTM3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9D
U1NQcm9wZXJ0eVBhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQ
cm9wZXJ0eVBhcnNlci5jcHAKQEAgLTQ5NDEsOSArNDk0MSw5IEBAIGJvb2wgQ1NTUHJvcGVydHlQ
YXJzZXI6OmNvbnN1bWVGb250VmFyaWFudFNob3J0aGFuZChib29sIGltcG9ydGFudCkKIHsKICAg
ICBpZiAoaWRlbnRNYXRjaGVzPENTU1ZhbHVlTm9ybWFsLCBDU1NWYWx1ZU5vbmU+KG1fcmFuZ2Uu
cGVlaygpLmlkKCkpKSB7CiAgICAgICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlh
bnRMaWdhdHVyZXMsIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIGNvbnN1bWVJZGVudChtX3Jhbmdl
KS5yZWxlYXNlTm9uTnVsbCgpLCBpbXBvcnRhbnQpOwotICAgICAgICBhZGRQcm9wZXJ0eShDU1NQ
cm9wZXJ0eUZvbnRWYXJpYW50Q2FwcywgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgQ1NTVmFsdWVQ
b29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwpLCBp
bXBvcnRhbnQpOwotICAgICAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50RWFz
dEFzaWFuLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigp
LmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCk7Ci0gICAg
ICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRQb3NpdGlvbiwgQ1NTUHJvcGVy
dHlGb250VmFyaWFudCwgQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVy
VmFsdWUoQ1NTVmFsdWVOb3JtYWwpLCBpbXBvcnRhbnQpOworICAgICAgICBhZGRQcm9wZXJ0eShD
U1NQcm9wZXJ0eUZvbnRWYXJpYW50Q2FwcywgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgQ1NTVmFs
dWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwp
LCBpbXBvcnRhbnQsIHRydWUpOworICAgICAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRW
YXJpYW50RWFzdEFzaWFuLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBDU1NWYWx1ZVBvb2w6OnNp
bmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFu
dCwgdHJ1ZSk7CisgICAgICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRQb3Np
dGlvbiwgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5j
cmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwpLCBpbXBvcnRhbnQsIHRydWUpOwog
ICAgICAgICByZXR1cm4gbV9yYW5nZS5hdEVuZCgpOwogICAgIH0KIApAQCAtNDk1NCw2ICs0OTU0
LDggQEAgYm9vbCBDU1NQcm9wZXJ0eVBhcnNlcjo6Y29uc3VtZUZvbnRWYXJpYW50U2hvcnRoYW5k
KGJvb2wgaW1wb3J0YW50KQogICAgIFJlZlB0cjxDU1NWYWx1ZT4gZWFzdEFzaWFuVmFsdWU7CiAg
ICAgRm9udFZhcmlhbnRMaWdhdHVyZXNQYXJzZXIgbGlnYXR1cmVzUGFyc2VyOwogICAgIEZvbnRW
YXJpYW50TnVtZXJpY1BhcnNlciBudW1lcmljUGFyc2VyOworICAgIGJvb2wgaW1wbGljaXRMaWdh
dHVyZXMgPSB0cnVlOworICAgIGJvb2wgaW1wbGljaXROdW1lcmljID0gdHJ1ZTsKICAgICBkbyB7
CiAgICAgICAgIGlmICghY2Fwc1ZhbHVlKSB7CiAgICAgICAgICAgICBjYXBzVmFsdWUgPSBjb25z
dW1lRm9udFZhcmlhbnRDYXBzKG1fcmFuZ2UpOwpAQCAtNDk3NSw5ICs0OTc3LDE0IEBAIGJvb2wg
Q1NTUHJvcGVydHlQYXJzZXI6OmNvbnN1bWVGb250VmFyaWFudFNob3J0aGFuZChib29sIGltcG9y
dGFudCkKIAogICAgICAgICBGb250VmFyaWFudExpZ2F0dXJlc1BhcnNlcjo6UGFyc2VSZXN1bHQg
bGlnYXR1cmVzUGFyc2VSZXN1bHQgPSBsaWdhdHVyZXNQYXJzZXIuY29uc3VtZUxpZ2F0dXJlKG1f
cmFuZ2UpOwogICAgICAgICBGb250VmFyaWFudE51bWVyaWNQYXJzZXI6OlBhcnNlUmVzdWx0IG51
bWVyaWNQYXJzZVJlc3VsdCA9IG51bWVyaWNQYXJzZXIuY29uc3VtZU51bWVyaWMobV9yYW5nZSk7
Ci0gICAgICAgIGlmIChsaWdhdHVyZXNQYXJzZVJlc3VsdCA9PSBGb250VmFyaWFudExpZ2F0dXJl
c1BhcnNlcjo6UGFyc2VSZXN1bHQ6OkNvbnN1bWVkVmFsdWUKLSAgICAgICAgICAgIHx8IG51bWVy
aWNQYXJzZVJlc3VsdCA9PSBGb250VmFyaWFudE51bWVyaWNQYXJzZXI6OlBhcnNlUmVzdWx0OjpD
b25zdW1lZFZhbHVlKQorICAgICAgICBpZiAobGlnYXR1cmVzUGFyc2VSZXN1bHQgPT0gRm9udFZh
cmlhbnRMaWdhdHVyZXNQYXJzZXI6OlBhcnNlUmVzdWx0OjpDb25zdW1lZFZhbHVlKSB7CisgICAg
ICAgICAgICBpbXBsaWNpdExpZ2F0dXJlcyA9IGZhbHNlOwogICAgICAgICAgICAgY29udGludWU7
CisgICAgICAgIH0KKyAgICAgICAgaWYgKG51bWVyaWNQYXJzZVJlc3VsdCA9PSBGb250VmFyaWFu
dE51bWVyaWNQYXJzZXI6OlBhcnNlUmVzdWx0OjpDb25zdW1lZFZhbHVlKSB7CisgICAgICAgICAg
ICBpbXBsaWNpdE51bWVyaWMgPSBmYWxzZTsKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAg
ICB9CiAKICAgICAgICAgaWYgKGxpZ2F0dXJlc1BhcnNlUmVzdWx0ID09IEZvbnRWYXJpYW50TGln
YXR1cmVzUGFyc2VyOjpQYXJzZVJlc3VsdDo6RGlzYWxsb3dlZFZhbHVlCiAgICAgICAgICAgICB8
fCBudW1lcmljUGFyc2VSZXN1bHQgPT0gRm9udFZhcmlhbnROdW1lcmljUGFyc2VyOjpQYXJzZVJl
c3VsdDo6RGlzYWxsb3dlZFZhbHVlKQpAQCAtNDk4Niw3ICs0OTkzLDcgQEAgYm9vbCBDU1NQcm9w
ZXJ0eVBhcnNlcjo6Y29uc3VtZUZvbnRWYXJpYW50U2hvcnRoYW5kKGJvb2wgaW1wb3J0YW50KQog
ICAgICAgICBpZiAoIWVhc3RBc2lhblZhbHVlKSB7CiAgICAgICAgICAgICBlYXN0QXNpYW5WYWx1
ZSA9IGNvbnN1bWVGb250VmFyaWFudEVhc3RBc2lhbihtX3JhbmdlKTsKICAgICAgICAgICAgIGlm
IChlYXN0QXNpYW5WYWx1ZSkKLSAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgICAg
IGNvbnRpbnVlOwogICAgICAgICB9CiAKICAgICAgICAgLy8gU2F3IHNvbWUgdmFsdWUgdGhhdCBk
aWRuJ3QgbWF0Y2ggYW55dGhpbmcgZWxzZS4KQEAgLTQ5OTQsMTUgKzUwMDEsMTkgQEAgYm9vbCBD
U1NQcm9wZXJ0eVBhcnNlcjo6Y29uc3VtZUZvbnRWYXJpYW50U2hvcnRoYW5kKGJvb2wgaW1wb3J0
YW50KQogCiAgICAgfSB3aGlsZSAoIW1fcmFuZ2UuYXRFbmQoKSk7CiAKLSAgICBhZGRQcm9wZXJ0
eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50TGlnYXR1cmVzLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50
LCBsaWdhdHVyZXNQYXJzZXIuZmluYWxpemVWYWx1ZSgpLnJlbGVhc2VOb25OdWxsKCksIGltcG9y
dGFudCk7Ci0gICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlGb250VmFyaWFudE51bWVyaWMsIENT
U1Byb3BlcnR5Rm9udFZhcmlhbnQsIG51bWVyaWNQYXJzZXIuZmluYWxpemVWYWx1ZSgpLnJlbGVh
c2VOb25OdWxsKCksIGltcG9ydGFudCk7Ci0gICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlGb250
VmFyaWFudENhcHMsIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIGNhcHNWYWx1ZSA/IGNhcHNWYWx1
ZS5yZWxlYXNlTm9uTnVsbCgpIDogQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVu
dGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwpLCBpbXBvcnRhbnQpOwotICAgIGFkZFByb3BlcnR5
KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRBbHRlcm5hdGVzLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50
LCBhbHRlcm5hdGVzVmFsdWUgPyBhbHRlcm5hdGVzVmFsdWUucmVsZWFzZU5vbk51bGwoKSA6IENT
U1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlTm9y
bWFsKSwgaW1wb3J0YW50KTsKLSAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50
UG9zaXRpb24sIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIHBvc2l0aW9uVmFsdWUgPyBwb3NpdGlv
blZhbHVlLnJlbGVhc2VOb25OdWxsKCkgOiBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0
ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCk7Ci0gICAgCisgICAg
YWRkUHJvcGVydHkoQ1NTUHJvcGVydHlGb250VmFyaWFudExpZ2F0dXJlcywgQ1NTUHJvcGVydHlG
b250VmFyaWFudCwgbGlnYXR1cmVzUGFyc2VyLmZpbmFsaXplVmFsdWUoKS5yZWxlYXNlTm9uTnVs
bCgpLCBpbXBvcnRhbnQsIGltcGxpY2l0TGlnYXR1cmVzKTsKKyAgICBhZGRQcm9wZXJ0eShDU1NQ
cm9wZXJ0eUZvbnRWYXJpYW50TnVtZXJpYywgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgbnVtZXJp
Y1BhcnNlci5maW5hbGl6ZVZhbHVlKCkucmVsZWFzZU5vbk51bGwoKSwgaW1wb3J0YW50LCBpbXBs
aWNpdE51bWVyaWMpOworICAgIGJvb2wgaW1wbGljaXRDYXBzID0gIWNhcHNWYWx1ZTsKKyAgICBh
ZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50Q2FwcywgQ1NTUHJvcGVydHlGb250VmFy
aWFudCwgY2Fwc1ZhbHVlID8gY2Fwc1ZhbHVlLnJlbGVhc2VOb25OdWxsKCkgOiBDU1NWYWx1ZVBv
b2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGlt
cG9ydGFudCwgaW1wbGljaXRDYXBzKTsKKyAgICBib29sIGltcGxpY2l0QWx0ZXJuYXRlcyA9IGFs
dGVybmF0ZXNWYWx1ZTsKKyAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50QWx0
ZXJuYXRlcywgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgYWx0ZXJuYXRlc1ZhbHVlID8gYWx0ZXJu
YXRlc1ZhbHVlLnJlbGVhc2VOb25OdWxsKCkgOiBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNy
ZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCwgaW1wbGljaXRB
bHRlcm5hdGVzKTsKKyAgICBib29sIGltcGxpY2l0UG9zaXRpb24gPSAhcG9zaXRpb25WYWx1ZTsK
KyAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50UG9zaXRpb24sIENTU1Byb3Bl
cnR5Rm9udFZhcmlhbnQsIHBvc2l0aW9uVmFsdWUgPyBwb3NpdGlvblZhbHVlLnJlbGVhc2VOb25O
dWxsKCkgOiBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShD
U1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCwgaW1wbGljaXRQb3NpdGlvbik7CisKKyAgICBib29s
IGltcGxpY2l0RWFzdEFzaWFuID0gIWVhc3RBc2lhblZhbHVlOwogICAgIGlmICghZWFzdEFzaWFu
VmFsdWUpCiAgICAgICAgIGVhc3RBc2lhblZhbHVlID0gQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24o
KS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwpOwotICAgIGFkZFByb3BlcnR5
KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRFYXN0QXNpYW4sIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQs
IGVhc3RBc2lhblZhbHVlLnJlbGVhc2VOb25OdWxsKCksIGltcG9ydGFudCk7CisgICAgYWRkUHJv
cGVydHkoQ1NTUHJvcGVydHlGb250VmFyaWFudEVhc3RBc2lhbiwgQ1NTUHJvcGVydHlGb250VmFy
aWFudCwgZWFzdEFzaWFuVmFsdWUucmVsZWFzZU5vbk51bGwoKSwgaW1wb3J0YW50LCBpbXBsaWNp
dEVhc3RBc2lhbik7CiAgICAgCiAgICAgcmV0dXJuIHRydWU7CiB9CmRpZmYgLS1naXQgYS9MYXlv
dXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj
L0NoYW5nZUxvZwppbmRleCBhYzJmNTRjMTliYjRmY2VjMmE1NzkwMGNlZGM0NTI2OWQ3YjJlZjU3
Li5iNDhmZTU5NzUwZjI2ZjRhZjhmNmY4ZmIxMWE1ZDliMzVlYmYxZGY5IDEwMDY0NAotLS0gYS9M
YXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL2ltcG9y
dGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wNi0wOCAgUm9iIEJ1aXMg
IDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIENTU09NIHRlc3QgZm9yIHNlcmlhbGl6aW5n
IGZvbnQtdmFyaWFudCBmYWlscworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjI2NzcwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgVXBkYXRlIGltcHJvdmVkIHRlc3QgcmVzdWx0LgorCisgICAgICAgICogd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3NvbS9zZXJpYWxpemUtdmFsdWVzLWV4cGVjdGVkLnR4dDoK
KwogMjAyMS0wNi0wNiAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAg
SGFuZGxlIGN1c3RvbSBpZGVudGlmaWVycyBhbmQgc3RyaW5ncyBzZXBhcmF0ZWx5LCBzbyB3ZSBj
YW4gcXVvdGUgc3RyaW5ncyBjb3JyZWN0bHkgY29uc2lzdGVudGx5CmRpZmYgLS1naXQgYS9MYXlv
dXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3NvbS9zZXJpYWxp
emUtdmFsdWVzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzc29tL3NlcmlhbGl6ZS12YWx1ZXMtZXhwZWN0ZWQudHh0CmluZGV4
IGViMzA4ZWUzMTEzMjNmNWYwZDVhY2VlNGJiYzRmZDYxZWVlNDM1MjMuLjAzZmE4ZjdiZTNjZGY5
ZGYxODMyNjczNzRkNjdmODllMzE4OGI2YTQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzc29tL3NlcmlhbGl6ZS12YWx1ZXMtZXhw
ZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzc29tL3NlcmlhbGl6ZS12YWx1ZXMtZXhwZWN0ZWQudHh0CkBAIC0zOTMsOSArMzkz
LDkgQEAgUEFTUyBmb250LXN0eWxlOiBub3JtYWwKIFBBU1MgZm9udC1zdHlsZTogaXRhbGljCiBQ
QVNTIGZvbnQtc3R5bGU6IG9ibGlxdWUKIFBBU1MgZm9udC1zdHlsZTogaW5oZXJpdAotRkFJTCBm
b250LXZhcmlhbnQ6IG5vcm1hbCBhc3NlcnRfZXF1YWxzOiBmb250LXZhcmlhbnQgcmF3IGlubGlu
ZSBzdHlsZSBkZWNsYXJhdGlvbiBleHBlY3RlZCAibm9ybWFsIiBidXQgZ290ICIiCi1GQUlMIGZv
bnQtdmFyaWFudDogc21hbGwtY2FwcyBhc3NlcnRfZXF1YWxzOiBmb250LXZhcmlhbnQgcmF3IGlu
bGluZSBzdHlsZSBkZWNsYXJhdGlvbiBleHBlY3RlZCAic21hbGwtY2FwcyIgYnV0IGdvdCAiIgot
RkFJTCBmb250LXZhcmlhbnQ6IGluaGVyaXQgYXNzZXJ0X2VxdWFsczogZm9udC12YXJpYW50IHJh
dyBpbmxpbmUgc3R5bGUgZGVjbGFyYXRpb24gZXhwZWN0ZWQgImluaGVyaXQiIGJ1dCBnb3QgIiIK
K1BBU1MgZm9udC12YXJpYW50OiBub3JtYWwKK1BBU1MgZm9udC12YXJpYW50OiBzbWFsbC1jYXBz
CitQQVNTIGZvbnQtdmFyaWFudDogaW5oZXJpdAogUEFTUyBmb250LXdlaWdodDogbm9ybWFsCiBQ
QVNTIGZvbnQtd2VpZ2h0OiBib2xkCiBQQVNTIGZvbnQtd2VpZ2h0OiBib2xkZXIK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>430866</attachid>
            <date>2021-06-08 11:12:44 -0700</date>
            <delta_ts>2021-06-08 13:18:43 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-226770-20210608201242.patch</filename>
            <type>text/plain</type>
            <size>19799</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2YzOGEzNTBkOTdlODM0
OWJmZGM1YWVjMjgxYWI4YmFjNjQ1YTU0ZS4uNmY0NWVhY2VlNDUyMDVlMjU2MjI4ZjM2Mzk3YzE1
NDYzZjdlYTNmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTA2LTA4ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ1NTT00gdGVzdCBmb3Igc2VyaWFs
aXppbmcgZm9udC12YXJpYW50IGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD0yMjY3NzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P
UFMhKS4KKworICAgICAgICBXSVAuCisKKyAgICAgICAgKiBjc3MvU3R5bGVQcm9wZXJ0aWVzLmNw
cDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUHJvcGVydGllczo6Z2V0UHJvcGVydHlWYWx1ZSBj
b25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVByb3BlcnRpZXM6OmFwcGVuZEZvbnRMb25n
aGFuZFZhbHVlSWZFeHBsaWNpdCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVByb3Bl
cnRpZXM6OmZvbnRWYXJpYW50VmFsdWUgY29uc3QpOgorICAgICAgICAqIGNzcy9TdHlsZVByb3Bl
cnRpZXMuaDoKKyAgICAgICAgKiBjc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VyLmNwcDoKKyAg
ICAgICAgKFdlYkNvcmU6OkNTU1Byb3BlcnR5UGFyc2VyOjpjb25zdW1lRm9udFZhcmlhbnRTaG9y
dGhhbmQpOgorCiAyMDIxLTA2LTA3ICBBbGljaWEgQm95YSBHYXJjw61hICA8YWJveWFAaWdhbGlh
LmNvbT4KIAogICAgICAgICBbR1N0cmVhbWVyXSBBZGQgY2xhbmcgVFNBIGFubm90YXRpb25zOiBN
YWluVGhyZWFkTm90aWZpZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVBy
b3BlcnRpZXMuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVydGllcy5jcHAKaW5k
ZXggNmY2Y2U0MWQ5NzFmYTI0MTUxNWYwYmNlNDRlZTVmODBmNDNiZGFkYS4uNDlmYWU1ZjEzM2U2
ZTZmYTQxNzdjOGY2NTgyNzVlODY1MDdlYTlmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv
Y3NzL1N0eWxlUHJvcGVydGllcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJv
cGVydGllcy5jcHAKQEAgLTIzNyw2ICsyMzcsOCBAQCBTdHJpbmcgU3R5bGVQcm9wZXJ0aWVzOjpn
ZXRQcm9wZXJ0eVZhbHVlKENTU1Byb3BlcnR5SUQgcHJvcGVydHlJRCkgY29uc3QKICAgICAgICAg
cmV0dXJuIGdldEFsaWdubWVudFNob3J0aGFuZFZhbHVlKHBsYWNlU2VsZlNob3J0aGFuZCgpKTsK
ICAgICBjYXNlIENTU1Byb3BlcnR5Rm9udDoKICAgICAgICAgcmV0dXJuIGZvbnRWYWx1ZSgpOwor
ICAgIGNhc2UgQ1NTUHJvcGVydHlGb250VmFyaWFudDoKKyAgICAgICAgcmV0dXJuIGZvbnRWYXJp
YW50VmFsdWUoKTsKICAgICBjYXNlIENTU1Byb3BlcnR5SW5zZXQ6CiAgICAgICAgIHJldHVybiBn
ZXQ0VmFsdWVzKGluc2V0U2hvcnRoYW5kKCkpOwogICAgIGNhc2UgQ1NTUHJvcGVydHlJbnNldEJs
b2NrOgpAQCAtMzYzLDYgKzM2NSw5IEBAIHZvaWQgU3R5bGVQcm9wZXJ0aWVzOjphcHBlbmRGb250
TG9uZ2hhbmRWYWx1ZUlmRXhwbGljaXQoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlECiAgICAgICAg
IGJyZWFrOyAvLyBObyBwcmVmaXguCiAgICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRGYW1pbHk6CiAg
ICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50Q2FwczoKKyAgICBjYXNlIENTU1Byb3BlcnR5
Rm9udFZhcmlhbnRMaWdhdHVyZXM6CisgICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50TnVt
ZXJpYzoKKyAgICBjYXNlIENTU1Byb3BlcnR5Rm9udFZhcmlhbnRFYXN0QXNpYW46CiAgICAgY2Fz
ZSBDU1NQcm9wZXJ0eUZvbnRXZWlnaHQ6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRTdHJldGNo
OgogICAgICAgICBwcmVmaXggPSAnICc7CkBAIC00MTIsNiArNDE3LDE5IEBAIFN0cmluZyBTdHls
ZVByb3BlcnRpZXM6OmZvbnRWYWx1ZSgpIGNvbnN0CiAgICAgcmV0dXJuIHJlc3VsdC50b1N0cmlu
ZygpOwogfQogCitTdHJpbmcgU3R5bGVQcm9wZXJ0aWVzOjpmb250VmFyaWFudFZhbHVlKCkgY29u
c3QKK3sKKyAgICBTdHJpbmcgY29tbW9uVmFsdWU7CisgICAgU3RyaW5nQnVpbGRlciByZXN1bHQ7
CisgICAgYXBwZW5kRm9udExvbmdoYW5kVmFsdWVJZkV4cGxpY2l0KENTU1Byb3BlcnR5Rm9udFZh
cmlhbnRMaWdhdHVyZXMsIHJlc3VsdCwgY29tbW9uVmFsdWUpOworICAgIGlmIChpc0NTU1dpZGVW
YWx1ZUtleXdvcmQocmVzdWx0LnRvU3RyaW5nKCkpKQorICAgICAgICByZXR1cm4gcmVzdWx0LnRv
U3RyaW5nKCk7CisgICAgYXBwZW5kRm9udExvbmdoYW5kVmFsdWVJZkV4cGxpY2l0KENTU1Byb3Bl
cnR5Rm9udFZhcmlhbnRDYXBzLCByZXN1bHQsIGNvbW1vblZhbHVlKTsKKyAgICBhcHBlbmRGb250
TG9uZ2hhbmRWYWx1ZUlmRXhwbGljaXQoQ1NTUHJvcGVydHlGb250VmFyaWFudEVhc3RBc2lhbiwg
cmVzdWx0LCBjb21tb25WYWx1ZSk7CisgICAgYXBwZW5kRm9udExvbmdoYW5kVmFsdWVJZkV4cGxp
Y2l0KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRQb3NpdGlvbiwgcmVzdWx0LCBjb21tb25WYWx1ZSk7
CisgICAgcmV0dXJuIHJlc3VsdC50b1N0cmluZygpOworfQorCiBTdHJpbmcgU3R5bGVQcm9wZXJ0
aWVzOjpnZXQyVmFsdWVzKGNvbnN0IFN0eWxlUHJvcGVydHlTaG9ydGhhbmQmIHNob3J0aGFuZCkg
Y29uc3QKIHsKICAgICAvLyBBc3N1bWUgdGhlIHByb3BlcnRpZXMgYXJlIGluIHRoZSB1c3VhbCBv
cmRlciBzdGFydCwgZW5kLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJv
cGVydGllcy5oIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVydGllcy5oCmluZGV4IGIw
MjFhZWI3YzIwMzcwYzlmYzE3YmU1ZmI0YzVmZjZlNDE3ZmI3ZDcuLmRhN2Q5ZjY2ZGYwZTBjODYx
ZGUxZDQ2MmFiYzUwYzhkYWEzMTQ4OWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9T
dHlsZVByb3BlcnRpZXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQcm9wZXJ0aWVz
LmgKQEAgLTE3Miw2ICsxNzIsNyBAQCBwcml2YXRlOgogICAgIFN0cmluZyBnZXQ0VmFsdWVzKGNv
bnN0IFN0eWxlUHJvcGVydHlTaG9ydGhhbmQmKSBjb25zdDsKICAgICBTdHJpbmcgYm9yZGVyU3Bh
Y2luZ1ZhbHVlKGNvbnN0IFN0eWxlUHJvcGVydHlTaG9ydGhhbmQmKSBjb25zdDsKICAgICBTdHJp
bmcgZm9udFZhbHVlKCkgY29uc3Q7CisgICAgU3RyaW5nIGZvbnRWYXJpYW50VmFsdWUoKSBjb25z
dDsKICAgICB2b2lkIGFwcGVuZEZvbnRMb25naGFuZFZhbHVlSWZFeHBsaWNpdChDU1NQcm9wZXJ0
eUlELCBTdHJpbmdCdWlsZGVyJiByZXN1bHQsIFN0cmluZyYgdmFsdWUpIGNvbnN0OwogCiAgICAg
ZnJpZW5kIGNsYXNzIFByb3BlcnR5U2V0Q1NTU3R5bGVEZWNsYXJhdGlvbjsKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwIGIvU291cmNl
L1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHAKaW5kZXggNjg0NTIzNzg2
OTMyNjA4NmNiY2FlMGVkOTRkYmMzYTU2ZGViNTJmNS4uMzAzOTJjYjRmODVkY2JkYzJiNDRhNTY1
YTdiOTdlZDcxYTViMzBiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9D
U1NQcm9wZXJ0eVBhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQ
cm9wZXJ0eVBhcnNlci5jcHAKQEAgLTY5OCw2ICs2OTgsOSBAQCBzdGF0aWMgUmVmUHRyPENTU1Zh
bHVlPiBjb25zdW1lRm9udFZhcmlhbnRFYXN0QXNpYW4oQ1NTUGFyc2VyVG9rZW5SYW5nZSYgcmFu
Z2UpCiAgICAgd2hpbGUgKCFyYW5nZS5hdEVuZCgpKSB7CiAgICAgICAgIGlmIChyYW5nZS5wZWVr
KCkudHlwZSgpICE9IElkZW50VG9rZW4pCiAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKwor
ICAgICAgICBpZiAodmFyaWFudCAhPSBGb250VmFyaWFudEVhc3RBc2lhblZhcmlhbnQ6Ok5vcm1h
bCB8fCB3aWR0aCAhPSBGb250VmFyaWFudEVhc3RBc2lhbldpZHRoOjpOb3JtYWwgfHwgcnVieSAh
PSBGb250VmFyaWFudEVhc3RBc2lhblJ1Ynk6Ok5vcm1hbCkKKyAgICAgICAgICAgIHJldHVybiBu
dWxscHRyOwogICAgICAgICAKICAgICAgICAgYXV0byBpZCA9IHJhbmdlLnBlZWsoKS5pZCgpOwog
ICAgICAgICAKQEAgLTQ5NDEsOSArNDk0NCw5IEBAIGJvb2wgQ1NTUHJvcGVydHlQYXJzZXI6OmNv
bnN1bWVGb250VmFyaWFudFNob3J0aGFuZChib29sIGltcG9ydGFudCkKIHsKICAgICBpZiAoaWRl
bnRNYXRjaGVzPENTU1ZhbHVlTm9ybWFsLCBDU1NWYWx1ZU5vbmU+KG1fcmFuZ2UucGVlaygpLmlk
KCkpKSB7CiAgICAgICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRMaWdhdHVy
ZXMsIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIGNvbnN1bWVJZGVudChtX3JhbmdlKS5yZWxlYXNl
Tm9uTnVsbCgpLCBpbXBvcnRhbnQpOwotICAgICAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZv
bnRWYXJpYW50Q2FwcywgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgQ1NTVmFsdWVQb29sOjpzaW5n
bGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwpLCBpbXBvcnRhbnQp
OwotICAgICAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50RWFzdEFzaWFuLCBD
U1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlk
ZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCk7Ci0gICAgICAgIGFkZFBy
b3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRQb3NpdGlvbiwgQ1NTUHJvcGVydHlGb250VmFy
aWFudCwgQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NT
VmFsdWVOb3JtYWwpLCBpbXBvcnRhbnQpOworICAgICAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0
eUZvbnRWYXJpYW50Q2FwcywgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgQ1NTVmFsdWVQb29sOjpz
aW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwpLCBpbXBvcnRh
bnQsIHRydWUpOworICAgICAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50RWFz
dEFzaWFuLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigp
LmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCwgdHJ1ZSk7
CisgICAgICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRQb3NpdGlvbiwgQ1NT
UHJvcGVydHlGb250VmFyaWFudCwgQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVu
dGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwpLCBpbXBvcnRhbnQsIHRydWUpOwogICAgICAgICBy
ZXR1cm4gbV9yYW5nZS5hdEVuZCgpOwogICAgIH0KIApAQCAtNDk1NCw2ICs0OTU3LDggQEAgYm9v
bCBDU1NQcm9wZXJ0eVBhcnNlcjo6Y29uc3VtZUZvbnRWYXJpYW50U2hvcnRoYW5kKGJvb2wgaW1w
b3J0YW50KQogICAgIFJlZlB0cjxDU1NWYWx1ZT4gZWFzdEFzaWFuVmFsdWU7CiAgICAgRm9udFZh
cmlhbnRMaWdhdHVyZXNQYXJzZXIgbGlnYXR1cmVzUGFyc2VyOwogICAgIEZvbnRWYXJpYW50TnVt
ZXJpY1BhcnNlciBudW1lcmljUGFyc2VyOworICAgIGJvb2wgaW1wbGljaXRMaWdhdHVyZXMgPSB0
cnVlOworICAgIGJvb2wgaW1wbGljaXROdW1lcmljID0gdHJ1ZTsKICAgICBkbyB7CiAgICAgICAg
IGlmICghY2Fwc1ZhbHVlKSB7CiAgICAgICAgICAgICBjYXBzVmFsdWUgPSBjb25zdW1lRm9udFZh
cmlhbnRDYXBzKG1fcmFuZ2UpOwpAQCAtNDk3NSw5ICs0OTgwLDE0IEBAIGJvb2wgQ1NTUHJvcGVy
dHlQYXJzZXI6OmNvbnN1bWVGb250VmFyaWFudFNob3J0aGFuZChib29sIGltcG9ydGFudCkKIAog
ICAgICAgICBGb250VmFyaWFudExpZ2F0dXJlc1BhcnNlcjo6UGFyc2VSZXN1bHQgbGlnYXR1cmVz
UGFyc2VSZXN1bHQgPSBsaWdhdHVyZXNQYXJzZXIuY29uc3VtZUxpZ2F0dXJlKG1fcmFuZ2UpOwog
ICAgICAgICBGb250VmFyaWFudE51bWVyaWNQYXJzZXI6OlBhcnNlUmVzdWx0IG51bWVyaWNQYXJz
ZVJlc3VsdCA9IG51bWVyaWNQYXJzZXIuY29uc3VtZU51bWVyaWMobV9yYW5nZSk7Ci0gICAgICAg
IGlmIChsaWdhdHVyZXNQYXJzZVJlc3VsdCA9PSBGb250VmFyaWFudExpZ2F0dXJlc1BhcnNlcjo6
UGFyc2VSZXN1bHQ6OkNvbnN1bWVkVmFsdWUKLSAgICAgICAgICAgIHx8IG51bWVyaWNQYXJzZVJl
c3VsdCA9PSBGb250VmFyaWFudE51bWVyaWNQYXJzZXI6OlBhcnNlUmVzdWx0OjpDb25zdW1lZFZh
bHVlKQorICAgICAgICBpZiAobGlnYXR1cmVzUGFyc2VSZXN1bHQgPT0gRm9udFZhcmlhbnRMaWdh
dHVyZXNQYXJzZXI6OlBhcnNlUmVzdWx0OjpDb25zdW1lZFZhbHVlKSB7CisgICAgICAgICAgICBp
bXBsaWNpdExpZ2F0dXJlcyA9IGZhbHNlOwogICAgICAgICAgICAgY29udGludWU7CisgICAgICAg
IH0KKyAgICAgICAgaWYgKG51bWVyaWNQYXJzZVJlc3VsdCA9PSBGb250VmFyaWFudE51bWVyaWNQ
YXJzZXI6OlBhcnNlUmVzdWx0OjpDb25zdW1lZFZhbHVlKSB7CisgICAgICAgICAgICBpbXBsaWNp
dE51bWVyaWMgPSBmYWxzZTsKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CiAKICAg
ICAgICAgaWYgKGxpZ2F0dXJlc1BhcnNlUmVzdWx0ID09IEZvbnRWYXJpYW50TGlnYXR1cmVzUGFy
c2VyOjpQYXJzZVJlc3VsdDo6RGlzYWxsb3dlZFZhbHVlCiAgICAgICAgICAgICB8fCBudW1lcmlj
UGFyc2VSZXN1bHQgPT0gRm9udFZhcmlhbnROdW1lcmljUGFyc2VyOjpQYXJzZVJlc3VsdDo6RGlz
YWxsb3dlZFZhbHVlKQpAQCAtNDk4Niw3ICs0OTk2LDcgQEAgYm9vbCBDU1NQcm9wZXJ0eVBhcnNl
cjo6Y29uc3VtZUZvbnRWYXJpYW50U2hvcnRoYW5kKGJvb2wgaW1wb3J0YW50KQogICAgICAgICBp
ZiAoIWVhc3RBc2lhblZhbHVlKSB7CiAgICAgICAgICAgICBlYXN0QXNpYW5WYWx1ZSA9IGNvbnN1
bWVGb250VmFyaWFudEVhc3RBc2lhbihtX3JhbmdlKTsKICAgICAgICAgICAgIGlmIChlYXN0QXNp
YW5WYWx1ZSkKLSAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgICAgIGNvbnRpbnVl
OwogICAgICAgICB9CiAKICAgICAgICAgLy8gU2F3IHNvbWUgdmFsdWUgdGhhdCBkaWRuJ3QgbWF0
Y2ggYW55dGhpbmcgZWxzZS4KQEAgLTQ5OTQsMTUgKzUwMDQsMTkgQEAgYm9vbCBDU1NQcm9wZXJ0
eVBhcnNlcjo6Y29uc3VtZUZvbnRWYXJpYW50U2hvcnRoYW5kKGJvb2wgaW1wb3J0YW50KQogCiAg
ICAgfSB3aGlsZSAoIW1fcmFuZ2UuYXRFbmQoKSk7CiAKLSAgICBhZGRQcm9wZXJ0eShDU1NQcm9w
ZXJ0eUZvbnRWYXJpYW50TGlnYXR1cmVzLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBsaWdhdHVy
ZXNQYXJzZXIuZmluYWxpemVWYWx1ZSgpLnJlbGVhc2VOb25OdWxsKCksIGltcG9ydGFudCk7Ci0g
ICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlGb250VmFyaWFudE51bWVyaWMsIENTU1Byb3BlcnR5
Rm9udFZhcmlhbnQsIG51bWVyaWNQYXJzZXIuZmluYWxpemVWYWx1ZSgpLnJlbGVhc2VOb25OdWxs
KCksIGltcG9ydGFudCk7Ci0gICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlGb250VmFyaWFudENh
cHMsIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIGNhcHNWYWx1ZSA/IGNhcHNWYWx1ZS5yZWxlYXNl
Tm9uTnVsbCgpIDogQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFs
dWUoQ1NTVmFsdWVOb3JtYWwpLCBpbXBvcnRhbnQpOwotICAgIGFkZFByb3BlcnR5KENTU1Byb3Bl
cnR5Rm9udFZhcmlhbnRBbHRlcm5hdGVzLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBhbHRlcm5h
dGVzVmFsdWUgPyBhbHRlcm5hdGVzVmFsdWUucmVsZWFzZU5vbk51bGwoKSA6IENTU1ZhbHVlUG9v
bDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlTm9ybWFsKSwgaW1w
b3J0YW50KTsKLSAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50UG9zaXRpb24s
IENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIHBvc2l0aW9uVmFsdWUgPyBwb3NpdGlvblZhbHVlLnJl
bGVhc2VOb25OdWxsKCkgOiBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZp
ZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCk7Ci0gICAgCisgICAgYWRkUHJvcGVy
dHkoQ1NTUHJvcGVydHlGb250VmFyaWFudExpZ2F0dXJlcywgQ1NTUHJvcGVydHlGb250VmFyaWFu
dCwgbGlnYXR1cmVzUGFyc2VyLmZpbmFsaXplVmFsdWUoKS5yZWxlYXNlTm9uTnVsbCgpLCBpbXBv
cnRhbnQsIGltcGxpY2l0TGlnYXR1cmVzKTsKKyAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZv
bnRWYXJpYW50TnVtZXJpYywgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgbnVtZXJpY1BhcnNlci5m
aW5hbGl6ZVZhbHVlKCkucmVsZWFzZU5vbk51bGwoKSwgaW1wb3J0YW50LCBpbXBsaWNpdE51bWVy
aWMpOworICAgIGJvb2wgaW1wbGljaXRDYXBzID0gIWNhcHNWYWx1ZTsKKyAgICBhZGRQcm9wZXJ0
eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50Q2FwcywgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgY2Fw
c1ZhbHVlID8gY2Fwc1ZhbHVlLnJlbGVhc2VOb25OdWxsKCkgOiBDU1NWYWx1ZVBvb2w6OnNpbmds
ZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCwg
aW1wbGljaXRDYXBzKTsKKyAgICBib29sIGltcGxpY2l0QWx0ZXJuYXRlcyA9IGFsdGVybmF0ZXNW
YWx1ZTsKKyAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50QWx0ZXJuYXRlcywg
Q1NTUHJvcGVydHlGb250VmFyaWFudCwgYWx0ZXJuYXRlc1ZhbHVlID8gYWx0ZXJuYXRlc1ZhbHVl
LnJlbGVhc2VOb25OdWxsKCkgOiBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50
aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCwgaW1wbGljaXRBbHRlcm5hdGVz
KTsKKyAgICBib29sIGltcGxpY2l0UG9zaXRpb24gPSAhcG9zaXRpb25WYWx1ZTsKKyAgICBhZGRQ
cm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50UG9zaXRpb24sIENTU1Byb3BlcnR5Rm9udFZh
cmlhbnQsIHBvc2l0aW9uVmFsdWUgPyBwb3NpdGlvblZhbHVlLnJlbGVhc2VOb25OdWxsKCkgOiBD
U1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5v
cm1hbCksIGltcG9ydGFudCwgaW1wbGljaXRQb3NpdGlvbik7CisKKyAgICBib29sIGltcGxpY2l0
RWFzdEFzaWFuID0gIWVhc3RBc2lhblZhbHVlOwogICAgIGlmICghZWFzdEFzaWFuVmFsdWUpCiAg
ICAgICAgIGVhc3RBc2lhblZhbHVlID0gQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJ
ZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwpOwotICAgIGFkZFByb3BlcnR5KENTU1Byb3Bl
cnR5Rm9udFZhcmlhbnRFYXN0QXNpYW4sIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIGVhc3RBc2lh
blZhbHVlLnJlbGVhc2VOb25OdWxsKCksIGltcG9ydGFudCk7CisgICAgYWRkUHJvcGVydHkoQ1NT
UHJvcGVydHlGb250VmFyaWFudEVhc3RBc2lhbiwgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgZWFz
dEFzaWFuVmFsdWUucmVsZWFzZU5vbk51bGwoKSwgaW1wb3J0YW50LCBpbXBsaWNpdEVhc3RBc2lh
bik7CiAgICAgCiAgICAgcmV0dXJuIHRydWU7CiB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9p
bXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxv
ZwppbmRleCBhYzJmNTRjMTliYjRmY2VjMmE1NzkwMGNlZGM0NTI2OWQ3YjJlZjU3Li5iNDhmZTU5
NzUwZjI2ZjRhZjhmNmY4ZmIxMWE1ZDliMzVlYmYxZGY5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0
cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9D
aGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wNi0wOCAgUm9iIEJ1aXMgIDxyYnVpc0Bp
Z2FsaWEuY29tPgorCisgICAgICAgIENTU09NIHRlc3QgZm9yIHNlcmlhbGl6aW5nIGZvbnQtdmFy
aWFudCBmYWlscworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjI2NzcwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgVXBkYXRlIGltcHJvdmVkIHRlc3QgcmVzdWx0LgorCisgICAgICAgICogd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3NvbS9zZXJpYWxpemUtdmFsdWVzLWV4cGVjdGVkLnR4dDoKKwogMjAyMS0w
Ni0wNiAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgSGFuZGxlIGN1
c3RvbSBpZGVudGlmaWVycyBhbmQgc3RyaW5ncyBzZXBhcmF0ZWx5LCBzbyB3ZSBjYW4gcXVvdGUg
c3RyaW5ncyBjb3JyZWN0bHkgY29uc2lzdGVudGx5CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9p
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZm9udHMvcGFyc2luZy9mb250
LXZhcmlhbnQtdmFsaWQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZvbnRzL3BhcnNpbmcvZm9udC12YXJpYW50LXZhbGlk
LWV4cGVjdGVkLnR4dAppbmRleCBmYzBiYTI2MGIwMWY5MTIyYjhiMDFlZmQ0ZmRkY2Y0OThlNjFk
MmMzLi5lODkxMmQ2NjNkNzVkMGY5MDQ5NTczZTJmOWRiY2U5YWNjNDExNmVlIDEwMDY0NAotLS0g
YS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZm9u
dHMvcGFyc2luZy9mb250LXZhcmlhbnQtdmFsaWQtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRl
c3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mb250cy9wYXJzaW5n
L2ZvbnQtdmFyaWFudC12YWxpZC1leHBlY3RlZC50eHQKQEAgLTEsMjAgKzEsMjAgQEAKIAotRkFJ
TCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJub3JtYWwiIHNob3VsZCBzZXQgdGhlIHByb3Bl
cnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBk
aXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gIm5vbmUi
IHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0
eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2Zv
bnQtdmFyaWFudCddID0gImNvbW1vbi1saWdhdHVyZXMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5
IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNh
bGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gIm5vLWNvbW1v
bi1saWdhdHVyZXMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1
YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlM
IGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImRpc2NyZXRpb25hcnktbGlnYXR1cmVzIiBzaG91
bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hv
dWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZh
cmlhbnQnXSA9ICJuby1kaXNjcmV0aW9uYXJ5LWxpZ2F0dXJlcyIgc2hvdWxkIHNldCB0aGUgcHJv
cGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290
IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiaGlz
dG9yaWNhbC1saWdhdHVyZXMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9u
b3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIi
Ci1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gIm5vLWhpc3RvcmljYWwtbGlnYXR1cmVz
IiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVy
dHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydm
b250LXZhcmlhbnQnXSA9ICJjb250ZXh0dWFsIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1
ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dl
ZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJuby1jb250ZXh0dWFs
IiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVy
dHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydm
b250LXZhcmlhbnQnXSA9ICJzbWFsbC1jYXBzIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1
ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dl
ZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJhbGwtc21hbGwtY2Fw
cyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3Bl
cnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsn
Zm9udC12YXJpYW50J10gPSAicGV0aXRlLWNhcHMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZh
bHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxv
d2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImFsbC1wZXRpdGUt
Y2FwcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHBy
b3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHls
ZVsnZm9udC12YXJpYW50J10gPSAidW5pY2FzZSIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFs
dWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93
ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAidGl0bGluZy1jYXBz
IiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVy
dHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgorUEFTUyBlLnN0eWxlWydm
b250LXZhcmlhbnQnXSA9ICJub3JtYWwiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQ
QVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gIm5vbmUiIHNob3VsZCBzZXQgdGhlIHByb3Bl
cnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImNvbW1vbi1saWdhdHVy
ZXMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFy
aWFudCddID0gIm5vLWNvbW1vbi1saWdhdHVyZXMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZh
bHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImRpc2NyZXRpb25hcnktbGlnYXR1
cmVzIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZh
cmlhbnQnXSA9ICJuby1kaXNjcmV0aW9uYXJ5LWxpZ2F0dXJlcyIgc2hvdWxkIHNldCB0aGUgcHJv
cGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiaGlzdG9yaWNhbC1s
aWdhdHVyZXMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2Zv
bnQtdmFyaWFudCddID0gIm5vLWhpc3RvcmljYWwtbGlnYXR1cmVzIiBzaG91bGQgc2V0IHRoZSBw
cm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJjb250ZXh0dWFs
IiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlh
bnQnXSA9ICJuby1jb250ZXh0dWFsIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFT
UyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJzbWFsbC1jYXBzIiBzaG91bGQgc2V0IHRoZSBw
cm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJhbGwtc21hbGwt
Y2FwcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9udC12
YXJpYW50J10gPSAicGV0aXRlLWNhcHMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQ
QVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImFsbC1wZXRpdGUtY2FwcyIgc2hvdWxkIHNl
dCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAidW5p
Y2FzZSIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9udC12
YXJpYW50J10gPSAidGl0bGluZy1jYXBzIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQog
RkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJzdHlsaXN0aWMoZmxvd2luZykiIHNob3Vs
ZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91
bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCiBGQUlMIGUuc3R5bGVbJ2ZvbnQtdmFy
aWFudCddID0gImhpc3RvcmljYWwtZm9ybXMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVl
IGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2Vk
IHZhbHVlICIiCiBGQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInN0eWxlc2V0KGZsb3dp
bmcpIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJv
cGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgpAQCAtMzIsMTcgKzMy
LDE3IEBAIEZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiZGlhZ29uYWwtZnJhY3Rpb25z
IiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1CiBGQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFu
dCddID0gInN0YWNrZWQtZnJhY3Rpb25zIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBh
c3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2
YWx1ZSAiIgogRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJvcmRpbmFsIiBzaG91bGQg
c2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxk
IGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgogRkFJTCBlLnN0eWxlWydmb250LXZhcmlh
bnQnXSA9ICJzbGFzaGVkLXplcm8iIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2Vy
dF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVl
ICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImppczc4IiBzaG91bGQgc2V0IHRo
ZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNl
dCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9
ICJqaXM4MyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6
IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5z
dHlsZVsnZm9udC12YXJpYW50J10gPSAiamlzOTAiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZh
bHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxv
d2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImppczA0IiBzaG91
bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hv
dWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZh
cmlhbnQnXSA9ICJzaW1wbGlmaWVkIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3Nl
cnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1
ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJ0cmFkaXRpb25hbCIgc2hvdWxk
IHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3Vs
ZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJp
YW50J10gPSAiZnVsbC13aWR0aCIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0
X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUg
IiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAicHJvcG9ydGlvbmFsLXdpZHRoIiBz
aG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkg
c2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydmb250
LXZhcmlhbnQnXSA9ICJydWJ5IiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRf
bm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAi
IgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJzdWIiIHNob3VsZCBzZXQgdGhlIHBy
b3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdv
dCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInN1
cGVyIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJv
cGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgorUEFTUyBlLnN0eWxl
Wydmb250LXZhcmlhbnQnXSA9ICJqaXM3OCIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUK
K1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiamlzODMiIHNob3VsZCBzZXQgdGhlIHBy
b3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImppczkwIiBzaG91
bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9
ICJqaXMwNCIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9u
dC12YXJpYW50J10gPSAic2ltcGxpZmllZCIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUK
K1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAidHJhZGl0aW9uYWwiIHNob3VsZCBzZXQg
dGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImZ1bGwt
d2lkdGgiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQt
dmFyaWFudCddID0gInByb3BvcnRpb25hbC13aWR0aCIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkg
dmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAicnVieSIgc2hvdWxkIHNldCB0
aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAic3ViIiBz
aG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQn
XSA9ICJzdXBlciIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUKIEZBSUwgZS5zdHlsZVsn
Zm9udC12YXJpYW50J10gPSAiY29tbW9uLWxpZ2F0dXJlcyBkaXNjcmV0aW9uYXJ5LWxpZ2F0dXJl
cyBoaXN0b3JpY2FsLWxpZ2F0dXJlcyBjb250ZXh0dWFsIHNtYWxsLWNhcHMgc3R5bGlzdGljKGZs
b3dpbmcpIGxpbmluZy1udW1zIHByb3BvcnRpb25hbC1udW1zIGRpYWdvbmFsLWZyYWN0aW9ucyBv
cmRpbmFsIHNsYXNoZWQtemVybyBqaXM3OCBmdWxsLXdpZHRoIHJ1Ynkgc3ViIiBzaG91bGQgc2V0
IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJl
IHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgogRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQn
XSA9ICJzdXBlciBwcm9wb3J0aW9uYWwtd2lkdGggamlzODMgc3RhY2tlZC1mcmFjdGlvbnMgdGFi
dWxhci1udW1zIG9sZHN0eWxlLW51bXMgaGlzdG9yaWNhbC1mb3JtcyBhbGwtc21hbGwtY2FwcyBu
by1jb250ZXh0dWFsIG5vLWhpc3RvcmljYWwtbGlnYXR1cmVzIG5vLWRpc2NyZXRpb25hcnktbGln
YXR1cmVzIG5vLWNvbW1vbi1saWdhdHVyZXMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVl
IGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2Vk
IHZhbHVlICIiCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzc29tL3NlcmlhbGl6ZS12YWx1ZXMtZXhwZWN0ZWQudHh0IGIvTGF5
b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nzb20vc2VyaWFs
aXplLXZhbHVlcy1leHBlY3RlZC50eHQKaW5kZXggZWIzMDhlZTMxMTMyM2Y1ZjBkNWFjZWU0YmJj
NGZkNjFlZWU0MzUyMy4uMDNmYThmN2JlM2NkZjlkZjE4MzI2NzM3NGQ2N2Y4OWUzMTg4YjZhNCAx
MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3Nzb20vc2VyaWFsaXplLXZhbHVlcy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMv
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nzb20vc2VyaWFsaXplLXZhbHVl
cy1leHBlY3RlZC50eHQKQEAgLTM5Myw5ICszOTMsOSBAQCBQQVNTIGZvbnQtc3R5bGU6IG5vcm1h
bAogUEFTUyBmb250LXN0eWxlOiBpdGFsaWMKIFBBU1MgZm9udC1zdHlsZTogb2JsaXF1ZQogUEFT
UyBmb250LXN0eWxlOiBpbmhlcml0Ci1GQUlMIGZvbnQtdmFyaWFudDogbm9ybWFsIGFzc2VydF9l
cXVhbHM6IGZvbnQtdmFyaWFudCByYXcgaW5saW5lIHN0eWxlIGRlY2xhcmF0aW9uIGV4cGVjdGVk
ICJub3JtYWwiIGJ1dCBnb3QgIiIKLUZBSUwgZm9udC12YXJpYW50OiBzbWFsbC1jYXBzIGFzc2Vy
dF9lcXVhbHM6IGZvbnQtdmFyaWFudCByYXcgaW5saW5lIHN0eWxlIGRlY2xhcmF0aW9uIGV4cGVj
dGVkICJzbWFsbC1jYXBzIiBidXQgZ290ICIiCi1GQUlMIGZvbnQtdmFyaWFudDogaW5oZXJpdCBh
c3NlcnRfZXF1YWxzOiBmb250LXZhcmlhbnQgcmF3IGlubGluZSBzdHlsZSBkZWNsYXJhdGlvbiBl
eHBlY3RlZCAiaW5oZXJpdCIgYnV0IGdvdCAiIgorUEFTUyBmb250LXZhcmlhbnQ6IG5vcm1hbAor
UEFTUyBmb250LXZhcmlhbnQ6IHNtYWxsLWNhcHMKK1BBU1MgZm9udC12YXJpYW50OiBpbmhlcml0
CiBQQVNTIGZvbnQtd2VpZ2h0OiBub3JtYWwKIFBBU1MgZm9udC13ZWlnaHQ6IGJvbGQKIFBBU1Mg
Zm9udC13ZWlnaHQ6IGJvbGRlcgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>430882</attachid>
            <date>2021-06-08 13:18:49 -0700</date>
            <delta_ts>2021-06-18 13:09:02 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-226770-20210608221847.patch</filename>
            <type>text/plain</type>
            <size>25429</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2YzOGEzNTBkOTdlODM0
OWJmZGM1YWVjMjgxYWI4YmFjNjQ1YTU0ZS4uNmY0NWVhY2VlNDUyMDVlMjU2MjI4ZjM2Mzk3YzE1
NDYzZjdlYTNmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTA2LTA4ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ1NTT00gdGVzdCBmb3Igc2VyaWFs
aXppbmcgZm9udC12YXJpYW50IGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD0yMjY3NzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P
UFMhKS4KKworICAgICAgICBXSVAuCisKKyAgICAgICAgKiBjc3MvU3R5bGVQcm9wZXJ0aWVzLmNw
cDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUHJvcGVydGllczo6Z2V0UHJvcGVydHlWYWx1ZSBj
b25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVByb3BlcnRpZXM6OmFwcGVuZEZvbnRMb25n
aGFuZFZhbHVlSWZFeHBsaWNpdCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVByb3Bl
cnRpZXM6OmZvbnRWYXJpYW50VmFsdWUgY29uc3QpOgorICAgICAgICAqIGNzcy9TdHlsZVByb3Bl
cnRpZXMuaDoKKyAgICAgICAgKiBjc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VyLmNwcDoKKyAg
ICAgICAgKFdlYkNvcmU6OkNTU1Byb3BlcnR5UGFyc2VyOjpjb25zdW1lRm9udFZhcmlhbnRTaG9y
dGhhbmQpOgorCiAyMDIxLTA2LTA3ICBBbGljaWEgQm95YSBHYXJjw61hICA8YWJveWFAaWdhbGlh
LmNvbT4KIAogICAgICAgICBbR1N0cmVhbWVyXSBBZGQgY2xhbmcgVFNBIGFubm90YXRpb25zOiBN
YWluVGhyZWFkTm90aWZpZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVBy
b3BlcnRpZXMuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVydGllcy5jcHAKaW5k
ZXggNmY2Y2U0MWQ5NzFmYTI0MTUxNWYwYmNlNDRlZTVmODBmNDNiZGFkYS4uNDlmYWU1ZjEzM2U2
ZTZmYTQxNzdjOGY2NTgyNzVlODY1MDdlYTlmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv
Y3NzL1N0eWxlUHJvcGVydGllcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJv
cGVydGllcy5jcHAKQEAgLTIzNyw2ICsyMzcsOCBAQCBTdHJpbmcgU3R5bGVQcm9wZXJ0aWVzOjpn
ZXRQcm9wZXJ0eVZhbHVlKENTU1Byb3BlcnR5SUQgcHJvcGVydHlJRCkgY29uc3QKICAgICAgICAg
cmV0dXJuIGdldEFsaWdubWVudFNob3J0aGFuZFZhbHVlKHBsYWNlU2VsZlNob3J0aGFuZCgpKTsK
ICAgICBjYXNlIENTU1Byb3BlcnR5Rm9udDoKICAgICAgICAgcmV0dXJuIGZvbnRWYWx1ZSgpOwor
ICAgIGNhc2UgQ1NTUHJvcGVydHlGb250VmFyaWFudDoKKyAgICAgICAgcmV0dXJuIGZvbnRWYXJp
YW50VmFsdWUoKTsKICAgICBjYXNlIENTU1Byb3BlcnR5SW5zZXQ6CiAgICAgICAgIHJldHVybiBn
ZXQ0VmFsdWVzKGluc2V0U2hvcnRoYW5kKCkpOwogICAgIGNhc2UgQ1NTUHJvcGVydHlJbnNldEJs
b2NrOgpAQCAtMzYzLDYgKzM2NSw5IEBAIHZvaWQgU3R5bGVQcm9wZXJ0aWVzOjphcHBlbmRGb250
TG9uZ2hhbmRWYWx1ZUlmRXhwbGljaXQoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlECiAgICAgICAg
IGJyZWFrOyAvLyBObyBwcmVmaXguCiAgICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRGYW1pbHk6CiAg
ICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50Q2FwczoKKyAgICBjYXNlIENTU1Byb3BlcnR5
Rm9udFZhcmlhbnRMaWdhdHVyZXM6CisgICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50TnVt
ZXJpYzoKKyAgICBjYXNlIENTU1Byb3BlcnR5Rm9udFZhcmlhbnRFYXN0QXNpYW46CiAgICAgY2Fz
ZSBDU1NQcm9wZXJ0eUZvbnRXZWlnaHQ6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRTdHJldGNo
OgogICAgICAgICBwcmVmaXggPSAnICc7CkBAIC00MTIsNiArNDE3LDE5IEBAIFN0cmluZyBTdHls
ZVByb3BlcnRpZXM6OmZvbnRWYWx1ZSgpIGNvbnN0CiAgICAgcmV0dXJuIHJlc3VsdC50b1N0cmlu
ZygpOwogfQogCitTdHJpbmcgU3R5bGVQcm9wZXJ0aWVzOjpmb250VmFyaWFudFZhbHVlKCkgY29u
c3QKK3sKKyAgICBTdHJpbmcgY29tbW9uVmFsdWU7CisgICAgU3RyaW5nQnVpbGRlciByZXN1bHQ7
CisgICAgYXBwZW5kRm9udExvbmdoYW5kVmFsdWVJZkV4cGxpY2l0KENTU1Byb3BlcnR5Rm9udFZh
cmlhbnRMaWdhdHVyZXMsIHJlc3VsdCwgY29tbW9uVmFsdWUpOworICAgIGlmIChpc0NTU1dpZGVW
YWx1ZUtleXdvcmQocmVzdWx0LnRvU3RyaW5nKCkpKQorICAgICAgICByZXR1cm4gcmVzdWx0LnRv
U3RyaW5nKCk7CisgICAgYXBwZW5kRm9udExvbmdoYW5kVmFsdWVJZkV4cGxpY2l0KENTU1Byb3Bl
cnR5Rm9udFZhcmlhbnRDYXBzLCByZXN1bHQsIGNvbW1vblZhbHVlKTsKKyAgICBhcHBlbmRGb250
TG9uZ2hhbmRWYWx1ZUlmRXhwbGljaXQoQ1NTUHJvcGVydHlGb250VmFyaWFudEVhc3RBc2lhbiwg
cmVzdWx0LCBjb21tb25WYWx1ZSk7CisgICAgYXBwZW5kRm9udExvbmdoYW5kVmFsdWVJZkV4cGxp
Y2l0KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRQb3NpdGlvbiwgcmVzdWx0LCBjb21tb25WYWx1ZSk7
CisgICAgcmV0dXJuIHJlc3VsdC50b1N0cmluZygpOworfQorCiBTdHJpbmcgU3R5bGVQcm9wZXJ0
aWVzOjpnZXQyVmFsdWVzKGNvbnN0IFN0eWxlUHJvcGVydHlTaG9ydGhhbmQmIHNob3J0aGFuZCkg
Y29uc3QKIHsKICAgICAvLyBBc3N1bWUgdGhlIHByb3BlcnRpZXMgYXJlIGluIHRoZSB1c3VhbCBv
cmRlciBzdGFydCwgZW5kLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJv
cGVydGllcy5oIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVydGllcy5oCmluZGV4IGIw
MjFhZWI3YzIwMzcwYzlmYzE3YmU1ZmI0YzVmZjZlNDE3ZmI3ZDcuLmRhN2Q5ZjY2ZGYwZTBjODYx
ZGUxZDQ2MmFiYzUwYzhkYWEzMTQ4OWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9T
dHlsZVByb3BlcnRpZXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQcm9wZXJ0aWVz
LmgKQEAgLTE3Miw2ICsxNzIsNyBAQCBwcml2YXRlOgogICAgIFN0cmluZyBnZXQ0VmFsdWVzKGNv
bnN0IFN0eWxlUHJvcGVydHlTaG9ydGhhbmQmKSBjb25zdDsKICAgICBTdHJpbmcgYm9yZGVyU3Bh
Y2luZ1ZhbHVlKGNvbnN0IFN0eWxlUHJvcGVydHlTaG9ydGhhbmQmKSBjb25zdDsKICAgICBTdHJp
bmcgZm9udFZhbHVlKCkgY29uc3Q7CisgICAgU3RyaW5nIGZvbnRWYXJpYW50VmFsdWUoKSBjb25z
dDsKICAgICB2b2lkIGFwcGVuZEZvbnRMb25naGFuZFZhbHVlSWZFeHBsaWNpdChDU1NQcm9wZXJ0
eUlELCBTdHJpbmdCdWlsZGVyJiByZXN1bHQsIFN0cmluZyYgdmFsdWUpIGNvbnN0OwogCiAgICAg
ZnJpZW5kIGNsYXNzIFByb3BlcnR5U2V0Q1NTU3R5bGVEZWNsYXJhdGlvbjsKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwIGIvU291cmNl
L1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHAKaW5kZXggNjg0NTIzNzg2
OTMyNjA4NmNiY2FlMGVkOTRkYmMzYTU2ZGViNTJmNS4uNzRkOThjZjM5NjdkZGQzMTIzOTUzODNh
NzllNDIzYTcxMWEwYjdmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9D
U1NQcm9wZXJ0eVBhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQ
cm9wZXJ0eVBhcnNlci5jcHAKQEAgLTY5MSw0MiArNjkxLDYwIEBAIHN0YXRpYyBSZWZQdHI8Q1NT
VmFsdWU+IGNvbnN1bWVGb250VmFyaWFudEVhc3RBc2lhbihDU1NQYXJzZXJUb2tlblJhbmdlJiBy
YW5nZSkKICAgICAgICAgcmV0dXJuIGNvbnN1bWVJZGVudChyYW5nZSk7CiAgICAgCiAgICAgUmVm
UHRyPENTU1ZhbHVlTGlzdD4gdmFsdWVzID0gQ1NTVmFsdWVMaXN0OjpjcmVhdGVTcGFjZVNlcGFy
YXRlZCgpOwotICAgIEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudCB2YXJpYW50ID0gRm9udFZh
cmlhbnRFYXN0QXNpYW5WYXJpYW50OjpOb3JtYWw7Ci0gICAgRm9udFZhcmlhbnRFYXN0QXNpYW5X
aWR0aCB3aWR0aCA9IEZvbnRWYXJpYW50RWFzdEFzaWFuV2lkdGg6Ok5vcm1hbDsKLSAgICBGb250
VmFyaWFudEVhc3RBc2lhblJ1YnkgcnVieSA9IEZvbnRWYXJpYW50RWFzdEFzaWFuUnVieTo6Tm9y
bWFsOworICAgIHN0ZDo6b3B0aW9uYWw8Rm9udFZhcmlhbnRFYXN0QXNpYW5WYXJpYW50PiB2YXJp
YW50OworICAgIHN0ZDo6b3B0aW9uYWw8Rm9udFZhcmlhbnRFYXN0QXNpYW5XaWR0aD4gd2lkdGg7
CisgICAgc3RkOjpvcHRpb25hbDxGb250VmFyaWFudEVhc3RBc2lhblJ1Ynk+IHJ1Ynk7CiAgICAg
CiAgICAgd2hpbGUgKCFyYW5nZS5hdEVuZCgpKSB7CiAgICAgICAgIGlmIChyYW5nZS5wZWVrKCku
dHlwZSgpICE9IElkZW50VG9rZW4pCiAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKLSAgICAg
ICAgCisKICAgICAgICAgYXV0byBpZCA9IHJhbmdlLnBlZWsoKS5pZCgpOwogICAgICAgICAKICAg
ICAgICAgc3dpdGNoIChpZCkgewogICAgICAgICBjYXNlIENTU1ZhbHVlSmlzNzg6CisgICAgICAg
ICAgICBpZiAodmFyaWFudCkKKyAgICAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICAg
ICAgICAgIHZhcmlhbnQgPSBGb250VmFyaWFudEVhc3RBc2lhblZhcmlhbnQ6Okppczc4OwogICAg
ICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgQ1NTVmFsdWVKaXM4MzoKKyAgICAgICAgICAg
IGlmICh2YXJpYW50KQorICAgICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgICAgICAg
ICAgdmFyaWFudCA9IEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6SmlzODM7CiAgICAgICAg
ICAgICBicmVhazsKICAgICAgICAgY2FzZSBDU1NWYWx1ZUppczkwOgorICAgICAgICAgICAgaWYg
KHZhcmlhbnQpCisgICAgICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgICAgICAgICB2
YXJpYW50ID0gRm9udFZhcmlhbnRFYXN0QXNpYW5WYXJpYW50OjpKaXM5MDsKICAgICAgICAgICAg
IGJyZWFrOwogICAgICAgICBjYXNlIENTU1ZhbHVlSmlzMDQ6CisgICAgICAgICAgICBpZiAodmFy
aWFudCkKKyAgICAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICAgICAgICAgIHZhcmlh
bnQgPSBGb250VmFyaWFudEVhc3RBc2lhblZhcmlhbnQ6OkppczA0OwogICAgICAgICAgICAgYnJl
YWs7CiAgICAgICAgIGNhc2UgQ1NTVmFsdWVTaW1wbGlmaWVkOgorICAgICAgICAgICAgaWYgKHZh
cmlhbnQpCisgICAgICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgICAgICAgICB2YXJp
YW50ID0gRm9udFZhcmlhbnRFYXN0QXNpYW5WYXJpYW50OjpTaW1wbGlmaWVkOwogICAgICAgICAg
ICAgYnJlYWs7CiAgICAgICAgIGNhc2UgQ1NTVmFsdWVUcmFkaXRpb25hbDoKKyAgICAgICAgICAg
IGlmICh2YXJpYW50KQorICAgICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgICAgICAg
ICAgdmFyaWFudCA9IEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6VHJhZGl0aW9uYWw7CiAg
ICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBDU1NWYWx1ZUZ1bGxXaWR0aDoKKyAgICAg
ICAgICAgIGlmICh3aWR0aCkKKyAgICAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICAg
ICAgICAgIHdpZHRoID0gRm9udFZhcmlhbnRFYXN0QXNpYW5XaWR0aDo6RnVsbDsKICAgICAgICAg
ICAgIGJyZWFrOwogICAgICAgICBjYXNlIENTU1ZhbHVlUHJvcG9ydGlvbmFsV2lkdGg6CisgICAg
ICAgICAgICBpZiAod2lkdGgpCisgICAgICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAg
ICAgICAgICB3aWR0aCA9IEZvbnRWYXJpYW50RWFzdEFzaWFuV2lkdGg6OlByb3BvcnRpb25hbDsK
ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIENTU1ZhbHVlUnVieToKKyAgICAgICAg
ICAgIGlmIChydWJ5KQorICAgICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgICAgICAg
ICAgcnVieSA9IEZvbnRWYXJpYW50RWFzdEFzaWFuUnVieTo6WWVzOwogICAgICAgICAgICAgYnJl
YWs7CiAgICAgICAgIGRlZmF1bHQ6CkBAIC03MzUsNDYgKzc1Myw1MiBAQCBzdGF0aWMgUmVmUHRy
PENTU1ZhbHVlPiBjb25zdW1lRm9udFZhcmlhbnRFYXN0QXNpYW4oQ1NTUGFyc2VyVG9rZW5SYW5n
ZSYgcmFuZ2UpCiAgICAgICAgIAogICAgICAgICByYW5nZS5jb25zdW1lSW5jbHVkaW5nV2hpdGVz
cGFjZSgpOwogICAgIH0KLSAgICAgICAgCi0gICAgc3dpdGNoICh2YXJpYW50KSB7Ci0gICAgY2Fz
ZSBGb250VmFyaWFudEVhc3RBc2lhblZhcmlhbnQ6Ok5vcm1hbDoKLSAgICAgICAgYnJlYWs7Ci0g
ICAgY2FzZSBGb250VmFyaWFudEVhc3RBc2lhblZhcmlhbnQ6Okppczc4OgotICAgICAgICB2YWx1
ZXMtPmFwcGVuZChDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1
ZShDU1NWYWx1ZUppczc4KSk7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgRm9udFZhcmlhbnRF
YXN0QXNpYW5WYXJpYW50OjpKaXM4MzoKLSAgICAgICAgdmFsdWVzLT5hcHBlbmQoQ1NTVmFsdWVQ
b29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVKaXM4MykpOwot
ICAgICAgICBicmVhazsKLSAgICBjYXNlIEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6Smlz
OTA6Ci0gICAgICAgIHZhbHVlcy0+YXBwZW5kKENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3Jl
YXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlSmlzOTApKTsKLSAgICAgICAgYnJlYWs7Ci0gICAg
Y2FzZSBGb250VmFyaWFudEVhc3RBc2lhblZhcmlhbnQ6OkppczA0OgotICAgICAgICB2YWx1ZXMt
PmFwcGVuZChDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShD
U1NWYWx1ZUppczA0KSk7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgRm9udFZhcmlhbnRFYXN0
QXNpYW5WYXJpYW50OjpTaW1wbGlmaWVkOgotICAgICAgICB2YWx1ZXMtPmFwcGVuZChDU1NWYWx1
ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZVNpbXBsaWZp
ZWQpKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBGb250VmFyaWFudEVhc3RBc2lhblZhcmlh
bnQ6OlRyYWRpdGlvbmFsOgotICAgICAgICB2YWx1ZXMtPmFwcGVuZChDU1NWYWx1ZVBvb2w6OnNp
bmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZVRyYWRpdGlvbmFsKSk7Ci0g
ICAgICAgIGJyZWFrOworCisgICAgaWYgKHZhcmlhbnQpIHsKKyAgICAgICAgc3dpdGNoICgqdmFy
aWFudCkgeworICAgICAgICBjYXNlIEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6Tm9ybWFs
OgorICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgRm9udFZhcmlhbnRFYXN0QXNpYW5W
YXJpYW50OjpKaXM3ODoKKyAgICAgICAgICAgIHZhbHVlcy0+YXBwZW5kKENTU1ZhbHVlUG9vbDo6
c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlSmlzNzgpKTsKKyAgICAg
ICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6
SmlzODM6CisgICAgICAgICAgICB2YWx1ZXMtPmFwcGVuZChDU1NWYWx1ZVBvb2w6OnNpbmdsZXRv
bigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZUppczgzKSk7CisgICAgICAgICAgICBi
cmVhazsKKyAgICAgICAgY2FzZSBGb250VmFyaWFudEVhc3RBc2lhblZhcmlhbnQ6OkppczkwOgor
ICAgICAgICAgICAgdmFsdWVzLT5hcHBlbmQoQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVh
dGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVKaXM5MCkpOworICAgICAgICAgICAgYnJlYWs7Cisg
ICAgICAgIGNhc2UgRm9udFZhcmlhbnRFYXN0QXNpYW5WYXJpYW50OjpKaXMwNDoKKyAgICAgICAg
ICAgIHZhbHVlcy0+YXBwZW5kKENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRp
ZmllclZhbHVlKENTU1ZhbHVlSmlzMDQpKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBj
YXNlIEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6U2ltcGxpZmllZDoKKyAgICAgICAgICAg
IHZhbHVlcy0+YXBwZW5kKENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmll
clZhbHVlKENTU1ZhbHVlU2ltcGxpZmllZCkpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAg
IGNhc2UgRm9udFZhcmlhbnRFYXN0QXNpYW5WYXJpYW50OjpUcmFkaXRpb25hbDoKKyAgICAgICAg
ICAgIHZhbHVlcy0+YXBwZW5kKENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRp
ZmllclZhbHVlKENTU1ZhbHVlVHJhZGl0aW9uYWwpKTsKKyAgICAgICAgICAgIGJyZWFrOworICAg
ICAgICB9CiAgICAgfQotICAgICAgICAKLSAgICBzd2l0Y2ggKHdpZHRoKSB7Ci0gICAgY2FzZSBG
b250VmFyaWFudEVhc3RBc2lhbldpZHRoOjpOb3JtYWw6Ci0gICAgICAgIGJyZWFrOwotICAgIGNh
c2UgRm9udFZhcmlhbnRFYXN0QXNpYW5XaWR0aDo6RnVsbDoKLSAgICAgICAgdmFsdWVzLT5hcHBl
bmQoQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFs
dWVGdWxsV2lkdGgpKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBGb250VmFyaWFudEVhc3RB
c2lhbldpZHRoOjpQcm9wb3J0aW9uYWw6Ci0gICAgICAgIHZhbHVlcy0+YXBwZW5kKENTU1ZhbHVl
UG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlUHJvcG9ydGlv
bmFsV2lkdGgpKTsKLSAgICAgICAgYnJlYWs7CisKKyAgICBpZiAod2lkdGgpIHsKKyAgICAgICAg
c3dpdGNoICgqd2lkdGgpIHsKKyAgICAgICAgY2FzZSBGb250VmFyaWFudEVhc3RBc2lhbldpZHRo
OjpOb3JtYWw6CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBGb250VmFyaWFudEVh
c3RBc2lhbldpZHRoOjpGdWxsOgorICAgICAgICAgICAgdmFsdWVzLT5hcHBlbmQoQ1NTVmFsdWVQ
b29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVGdWxsV2lkdGgp
KTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIEZvbnRWYXJpYW50RWFzdEFzaWFu
V2lkdGg6OlByb3BvcnRpb25hbDoKKyAgICAgICAgICAgIHZhbHVlcy0+YXBwZW5kKENTU1ZhbHVl
UG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlUHJvcG9ydGlv
bmFsV2lkdGgpKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CiAgICAgfQogICAgICAg
ICAKLSAgICBzd2l0Y2ggKHJ1YnkpIHsKLSAgICBjYXNlIEZvbnRWYXJpYW50RWFzdEFzaWFuUnVi
eTo6Tm9ybWFsOgotICAgICAgICBicmVhazsKLSAgICBjYXNlIEZvbnRWYXJpYW50RWFzdEFzaWFu
UnVieTo6WWVzOgotICAgICAgICB2YWx1ZXMtPmFwcGVuZChDU1NWYWx1ZVBvb2w6OnNpbmdsZXRv
bigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZVJ1YnkpKTsKKyAgICBpZiAocnVieSkg
eworICAgICAgICBzd2l0Y2ggKCpydWJ5KSB7CisgICAgICAgIGNhc2UgRm9udFZhcmlhbnRFYXN0
QXNpYW5SdWJ5OjpOb3JtYWw6CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBGb250
VmFyaWFudEVhc3RBc2lhblJ1Ynk6OlllczoKKyAgICAgICAgICAgIHZhbHVlcy0+YXBwZW5kKENT
U1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlUnVi
eSkpOworICAgICAgICB9CiAgICAgfQogCiAgICAgaWYgKCF2YWx1ZXMtPmxlbmd0aCgpKQpAQCAt
NDk0MSw5ICs0OTY1LDkgQEAgYm9vbCBDU1NQcm9wZXJ0eVBhcnNlcjo6Y29uc3VtZUZvbnRWYXJp
YW50U2hvcnRoYW5kKGJvb2wgaW1wb3J0YW50KQogewogICAgIGlmIChpZGVudE1hdGNoZXM8Q1NT
VmFsdWVOb3JtYWwsIENTU1ZhbHVlTm9uZT4obV9yYW5nZS5wZWVrKCkuaWQoKSkpIHsKICAgICAg
ICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlGb250VmFyaWFudExpZ2F0dXJlcywgQ1NTUHJvcGVy
dHlGb250VmFyaWFudCwgY29uc3VtZUlkZW50KG1fcmFuZ2UpLnJlbGVhc2VOb25OdWxsKCksIGlt
cG9ydGFudCk7Ci0gICAgICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRDYXBz
LCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0
ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCk7Ci0gICAgICAgIGFk
ZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRFYXN0QXNpYW4sIENTU1Byb3BlcnR5Rm9u
dFZhcmlhbnQsIENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVl
KENTU1ZhbHVlTm9ybWFsKSwgaW1wb3J0YW50KTsKLSAgICAgICAgYWRkUHJvcGVydHkoQ1NTUHJv
cGVydHlGb250VmFyaWFudFBvc2l0aW9uLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBDU1NWYWx1
ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCks
IGltcG9ydGFudCk7CisgICAgICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRD
YXBzLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNy
ZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCwgdHJ1ZSk7Cisg
ICAgICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRFYXN0QXNpYW4sIENTU1By
b3BlcnR5Rm9udFZhcmlhbnQsIENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRp
ZmllclZhbHVlKENTU1ZhbHVlTm9ybWFsKSwgaW1wb3J0YW50LCB0cnVlKTsKKyAgICAgICAgYWRk
UHJvcGVydHkoQ1NTUHJvcGVydHlGb250VmFyaWFudFBvc2l0aW9uLCBDU1NQcm9wZXJ0eUZvbnRW
YXJpYW50LCBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShD
U1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCwgdHJ1ZSk7CiAgICAgICAgIHJldHVybiBtX3Jhbmdl
LmF0RW5kKCk7CiAgICAgfQogCkBAIC00OTU0LDYgKzQ5NzgsOCBAQCBib29sIENTU1Byb3BlcnR5
UGFyc2VyOjpjb25zdW1lRm9udFZhcmlhbnRTaG9ydGhhbmQoYm9vbCBpbXBvcnRhbnQpCiAgICAg
UmVmUHRyPENTU1ZhbHVlPiBlYXN0QXNpYW5WYWx1ZTsKICAgICBGb250VmFyaWFudExpZ2F0dXJl
c1BhcnNlciBsaWdhdHVyZXNQYXJzZXI7CiAgICAgRm9udFZhcmlhbnROdW1lcmljUGFyc2VyIG51
bWVyaWNQYXJzZXI7CisgICAgYm9vbCBpbXBsaWNpdExpZ2F0dXJlcyA9IHRydWU7CisgICAgYm9v
bCBpbXBsaWNpdE51bWVyaWMgPSB0cnVlOwogICAgIGRvIHsKICAgICAgICAgaWYgKCFjYXBzVmFs
dWUpIHsKICAgICAgICAgICAgIGNhcHNWYWx1ZSA9IGNvbnN1bWVGb250VmFyaWFudENhcHMobV9y
YW5nZSk7CkBAIC00OTc1LDkgKzUwMDEsMTQgQEAgYm9vbCBDU1NQcm9wZXJ0eVBhcnNlcjo6Y29u
c3VtZUZvbnRWYXJpYW50U2hvcnRoYW5kKGJvb2wgaW1wb3J0YW50KQogCiAgICAgICAgIEZvbnRW
YXJpYW50TGlnYXR1cmVzUGFyc2VyOjpQYXJzZVJlc3VsdCBsaWdhdHVyZXNQYXJzZVJlc3VsdCA9
IGxpZ2F0dXJlc1BhcnNlci5jb25zdW1lTGlnYXR1cmUobV9yYW5nZSk7CiAgICAgICAgIEZvbnRW
YXJpYW50TnVtZXJpY1BhcnNlcjo6UGFyc2VSZXN1bHQgbnVtZXJpY1BhcnNlUmVzdWx0ID0gbnVt
ZXJpY1BhcnNlci5jb25zdW1lTnVtZXJpYyhtX3JhbmdlKTsKLSAgICAgICAgaWYgKGxpZ2F0dXJl
c1BhcnNlUmVzdWx0ID09IEZvbnRWYXJpYW50TGlnYXR1cmVzUGFyc2VyOjpQYXJzZVJlc3VsdDo6
Q29uc3VtZWRWYWx1ZQotICAgICAgICAgICAgfHwgbnVtZXJpY1BhcnNlUmVzdWx0ID09IEZvbnRW
YXJpYW50TnVtZXJpY1BhcnNlcjo6UGFyc2VSZXN1bHQ6OkNvbnN1bWVkVmFsdWUpCisgICAgICAg
IGlmIChsaWdhdHVyZXNQYXJzZVJlc3VsdCA9PSBGb250VmFyaWFudExpZ2F0dXJlc1BhcnNlcjo6
UGFyc2VSZXN1bHQ6OkNvbnN1bWVkVmFsdWUpIHsKKyAgICAgICAgICAgIGltcGxpY2l0TGlnYXR1
cmVzID0gZmFsc2U7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorICAgICAgICBp
ZiAobnVtZXJpY1BhcnNlUmVzdWx0ID09IEZvbnRWYXJpYW50TnVtZXJpY1BhcnNlcjo6UGFyc2VS
ZXN1bHQ6OkNvbnN1bWVkVmFsdWUpIHsKKyAgICAgICAgICAgIGltcGxpY2l0TnVtZXJpYyA9IGZh
bHNlOwogICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KIAogICAgICAgICBpZiAobGln
YXR1cmVzUGFyc2VSZXN1bHQgPT0gRm9udFZhcmlhbnRMaWdhdHVyZXNQYXJzZXI6OlBhcnNlUmVz
dWx0OjpEaXNhbGxvd2VkVmFsdWUKICAgICAgICAgICAgIHx8IG51bWVyaWNQYXJzZVJlc3VsdCA9
PSBGb250VmFyaWFudE51bWVyaWNQYXJzZXI6OlBhcnNlUmVzdWx0OjpEaXNhbGxvd2VkVmFsdWUp
CkBAIC00OTg2LDcgKzUwMTcsNyBAQCBib29sIENTU1Byb3BlcnR5UGFyc2VyOjpjb25zdW1lRm9u
dFZhcmlhbnRTaG9ydGhhbmQoYm9vbCBpbXBvcnRhbnQpCiAgICAgICAgIGlmICghZWFzdEFzaWFu
VmFsdWUpIHsKICAgICAgICAgICAgIGVhc3RBc2lhblZhbHVlID0gY29uc3VtZUZvbnRWYXJpYW50
RWFzdEFzaWFuKG1fcmFuZ2UpOwogICAgICAgICAgICAgaWYgKGVhc3RBc2lhblZhbHVlKQotICAg
ICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0K
IAogICAgICAgICAvLyBTYXcgc29tZSB2YWx1ZSB0aGF0IGRpZG4ndCBtYXRjaCBhbnl0aGluZyBl
bHNlLgpAQCAtNDk5NCwxNSArNTAyNSwxOSBAQCBib29sIENTU1Byb3BlcnR5UGFyc2VyOjpjb25z
dW1lRm9udFZhcmlhbnRTaG9ydGhhbmQoYm9vbCBpbXBvcnRhbnQpCiAKICAgICB9IHdoaWxlICgh
bV9yYW5nZS5hdEVuZCgpKTsKIAotICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlh
bnRMaWdhdHVyZXMsIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIGxpZ2F0dXJlc1BhcnNlci5maW5h
bGl6ZVZhbHVlKCkucmVsZWFzZU5vbk51bGwoKSwgaW1wb3J0YW50KTsKLSAgICBhZGRQcm9wZXJ0
eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50TnVtZXJpYywgQ1NTUHJvcGVydHlGb250VmFyaWFudCwg
bnVtZXJpY1BhcnNlci5maW5hbGl6ZVZhbHVlKCkucmVsZWFzZU5vbk51bGwoKSwgaW1wb3J0YW50
KTsKLSAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50Q2FwcywgQ1NTUHJvcGVy
dHlGb250VmFyaWFudCwgY2Fwc1ZhbHVlID8gY2Fwc1ZhbHVlLnJlbGVhc2VOb25OdWxsKCkgOiBD
U1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5v
cm1hbCksIGltcG9ydGFudCk7Ci0gICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlGb250VmFyaWFu
dEFsdGVybmF0ZXMsIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIGFsdGVybmF0ZXNWYWx1ZSA/IGFs
dGVybmF0ZXNWYWx1ZS5yZWxlYXNlTm9uTnVsbCgpIDogQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24o
KS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwpLCBpbXBvcnRhbnQpOwotICAg
IGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRQb3NpdGlvbiwgQ1NTUHJvcGVydHlG
b250VmFyaWFudCwgcG9zaXRpb25WYWx1ZSA/IHBvc2l0aW9uVmFsdWUucmVsZWFzZU5vbk51bGwo
KSA6IENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1Zh
bHVlTm9ybWFsKSwgaW1wb3J0YW50KTsKLSAgICAKKyAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0
eUZvbnRWYXJpYW50TGlnYXR1cmVzLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBsaWdhdHVyZXNQ
YXJzZXIuZmluYWxpemVWYWx1ZSgpLnJlbGVhc2VOb25OdWxsKCksIGltcG9ydGFudCwgaW1wbGlj
aXRMaWdhdHVyZXMpOworICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnROdW1l
cmljLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBudW1lcmljUGFyc2VyLmZpbmFsaXplVmFsdWUo
KS5yZWxlYXNlTm9uTnVsbCgpLCBpbXBvcnRhbnQsIGltcGxpY2l0TnVtZXJpYyk7CisgICAgYm9v
bCBpbXBsaWNpdENhcHMgPSAhY2Fwc1ZhbHVlOworICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5
Rm9udFZhcmlhbnRDYXBzLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBjYXBzVmFsdWUgPyBjYXBz
VmFsdWUucmVsZWFzZU5vbk51bGwoKSA6IENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRl
SWRlbnRpZmllclZhbHVlKENTU1ZhbHVlTm9ybWFsKSwgaW1wb3J0YW50LCBpbXBsaWNpdENhcHMp
OworICAgIGJvb2wgaW1wbGljaXRBbHRlcm5hdGVzID0gYWx0ZXJuYXRlc1ZhbHVlOworICAgIGFk
ZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRBbHRlcm5hdGVzLCBDU1NQcm9wZXJ0eUZv
bnRWYXJpYW50LCBhbHRlcm5hdGVzVmFsdWUgPyBhbHRlcm5hdGVzVmFsdWUucmVsZWFzZU5vbk51
bGwoKSA6IENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENT
U1ZhbHVlTm9ybWFsKSwgaW1wb3J0YW50LCBpbXBsaWNpdEFsdGVybmF0ZXMpOworICAgIGJvb2wg
aW1wbGljaXRQb3NpdGlvbiA9ICFwb3NpdGlvblZhbHVlOworICAgIGFkZFByb3BlcnR5KENTU1By
b3BlcnR5Rm9udFZhcmlhbnRQb3NpdGlvbiwgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgcG9zaXRp
b25WYWx1ZSA/IHBvc2l0aW9uVmFsdWUucmVsZWFzZU5vbk51bGwoKSA6IENTU1ZhbHVlUG9vbDo6
c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlTm9ybWFsKSwgaW1wb3J0
YW50LCBpbXBsaWNpdFBvc2l0aW9uKTsKKworICAgIGJvb2wgaW1wbGljaXRFYXN0QXNpYW4gPSAh
ZWFzdEFzaWFuVmFsdWU7CiAgICAgaWYgKCFlYXN0QXNpYW5WYWx1ZSkKICAgICAgICAgZWFzdEFz
aWFuVmFsdWUgPSBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1
ZShDU1NWYWx1ZU5vcm1hbCk7Ci0gICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlGb250VmFyaWFu
dEVhc3RBc2lhbiwgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgZWFzdEFzaWFuVmFsdWUucmVsZWFz
ZU5vbk51bGwoKSwgaW1wb3J0YW50KTsKKyAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRW
YXJpYW50RWFzdEFzaWFuLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBlYXN0QXNpYW5WYWx1ZS5y
ZWxlYXNlTm9uTnVsbCgpLCBpbXBvcnRhbnQsIGltcGxpY2l0RWFzdEFzaWFuKTsKICAgICAKICAg
ICByZXR1cm4gdHJ1ZTsKIH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9D
aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IGFjMmY1
NGMxOWJiNGZjZWMyYTU3OTAwY2VkYzQ1MjY5ZDdiMmVmNTcuLmI0OGZlNTk3NTBmMjZmNGFmOGY2
ZjhmYjExYTVkOWIzNWViZjFkZjkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz
Yy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAt
MSwzICsxLDE0IEBACisyMDIxLTA2LTA4ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisK
KyAgICAgICAgQ1NTT00gdGVzdCBmb3Igc2VyaWFsaXppbmcgZm9udC12YXJpYW50IGZhaWxzCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjY3NzAKKwor
ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgaW1w
cm92ZWQgdGVzdCByZXN1bHQuCisKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
c29tL3NlcmlhbGl6ZS12YWx1ZXMtZXhwZWN0ZWQudHh0OgorCiAyMDIxLTA2LTA2ICBEYXJpbiBB
ZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBIYW5kbGUgY3VzdG9tIGlkZW50aWZp
ZXJzIGFuZCBzdHJpbmdzIHNlcGFyYXRlbHksIHNvIHdlIGNhbiBxdW90ZSBzdHJpbmdzIGNvcnJl
Y3RseSBjb25zaXN0ZW50bHkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mb250cy9wYXJzaW5nL2ZvbnQtdmFyaWFudC12YWxp
ZC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3MtZm9udHMvcGFyc2luZy9mb250LXZhcmlhbnQtdmFsaWQtZXhwZWN0ZWQudHh0
CmluZGV4IGZjMGJhMjYwYjAxZjkxMjJiOGIwMWVmZDRmZGRjZjQ5OGU2MWQyYzMuLmU4OTEyZDY2
M2Q3NWQwZjkwNDk1NzNlMmY5ZGJjZTlhY2M0MTE2ZWUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz
L2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mb250cy9wYXJzaW5nL2Zv
bnQtdmFyaWFudC12YWxpZC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZvbnRzL3BhcnNpbmcvZm9udC12YXJpYW50
LXZhbGlkLWV4cGVjdGVkLnR4dApAQCAtMSwyMCArMSwyMCBAQAogCi1GQUlMIGUuc3R5bGVbJ2Zv
bnQtdmFyaWFudCddID0gIm5vcm1hbCIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNz
ZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFs
dWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAibm9uZSIgc2hvdWxkIHNldCB0
aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBz
ZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10g
PSAiY29tbW9uLWxpZ2F0dXJlcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0
X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUg
IiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAibm8tY29tbW9uLWxpZ2F0dXJlcyIg
c2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5
IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9u
dC12YXJpYW50J10gPSAiZGlzY3JldGlvbmFyeS1saWdhdHVyZXMiIHNob3VsZCBzZXQgdGhlIHBy
b3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdv
dCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gIm5v
LWRpc2NyZXRpb25hcnktbGlnYXR1cmVzIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBh
c3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2
YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJoaXN0b3JpY2FsLWxpZ2F0
dXJlcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHBy
b3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHls
ZVsnZm9udC12YXJpYW50J10gPSAibm8taGlzdG9yaWNhbC1saWdhdHVyZXMiIHNob3VsZCBzZXQg
dGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUg
c2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCdd
ID0gImNvbnRleHR1YWwiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3Rf
ZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1G
QUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gIm5vLWNvbnRleHR1YWwiIHNob3VsZCBzZXQg
dGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUg
c2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCdd
ID0gInNtYWxsLWNhcHMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3Rf
ZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1G
QUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImFsbC1zbWFsbC1jYXBzIiBzaG91bGQgc2V0
IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJl
IHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQn
XSA9ICJwZXRpdGUtY2FwcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25v
dF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIK
LUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiYWxsLXBldGl0ZS1jYXBzIiBzaG91bGQg
c2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxk
IGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlh
bnQnXSA9ICJ1bmljYXNlIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90
X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgot
RkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJ0aXRsaW5nLWNhcHMiIHNob3VsZCBzZXQg
dGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUg
c2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCdd
ID0gIm5vcm1hbCIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsn
Zm9udC12YXJpYW50J10gPSAibm9uZSIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BB
U1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiY29tbW9uLWxpZ2F0dXJlcyIgc2hvdWxkIHNl
dCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAibm8t
Y29tbW9uLWxpZ2F0dXJlcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5z
dHlsZVsnZm9udC12YXJpYW50J10gPSAiZGlzY3JldGlvbmFyeS1saWdhdHVyZXMiIHNob3VsZCBz
ZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gIm5v
LWRpc2NyZXRpb25hcnktbGlnYXR1cmVzIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQor
UEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJoaXN0b3JpY2FsLWxpZ2F0dXJlcyIgc2hv
dWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10g
PSAibm8taGlzdG9yaWNhbC1saWdhdHVyZXMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVl
CitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImNvbnRleHR1YWwiIHNob3VsZCBzZXQg
dGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gIm5vLWNv
bnRleHR1YWwiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2Zv
bnQtdmFyaWFudCddID0gInNtYWxsLWNhcHMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVl
CitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImFsbC1zbWFsbC1jYXBzIiBzaG91bGQg
c2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJw
ZXRpdGUtY2FwcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsn
Zm9udC12YXJpYW50J10gPSAiYWxsLXBldGl0ZS1jYXBzIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0
eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJ1bmljYXNlIiBzaG91bGQg
c2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJ0
aXRsaW5nLWNhcHMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCiBGQUlMIGUuc3R5bGVb
J2ZvbnQtdmFyaWFudCddID0gInN0eWxpc3RpYyhmbG93aW5nKSIgc2hvdWxkIHNldCB0aGUgcHJv
cGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290
IGRpc2FsbG93ZWQgdmFsdWUgIiIKIEZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiaGlz
dG9yaWNhbC1mb3JtcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9l
cXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKIEZB
SUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAic3R5bGVzZXQoZmxvd2luZykiIHNob3VsZCBz
ZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQg
YmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCkBAIC0zMiwxNyArMzIsMTcgQEAgRkFJTCBl
LnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJkaWFnb25hbC1mcmFjdGlvbnMiIHNob3VsZCBzZXQg
dGhlIHByb3BlcnR5IHZhbHUKIEZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAic3RhY2tl
ZC1mcmFjdGlvbnMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1
YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCiBGQUlM
IGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gIm9yZGluYWwiIHNob3VsZCBzZXQgdGhlIHByb3Bl
cnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBk
aXNhbGxvd2VkIHZhbHVlICIiCiBGQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInNsYXNo
ZWQtemVybyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6
IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5z
dHlsZVsnZm9udC12YXJpYW50J10gPSAiamlzNzgiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZh
bHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxv
d2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImppczgzIiBzaG91
bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hv
dWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZh
cmlhbnQnXSA9ICJqaXM5MCIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25v
dF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIK
LUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiamlzMDQiIHNob3VsZCBzZXQgdGhlIHBy
b3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdv
dCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInNp
bXBsaWZpZWQiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxz
OiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUu
c3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInRyYWRpdGlvbmFsIiBzaG91bGQgc2V0IHRoZSBwcm9w
ZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3Qg
ZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJmdWxs
LXdpZHRoIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczog
cHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0
eWxlWydmb250LXZhcmlhbnQnXSA9ICJwcm9wb3J0aW9uYWwtd2lkdGgiIHNob3VsZCBzZXQgdGhl
IHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0
IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0g
InJ1YnkiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBw
cm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5
bGVbJ2ZvbnQtdmFyaWFudCddID0gInN1YiIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUg
YXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQg
dmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAic3VwZXIiIHNob3VsZCBz
ZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQg
YmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFu
dCddID0gImppczc4IiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxl
Wydmb250LXZhcmlhbnQnXSA9ICJqaXM4MyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUK
K1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiamlzOTAiIHNob3VsZCBzZXQgdGhlIHBy
b3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImppczA0IiBzaG91
bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9
ICJzaW1wbGlmaWVkIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxl
Wydmb250LXZhcmlhbnQnXSA9ICJ0cmFkaXRpb25hbCIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkg
dmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiZnVsbC13aWR0aCIgc2hvdWxk
IHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAi
cHJvcG9ydGlvbmFsLXdpZHRoIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBl
LnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJydWJ5IiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2
YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJzdWIiIHNob3VsZCBzZXQgdGhl
IHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInN1cGVyIiBz
aG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQogRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQn
XSA9ICJjb21tb24tbGlnYXR1cmVzIGRpc2NyZXRpb25hcnktbGlnYXR1cmVzIGhpc3RvcmljYWwt
bGlnYXR1cmVzIGNvbnRleHR1YWwgc21hbGwtY2FwcyBzdHlsaXN0aWMoZmxvd2luZykgbGluaW5n
LW51bXMgcHJvcG9ydGlvbmFsLW51bXMgZGlhZ29uYWwtZnJhY3Rpb25zIG9yZGluYWwgc2xhc2hl
ZC16ZXJvIGppczc4IGZ1bGwtd2lkdGggcnVieSBzdWIiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5
IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNh
bGxvd2VkIHZhbHVlICIiCiBGQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInN1cGVyIHBy
b3BvcnRpb25hbC13aWR0aCBqaXM4MyBzdGFja2VkLWZyYWN0aW9ucyB0YWJ1bGFyLW51bXMgb2xk
c3R5bGUtbnVtcyBoaXN0b3JpY2FsLWZvcm1zIGFsbC1zbWFsbC1jYXBzIG5vLWNvbnRleHR1YWwg
bm8taGlzdG9yaWNhbC1saWdhdHVyZXMgbm8tZGlzY3JldGlvbmFyeS1saWdhdHVyZXMgbm8tY29t
bW9uLWxpZ2F0dXJlcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9l
cXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKIApk
aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3Nzb20vc2VyaWFsaXplLXZhbHVlcy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3NvbS9zZXJpYWxpemUtdmFsdWVzLWV4
cGVjdGVkLnR4dAppbmRleCBlYjMwOGVlMzExMzIzZjVmMGQ1YWNlZTRiYmM0ZmQ2MWVlZTQzNTIz
Li4wM2ZhOGY3YmUzY2RmOWRmMTgzMjY3Mzc0ZDY3Zjg5ZTMxODhiNmE0IDEwMDY0NAotLS0gYS9M
YXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3NvbS9zZXJp
YWxpemUtdmFsdWVzLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3NvbS9zZXJpYWxpemUtdmFsdWVzLWV4cGVjdGVkLnR4
dApAQCAtMzkzLDkgKzM5Myw5IEBAIFBBU1MgZm9udC1zdHlsZTogbm9ybWFsCiBQQVNTIGZvbnQt
c3R5bGU6IGl0YWxpYwogUEFTUyBmb250LXN0eWxlOiBvYmxpcXVlCiBQQVNTIGZvbnQtc3R5bGU6
IGluaGVyaXQKLUZBSUwgZm9udC12YXJpYW50OiBub3JtYWwgYXNzZXJ0X2VxdWFsczogZm9udC12
YXJpYW50IHJhdyBpbmxpbmUgc3R5bGUgZGVjbGFyYXRpb24gZXhwZWN0ZWQgIm5vcm1hbCIgYnV0
IGdvdCAiIgotRkFJTCBmb250LXZhcmlhbnQ6IHNtYWxsLWNhcHMgYXNzZXJ0X2VxdWFsczogZm9u
dC12YXJpYW50IHJhdyBpbmxpbmUgc3R5bGUgZGVjbGFyYXRpb24gZXhwZWN0ZWQgInNtYWxsLWNh
cHMiIGJ1dCBnb3QgIiIKLUZBSUwgZm9udC12YXJpYW50OiBpbmhlcml0IGFzc2VydF9lcXVhbHM6
IGZvbnQtdmFyaWFudCByYXcgaW5saW5lIHN0eWxlIGRlY2xhcmF0aW9uIGV4cGVjdGVkICJpbmhl
cml0IiBidXQgZ290ICIiCitQQVNTIGZvbnQtdmFyaWFudDogbm9ybWFsCitQQVNTIGZvbnQtdmFy
aWFudDogc21hbGwtY2FwcworUEFTUyBmb250LXZhcmlhbnQ6IGluaGVyaXQKIFBBU1MgZm9udC13
ZWlnaHQ6IG5vcm1hbAogUEFTUyBmb250LXdlaWdodDogYm9sZAogUEFTUyBmb250LXdlaWdodDog
Ym9sZGVyCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>431785</attachid>
            <date>2021-06-18 13:09:06 -0700</date>
            <delta_ts>2021-06-19 01:07:32 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-226770-20210618210904.patch</filename>
            <type>text/plain</type>
            <size>31354</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MDQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTIzZjg5ZDQyOWI2OWI2
OWQ4M2UxODk1ZWE0M2RkMjliMzRlMDU2Yy4uZDcyMGU3ZmZhOGY1NzU4MjM3NTNmNWVkZGExZDY5
OGVmYjY3NTI1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTA2LTE4ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ1NTT00gdGVzdCBmb3Igc2VyaWFs
aXppbmcgZm9udC12YXJpYW50IGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD0yMjY3NzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P
UFMhKS4KKworICAgICAgICBJbXBsZW1lbnQgZm9udC12YXJpYW50IHNlcmlhbGl6aW5nIGFjY29y
ZGluZyB0bzoKKyAgICAgICAgaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzc29tLyNzZXJpYWxp
emluZy1jc3MtdmFsdWVzCisKKyAgICAgICAgKiBjc3MvU3R5bGVQcm9wZXJ0aWVzLmNwcDoKKyAg
ICAgICAgKFdlYkNvcmU6OlN0eWxlUHJvcGVydGllczo6Z2V0UHJvcGVydHlWYWx1ZSBjb25zdCk6
CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVByb3BlcnRpZXM6OmFwcGVuZEZvbnRMb25naGFuZFZh
bHVlSWZFeHBsaWNpdCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVByb3BlcnRpZXM6
OmZvbnRWYXJpYW50VmFsdWUgY29uc3QpOgorICAgICAgICAqIGNzcy9TdHlsZVByb3BlcnRpZXMu
aDoKKyAgICAgICAgKiBjc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VyLmNwcDoKKyAgICAgICAg
KFdlYkNvcmU6OmNvbnN1bWVGb250VmFyaWFudEVhc3RBc2lhbik6CisgICAgICAgIChXZWJDb3Jl
OjpDU1NQcm9wZXJ0eVBhcnNlcjo6Y29uc3VtZUZvbnRWYXJpYW50U2hvcnRoYW5kKToKKwogMjAy
MS0wNi0xOCAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAg
ICAgW01TRV1bR1N0cmVhbWVyXSBTb3VuZGNsb3VkIHNlcnZlcyBNUDQgYXVkaW8gd2l0aCBlbXB0
eSB0ZmR0IGJveGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQcm9wZXJ0
aWVzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVByb3BlcnRpZXMuY3BwCmluZGV4IDZm
NmNlNDFkOTcxZmEyNDE1MTVmMGJjZTQ0ZWU1ZjgwZjQzYmRhZGEuLjQ5ZmFlNWYxMzNlNmU2ZmE0
MTc3YzhmNjU4Mjc1ZTg2NTA3ZWE5ZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9T
dHlsZVByb3BlcnRpZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVByb3BlcnRp
ZXMuY3BwCkBAIC0yMzcsNiArMjM3LDggQEAgU3RyaW5nIFN0eWxlUHJvcGVydGllczo6Z2V0UHJv
cGVydHlWYWx1ZShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQpIGNvbnN0CiAgICAgICAgIHJldHVy
biBnZXRBbGlnbm1lbnRTaG9ydGhhbmRWYWx1ZShwbGFjZVNlbGZTaG9ydGhhbmQoKSk7CiAgICAg
Y2FzZSBDU1NQcm9wZXJ0eUZvbnQ6CiAgICAgICAgIHJldHVybiBmb250VmFsdWUoKTsKKyAgICBj
YXNlIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQ6CisgICAgICAgIHJldHVybiBmb250VmFyaWFudFZh
bHVlKCk7CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUluc2V0OgogICAgICAgICByZXR1cm4gZ2V0NFZh
bHVlcyhpbnNldFNob3J0aGFuZCgpKTsKICAgICBjYXNlIENTU1Byb3BlcnR5SW5zZXRCbG9jazoK
QEAgLTM2Myw2ICszNjUsOSBAQCB2b2lkIFN0eWxlUHJvcGVydGllczo6YXBwZW5kRm9udExvbmdo
YW5kVmFsdWVJZkV4cGxpY2l0KENTU1Byb3BlcnR5SUQgcHJvcGVydHlJRAogICAgICAgICBicmVh
azsgLy8gTm8gcHJlZml4LgogICAgIGNhc2UgQ1NTUHJvcGVydHlGb250RmFtaWx5OgogICAgIGNh
c2UgQ1NTUHJvcGVydHlGb250VmFyaWFudENhcHM6CisgICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRW
YXJpYW50TGlnYXR1cmVzOgorICAgIGNhc2UgQ1NTUHJvcGVydHlGb250VmFyaWFudE51bWVyaWM6
CisgICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50RWFzdEFzaWFuOgogICAgIGNhc2UgQ1NT
UHJvcGVydHlGb250V2VpZ2h0OgogICAgIGNhc2UgQ1NTUHJvcGVydHlGb250U3RyZXRjaDoKICAg
ICAgICAgcHJlZml4ID0gJyAnOwpAQCAtNDEyLDYgKzQxNywxOSBAQCBTdHJpbmcgU3R5bGVQcm9w
ZXJ0aWVzOjpmb250VmFsdWUoKSBjb25zdAogICAgIHJldHVybiByZXN1bHQudG9TdHJpbmcoKTsK
IH0KIAorU3RyaW5nIFN0eWxlUHJvcGVydGllczo6Zm9udFZhcmlhbnRWYWx1ZSgpIGNvbnN0Cit7
CisgICAgU3RyaW5nIGNvbW1vblZhbHVlOworICAgIFN0cmluZ0J1aWxkZXIgcmVzdWx0OworICAg
IGFwcGVuZEZvbnRMb25naGFuZFZhbHVlSWZFeHBsaWNpdChDU1NQcm9wZXJ0eUZvbnRWYXJpYW50
TGlnYXR1cmVzLCByZXN1bHQsIGNvbW1vblZhbHVlKTsKKyAgICBpZiAoaXNDU1NXaWRlVmFsdWVL
ZXl3b3JkKHJlc3VsdC50b1N0cmluZygpKSkKKyAgICAgICAgcmV0dXJuIHJlc3VsdC50b1N0cmlu
ZygpOworICAgIGFwcGVuZEZvbnRMb25naGFuZFZhbHVlSWZFeHBsaWNpdChDU1NQcm9wZXJ0eUZv
bnRWYXJpYW50Q2FwcywgcmVzdWx0LCBjb21tb25WYWx1ZSk7CisgICAgYXBwZW5kRm9udExvbmdo
YW5kVmFsdWVJZkV4cGxpY2l0KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRFYXN0QXNpYW4sIHJlc3Vs
dCwgY29tbW9uVmFsdWUpOworICAgIGFwcGVuZEZvbnRMb25naGFuZFZhbHVlSWZFeHBsaWNpdChD
U1NQcm9wZXJ0eUZvbnRWYXJpYW50UG9zaXRpb24sIHJlc3VsdCwgY29tbW9uVmFsdWUpOworICAg
IHJldHVybiByZXN1bHQudG9TdHJpbmcoKTsKK30KKwogU3RyaW5nIFN0eWxlUHJvcGVydGllczo6
Z2V0MlZhbHVlcyhjb25zdCBTdHlsZVByb3BlcnR5U2hvcnRoYW5kJiBzaG9ydGhhbmQpIGNvbnN0
CiB7CiAgICAgLy8gQXNzdW1lIHRoZSBwcm9wZXJ0aWVzIGFyZSBpbiB0aGUgdXN1YWwgb3JkZXIg
c3RhcnQsIGVuZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVByb3BlcnRp
ZXMuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVByb3BlcnRpZXMuaAppbmRleCBiMDIxYWVi
N2MyMDM3MGM5ZmMxN2JlNWZiNGM1ZmY2ZTQxN2ZiN2Q3Li5kYTdkOWY2NmRmMGUwYzg2MWRlMWQ0
NjJhYmM1MGM4ZGFhMzE0ODlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQ
cm9wZXJ0aWVzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVydGllcy5oCkBA
IC0xNzIsNiArMTcyLDcgQEAgcHJpdmF0ZToKICAgICBTdHJpbmcgZ2V0NFZhbHVlcyhjb25zdCBT
dHlsZVByb3BlcnR5U2hvcnRoYW5kJikgY29uc3Q7CiAgICAgU3RyaW5nIGJvcmRlclNwYWNpbmdW
YWx1ZShjb25zdCBTdHlsZVByb3BlcnR5U2hvcnRoYW5kJikgY29uc3Q7CiAgICAgU3RyaW5nIGZv
bnRWYWx1ZSgpIGNvbnN0OworICAgIFN0cmluZyBmb250VmFyaWFudFZhbHVlKCkgY29uc3Q7CiAg
ICAgdm9pZCBhcHBlbmRGb250TG9uZ2hhbmRWYWx1ZUlmRXhwbGljaXQoQ1NTUHJvcGVydHlJRCwg
U3RyaW5nQnVpbGRlciYgcmVzdWx0LCBTdHJpbmcmIHZhbHVlKSBjb25zdDsKIAogICAgIGZyaWVu
ZCBjbGFzcyBQcm9wZXJ0eVNldENTU1N0eWxlRGVjbGFyYXRpb247CmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VyLmNwcCBiL1NvdXJjZS9XZWJD
b3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwCmluZGV4IDg4NGYwNDE4ODZhZDM2
MTEyZjc1OTM4MzUyOTExZDkzMTU5YzA4NmYuLjAxZGY0YjlmMzM5NTFkOTJhNGUzNDRlZWRjNmQ5
MDFmZjBkMTIwZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJv
cGVydHlQYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVy
dHlQYXJzZXIuY3BwCkBAIC02OTEsNDIgKzY5MSw2MCBAQCBzdGF0aWMgUmVmUHRyPENTU1ZhbHVl
PiBjb25zdW1lRm9udFZhcmlhbnRFYXN0QXNpYW4oQ1NTUGFyc2VyVG9rZW5SYW5nZSYgcmFuZ2Up
CiAgICAgICAgIHJldHVybiBjb25zdW1lSWRlbnQocmFuZ2UpOwogICAgIAogICAgIFJlZlB0cjxD
U1NWYWx1ZUxpc3Q+IHZhbHVlcyA9IENTU1ZhbHVlTGlzdDo6Y3JlYXRlU3BhY2VTZXBhcmF0ZWQo
KTsKLSAgICBGb250VmFyaWFudEVhc3RBc2lhblZhcmlhbnQgdmFyaWFudCA9IEZvbnRWYXJpYW50
RWFzdEFzaWFuVmFyaWFudDo6Tm9ybWFsOwotICAgIEZvbnRWYXJpYW50RWFzdEFzaWFuV2lkdGgg
d2lkdGggPSBGb250VmFyaWFudEVhc3RBc2lhbldpZHRoOjpOb3JtYWw7Ci0gICAgRm9udFZhcmlh
bnRFYXN0QXNpYW5SdWJ5IHJ1YnkgPSBGb250VmFyaWFudEVhc3RBc2lhblJ1Ynk6Ok5vcm1hbDsK
KyAgICBzdGQ6Om9wdGlvbmFsPEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudD4gdmFyaWFudDsK
KyAgICBzdGQ6Om9wdGlvbmFsPEZvbnRWYXJpYW50RWFzdEFzaWFuV2lkdGg+IHdpZHRoOworICAg
IHN0ZDo6b3B0aW9uYWw8Rm9udFZhcmlhbnRFYXN0QXNpYW5SdWJ5PiBydWJ5OwogICAgIAogICAg
IHdoaWxlICghcmFuZ2UuYXRFbmQoKSkgewogICAgICAgICBpZiAocmFuZ2UucGVlaygpLnR5cGUo
KSAhPSBJZGVudFRva2VuKQogICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0gICAgICAgIAor
CiAgICAgICAgIGF1dG8gaWQgPSByYW5nZS5wZWVrKCkuaWQoKTsKICAgICAgICAgCiAgICAgICAg
IHN3aXRjaCAoaWQpIHsKICAgICAgICAgY2FzZSBDU1NWYWx1ZUppczc4OgorICAgICAgICAgICAg
aWYgKHZhcmlhbnQpCisgICAgICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgICAgICAg
ICB2YXJpYW50ID0gRm9udFZhcmlhbnRFYXN0QXNpYW5WYXJpYW50OjpKaXM3ODsKICAgICAgICAg
ICAgIGJyZWFrOwogICAgICAgICBjYXNlIENTU1ZhbHVlSmlzODM6CisgICAgICAgICAgICBpZiAo
dmFyaWFudCkKKyAgICAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICAgICAgICAgIHZh
cmlhbnQgPSBGb250VmFyaWFudEVhc3RBc2lhblZhcmlhbnQ6OkppczgzOwogICAgICAgICAgICAg
YnJlYWs7CiAgICAgICAgIGNhc2UgQ1NTVmFsdWVKaXM5MDoKKyAgICAgICAgICAgIGlmICh2YXJp
YW50KQorICAgICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgICAgICAgICAgdmFyaWFu
dCA9IEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6SmlzOTA7CiAgICAgICAgICAgICBicmVh
azsKICAgICAgICAgY2FzZSBDU1NWYWx1ZUppczA0OgorICAgICAgICAgICAgaWYgKHZhcmlhbnQp
CisgICAgICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgICAgICAgICB2YXJpYW50ID0g
Rm9udFZhcmlhbnRFYXN0QXNpYW5WYXJpYW50OjpKaXMwNDsKICAgICAgICAgICAgIGJyZWFrOwog
ICAgICAgICBjYXNlIENTU1ZhbHVlU2ltcGxpZmllZDoKKyAgICAgICAgICAgIGlmICh2YXJpYW50
KQorICAgICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgICAgICAgICAgdmFyaWFudCA9
IEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6U2ltcGxpZmllZDsKICAgICAgICAgICAgIGJy
ZWFrOwogICAgICAgICBjYXNlIENTU1ZhbHVlVHJhZGl0aW9uYWw6CisgICAgICAgICAgICBpZiAo
dmFyaWFudCkKKyAgICAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICAgICAgICAgIHZh
cmlhbnQgPSBGb250VmFyaWFudEVhc3RBc2lhblZhcmlhbnQ6OlRyYWRpdGlvbmFsOwogICAgICAg
ICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgQ1NTVmFsdWVGdWxsV2lkdGg6CisgICAgICAgICAg
ICBpZiAod2lkdGgpCisgICAgICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgICAgICAg
ICB3aWR0aCA9IEZvbnRWYXJpYW50RWFzdEFzaWFuV2lkdGg6OkZ1bGw7CiAgICAgICAgICAgICBi
cmVhazsKICAgICAgICAgY2FzZSBDU1NWYWx1ZVByb3BvcnRpb25hbFdpZHRoOgorICAgICAgICAg
ICAgaWYgKHdpZHRoKQorICAgICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgICAgICAg
ICAgd2lkdGggPSBGb250VmFyaWFudEVhc3RBc2lhbldpZHRoOjpQcm9wb3J0aW9uYWw7CiAgICAg
ICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBDU1NWYWx1ZVJ1Ynk6CisgICAgICAgICAgICBp
ZiAocnVieSkKKyAgICAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICAgICAgICAgIHJ1
YnkgPSBGb250VmFyaWFudEVhc3RBc2lhblJ1Ynk6OlllczsKICAgICAgICAgICAgIGJyZWFrOwog
ICAgICAgICBkZWZhdWx0OgpAQCAtNzM1LDQ2ICs3NTMsNTIgQEAgc3RhdGljIFJlZlB0cjxDU1NW
YWx1ZT4gY29uc3VtZUZvbnRWYXJpYW50RWFzdEFzaWFuKENTU1BhcnNlclRva2VuUmFuZ2UmIHJh
bmdlKQogICAgICAgICAKICAgICAgICAgcmFuZ2UuY29uc3VtZUluY2x1ZGluZ1doaXRlc3BhY2Uo
KTsKICAgICB9Ci0gICAgICAgIAotICAgIHN3aXRjaCAodmFyaWFudCkgewotICAgIGNhc2UgRm9u
dFZhcmlhbnRFYXN0QXNpYW5WYXJpYW50OjpOb3JtYWw6Ci0gICAgICAgIGJyZWFrOwotICAgIGNh
c2UgRm9udFZhcmlhbnRFYXN0QXNpYW5WYXJpYW50OjpKaXM3ODoKLSAgICAgICAgdmFsdWVzLT5h
cHBlbmQoQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NT
VmFsdWVKaXM3OCkpOwotICAgICAgICBicmVhazsKLSAgICBjYXNlIEZvbnRWYXJpYW50RWFzdEFz
aWFuVmFyaWFudDo6SmlzODM6Ci0gICAgICAgIHZhbHVlcy0+YXBwZW5kKENTU1ZhbHVlUG9vbDo6
c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlSmlzODMpKTsKLSAgICAg
ICAgYnJlYWs7Ci0gICAgY2FzZSBGb250VmFyaWFudEVhc3RBc2lhblZhcmlhbnQ6OkppczkwOgot
ICAgICAgICB2YWx1ZXMtPmFwcGVuZChDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlk
ZW50aWZpZXJWYWx1ZShDU1NWYWx1ZUppczkwKSk7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2Ug
Rm9udFZhcmlhbnRFYXN0QXNpYW5WYXJpYW50OjpKaXMwNDoKLSAgICAgICAgdmFsdWVzLT5hcHBl
bmQoQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFs
dWVKaXMwNCkpOwotICAgICAgICBicmVhazsKLSAgICBjYXNlIEZvbnRWYXJpYW50RWFzdEFzaWFu
VmFyaWFudDo6U2ltcGxpZmllZDoKLSAgICAgICAgdmFsdWVzLT5hcHBlbmQoQ1NTVmFsdWVQb29s
OjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVTaW1wbGlmaWVkKSk7
Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgRm9udFZhcmlhbnRFYXN0QXNpYW5WYXJpYW50OjpU
cmFkaXRpb25hbDoKLSAgICAgICAgdmFsdWVzLT5hcHBlbmQoQ1NTVmFsdWVQb29sOjpzaW5nbGV0
b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVUcmFkaXRpb25hbCkpOwotICAgICAg
ICBicmVhazsKKworICAgIGlmICh2YXJpYW50KSB7CisgICAgICAgIHN3aXRjaCAoKnZhcmlhbnQp
IHsKKyAgICAgICAgY2FzZSBGb250VmFyaWFudEVhc3RBc2lhblZhcmlhbnQ6Ok5vcm1hbDoKKyAg
ICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFu
dDo6SmlzNzg6CisgICAgICAgICAgICB2YWx1ZXMtPmFwcGVuZChDU1NWYWx1ZVBvb2w6OnNpbmds
ZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZUppczc4KSk7CisgICAgICAgICAg
ICBicmVhazsKKyAgICAgICAgY2FzZSBGb250VmFyaWFudEVhc3RBc2lhblZhcmlhbnQ6Okppczgz
OgorICAgICAgICAgICAgdmFsdWVzLT5hcHBlbmQoQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5j
cmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVKaXM4MykpOworICAgICAgICAgICAgYnJlYWs7
CisgICAgICAgIGNhc2UgRm9udFZhcmlhbnRFYXN0QXNpYW5WYXJpYW50OjpKaXM5MDoKKyAgICAg
ICAgICAgIHZhbHVlcy0+YXBwZW5kKENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRl
bnRpZmllclZhbHVlKENTU1ZhbHVlSmlzOTApKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAg
ICBjYXNlIEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6SmlzMDQ6CisgICAgICAgICAgICB2
YWx1ZXMtPmFwcGVuZChDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJW
YWx1ZShDU1NWYWx1ZUppczA0KSk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBG
b250VmFyaWFudEVhc3RBc2lhblZhcmlhbnQ6OlNpbXBsaWZpZWQ6CisgICAgICAgICAgICB2YWx1
ZXMtPmFwcGVuZChDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1
ZShDU1NWYWx1ZVNpbXBsaWZpZWQpKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNl
IEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6VHJhZGl0aW9uYWw6CisgICAgICAgICAgICB2
YWx1ZXMtPmFwcGVuZChDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJW
YWx1ZShDU1NWYWx1ZVRyYWRpdGlvbmFsKSk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAg
fQogICAgIH0KLSAgICAgICAgCi0gICAgc3dpdGNoICh3aWR0aCkgewotICAgIGNhc2UgRm9udFZh
cmlhbnRFYXN0QXNpYW5XaWR0aDo6Tm9ybWFsOgotICAgICAgICBicmVhazsKLSAgICBjYXNlIEZv
bnRWYXJpYW50RWFzdEFzaWFuV2lkdGg6OkZ1bGw6Ci0gICAgICAgIHZhbHVlcy0+YXBwZW5kKENT
U1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlRnVs
bFdpZHRoKSk7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgRm9udFZhcmlhbnRFYXN0QXNpYW5X
aWR0aDo6UHJvcG9ydGlvbmFsOgotICAgICAgICB2YWx1ZXMtPmFwcGVuZChDU1NWYWx1ZVBvb2w6
OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZVByb3BvcnRpb25hbFdp
ZHRoKSk7Ci0gICAgICAgIGJyZWFrOworCisgICAgaWYgKHdpZHRoKSB7CisgICAgICAgIHN3aXRj
aCAoKndpZHRoKSB7CisgICAgICAgIGNhc2UgRm9udFZhcmlhbnRFYXN0QXNpYW5XaWR0aDo6Tm9y
bWFsOgorICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgRm9udFZhcmlhbnRFYXN0QXNp
YW5XaWR0aDo6RnVsbDoKKyAgICAgICAgICAgIHZhbHVlcy0+YXBwZW5kKENTU1ZhbHVlUG9vbDo6
c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlRnVsbFdpZHRoKSk7Cisg
ICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBGb250VmFyaWFudEVhc3RBc2lhbldpZHRo
OjpQcm9wb3J0aW9uYWw6CisgICAgICAgICAgICB2YWx1ZXMtPmFwcGVuZChDU1NWYWx1ZVBvb2w6
OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZVByb3BvcnRpb25hbFdp
ZHRoKSk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQogICAgIH0KICAgICAgICAgCi0g
ICAgc3dpdGNoIChydWJ5KSB7Ci0gICAgY2FzZSBGb250VmFyaWFudEVhc3RBc2lhblJ1Ynk6Ok5v
cm1hbDoKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBGb250VmFyaWFudEVhc3RBc2lhblJ1Ynk6
OlllczoKLSAgICAgICAgdmFsdWVzLT5hcHBlbmQoQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5j
cmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVSdWJ5KSk7CisgICAgaWYgKHJ1YnkpIHsKKyAg
ICAgICAgc3dpdGNoICgqcnVieSkgeworICAgICAgICBjYXNlIEZvbnRWYXJpYW50RWFzdEFzaWFu
UnVieTo6Tm9ybWFsOgorICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgRm9udFZhcmlh
bnRFYXN0QXNpYW5SdWJ5OjpZZXM6CisgICAgICAgICAgICB2YWx1ZXMtPmFwcGVuZChDU1NWYWx1
ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZVJ1YnkpKTsK
KyAgICAgICAgfQogICAgIH0KIAogICAgIGlmICghdmFsdWVzLT5sZW5ndGgoKSkKQEAgLTQ5NDAs
OSArNDk2NCw5IEBAIGJvb2wgQ1NTUHJvcGVydHlQYXJzZXI6OmNvbnN1bWVGb250VmFyaWFudFNo
b3J0aGFuZChib29sIGltcG9ydGFudCkKIHsKICAgICBpZiAoaWRlbnRNYXRjaGVzPENTU1ZhbHVl
Tm9ybWFsLCBDU1NWYWx1ZU5vbmU+KG1fcmFuZ2UucGVlaygpLmlkKCkpKSB7CiAgICAgICAgIGFk
ZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRMaWdhdHVyZXMsIENTU1Byb3BlcnR5Rm9u
dFZhcmlhbnQsIGNvbnN1bWVJZGVudChtX3JhbmdlKS5yZWxlYXNlTm9uTnVsbCgpLCBpbXBvcnRh
bnQpOwotICAgICAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50Q2FwcywgQ1NT
UHJvcGVydHlGb250VmFyaWFudCwgQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVu
dGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwpLCBpbXBvcnRhbnQpOwotICAgICAgICBhZGRQcm9w
ZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50RWFzdEFzaWFuLCBDU1NQcm9wZXJ0eUZvbnRWYXJp
YW50LCBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NW
YWx1ZU5vcm1hbCksIGltcG9ydGFudCk7Ci0gICAgICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5
Rm9udFZhcmlhbnRQb3NpdGlvbiwgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgQ1NTVmFsdWVQb29s
OjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwpLCBpbXBv
cnRhbnQpOworICAgICAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50Q2Fwcywg
Q1NTUHJvcGVydHlGb250VmFyaWFudCwgQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJ
ZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwpLCBpbXBvcnRhbnQsIHRydWUpOworICAgICAg
ICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50RWFzdEFzaWFuLCBDU1NQcm9wZXJ0
eUZvbnRWYXJpYW50LCBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJW
YWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCwgdHJ1ZSk7CisgICAgICAgIGFkZFByb3Bl
cnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRQb3NpdGlvbiwgQ1NTUHJvcGVydHlGb250VmFyaWFu
dCwgQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFs
dWVOb3JtYWwpLCBpbXBvcnRhbnQsIHRydWUpOwogICAgICAgICByZXR1cm4gbV9yYW5nZS5hdEVu
ZCgpOwogICAgIH0KIApAQCAtNDk1Myw2ICs0OTc3LDggQEAgYm9vbCBDU1NQcm9wZXJ0eVBhcnNl
cjo6Y29uc3VtZUZvbnRWYXJpYW50U2hvcnRoYW5kKGJvb2wgaW1wb3J0YW50KQogICAgIFJlZlB0
cjxDU1NWYWx1ZT4gZWFzdEFzaWFuVmFsdWU7CiAgICAgRm9udFZhcmlhbnRMaWdhdHVyZXNQYXJz
ZXIgbGlnYXR1cmVzUGFyc2VyOwogICAgIEZvbnRWYXJpYW50TnVtZXJpY1BhcnNlciBudW1lcmlj
UGFyc2VyOworICAgIGJvb2wgaW1wbGljaXRMaWdhdHVyZXMgPSB0cnVlOworICAgIGJvb2wgaW1w
bGljaXROdW1lcmljID0gdHJ1ZTsKICAgICBkbyB7CiAgICAgICAgIGlmICghY2Fwc1ZhbHVlKSB7
CiAgICAgICAgICAgICBjYXBzVmFsdWUgPSBjb25zdW1lRm9udFZhcmlhbnRDYXBzKG1fcmFuZ2Up
OwpAQCAtNDk3NCw5ICs1MDAwLDE0IEBAIGJvb2wgQ1NTUHJvcGVydHlQYXJzZXI6OmNvbnN1bWVG
b250VmFyaWFudFNob3J0aGFuZChib29sIGltcG9ydGFudCkKIAogICAgICAgICBGb250VmFyaWFu
dExpZ2F0dXJlc1BhcnNlcjo6UGFyc2VSZXN1bHQgbGlnYXR1cmVzUGFyc2VSZXN1bHQgPSBsaWdh
dHVyZXNQYXJzZXIuY29uc3VtZUxpZ2F0dXJlKG1fcmFuZ2UpOwogICAgICAgICBGb250VmFyaWFu
dE51bWVyaWNQYXJzZXI6OlBhcnNlUmVzdWx0IG51bWVyaWNQYXJzZVJlc3VsdCA9IG51bWVyaWNQ
YXJzZXIuY29uc3VtZU51bWVyaWMobV9yYW5nZSk7Ci0gICAgICAgIGlmIChsaWdhdHVyZXNQYXJz
ZVJlc3VsdCA9PSBGb250VmFyaWFudExpZ2F0dXJlc1BhcnNlcjo6UGFyc2VSZXN1bHQ6OkNvbnN1
bWVkVmFsdWUKLSAgICAgICAgICAgIHx8IG51bWVyaWNQYXJzZVJlc3VsdCA9PSBGb250VmFyaWFu
dE51bWVyaWNQYXJzZXI6OlBhcnNlUmVzdWx0OjpDb25zdW1lZFZhbHVlKQorICAgICAgICBpZiAo
bGlnYXR1cmVzUGFyc2VSZXN1bHQgPT0gRm9udFZhcmlhbnRMaWdhdHVyZXNQYXJzZXI6OlBhcnNl
UmVzdWx0OjpDb25zdW1lZFZhbHVlKSB7CisgICAgICAgICAgICBpbXBsaWNpdExpZ2F0dXJlcyA9
IGZhbHNlOworICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKyAgICAgICAgaWYgKG51
bWVyaWNQYXJzZVJlc3VsdCA9PSBGb250VmFyaWFudE51bWVyaWNQYXJzZXI6OlBhcnNlUmVzdWx0
OjpDb25zdW1lZFZhbHVlKSB7CisgICAgICAgICAgICBpbXBsaWNpdE51bWVyaWMgPSBmYWxzZTsK
ICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CiAKICAgICAgICAgaWYgKGxpZ2F0dXJl
c1BhcnNlUmVzdWx0ID09IEZvbnRWYXJpYW50TGlnYXR1cmVzUGFyc2VyOjpQYXJzZVJlc3VsdDo6
RGlzYWxsb3dlZFZhbHVlCiAgICAgICAgICAgICB8fCBudW1lcmljUGFyc2VSZXN1bHQgPT0gRm9u
dFZhcmlhbnROdW1lcmljUGFyc2VyOjpQYXJzZVJlc3VsdDo6RGlzYWxsb3dlZFZhbHVlKQpAQCAt
NDk4NSw3ICs1MDE2LDcgQEAgYm9vbCBDU1NQcm9wZXJ0eVBhcnNlcjo6Y29uc3VtZUZvbnRWYXJp
YW50U2hvcnRoYW5kKGJvb2wgaW1wb3J0YW50KQogICAgICAgICBpZiAoIWVhc3RBc2lhblZhbHVl
KSB7CiAgICAgICAgICAgICBlYXN0QXNpYW5WYWx1ZSA9IGNvbnN1bWVGb250VmFyaWFudEVhc3RB
c2lhbihtX3JhbmdlKTsKICAgICAgICAgICAgIGlmIChlYXN0QXNpYW5WYWx1ZSkKLSAgICAgICAg
ICAgIGNvbnRpbnVlOworICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAKICAg
ICAgICAgLy8gU2F3IHNvbWUgdmFsdWUgdGhhdCBkaWRuJ3QgbWF0Y2ggYW55dGhpbmcgZWxzZS4K
QEAgLTQ5OTMsMTUgKzUwMjQsMTkgQEAgYm9vbCBDU1NQcm9wZXJ0eVBhcnNlcjo6Y29uc3VtZUZv
bnRWYXJpYW50U2hvcnRoYW5kKGJvb2wgaW1wb3J0YW50KQogCiAgICAgfSB3aGlsZSAoIW1fcmFu
Z2UuYXRFbmQoKSk7CiAKLSAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50TGln
YXR1cmVzLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBsaWdhdHVyZXNQYXJzZXIuZmluYWxpemVW
YWx1ZSgpLnJlbGVhc2VOb25OdWxsKCksIGltcG9ydGFudCk7Ci0gICAgYWRkUHJvcGVydHkoQ1NT
UHJvcGVydHlGb250VmFyaWFudE51bWVyaWMsIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIG51bWVy
aWNQYXJzZXIuZmluYWxpemVWYWx1ZSgpLnJlbGVhc2VOb25OdWxsKCksIGltcG9ydGFudCk7Ci0g
ICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlGb250VmFyaWFudENhcHMsIENTU1Byb3BlcnR5Rm9u
dFZhcmlhbnQsIGNhcHNWYWx1ZSA/IGNhcHNWYWx1ZS5yZWxlYXNlTm9uTnVsbCgpIDogQ1NTVmFs
dWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwp
LCBpbXBvcnRhbnQpOwotICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRBbHRl
cm5hdGVzLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBhbHRlcm5hdGVzVmFsdWUgPyBhbHRlcm5h
dGVzVmFsdWUucmVsZWFzZU5vbk51bGwoKSA6IENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3Jl
YXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlTm9ybWFsKSwgaW1wb3J0YW50KTsKLSAgICBhZGRQ
cm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50UG9zaXRpb24sIENTU1Byb3BlcnR5Rm9udFZh
cmlhbnQsIHBvc2l0aW9uVmFsdWUgPyBwb3NpdGlvblZhbHVlLnJlbGVhc2VOb25OdWxsKCkgOiBD
U1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5v
cm1hbCksIGltcG9ydGFudCk7Ci0gICAgCisgICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlGb250
VmFyaWFudExpZ2F0dXJlcywgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgbGlnYXR1cmVzUGFyc2Vy
LmZpbmFsaXplVmFsdWUoKS5yZWxlYXNlTm9uTnVsbCgpLCBpbXBvcnRhbnQsIGltcGxpY2l0TGln
YXR1cmVzKTsKKyAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50TnVtZXJpYywg
Q1NTUHJvcGVydHlGb250VmFyaWFudCwgbnVtZXJpY1BhcnNlci5maW5hbGl6ZVZhbHVlKCkucmVs
ZWFzZU5vbk51bGwoKSwgaW1wb3J0YW50LCBpbXBsaWNpdE51bWVyaWMpOworICAgIGJvb2wgaW1w
bGljaXRDYXBzID0gIWNhcHNWYWx1ZTsKKyAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRW
YXJpYW50Q2FwcywgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgY2Fwc1ZhbHVlID8gY2Fwc1ZhbHVl
LnJlbGVhc2VOb25OdWxsKCkgOiBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50
aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCwgaW1wbGljaXRDYXBzKTsKKyAg
ICBib29sIGltcGxpY2l0QWx0ZXJuYXRlcyA9IGFsdGVybmF0ZXNWYWx1ZTsKKyAgICBhZGRQcm9w
ZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50QWx0ZXJuYXRlcywgQ1NTUHJvcGVydHlGb250VmFy
aWFudCwgYWx0ZXJuYXRlc1ZhbHVlID8gYWx0ZXJuYXRlc1ZhbHVlLnJlbGVhc2VOb25OdWxsKCkg
OiBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1
ZU5vcm1hbCksIGltcG9ydGFudCwgaW1wbGljaXRBbHRlcm5hdGVzKTsKKyAgICBib29sIGltcGxp
Y2l0UG9zaXRpb24gPSAhcG9zaXRpb25WYWx1ZTsKKyAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0
eUZvbnRWYXJpYW50UG9zaXRpb24sIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIHBvc2l0aW9uVmFs
dWUgPyBwb3NpdGlvblZhbHVlLnJlbGVhc2VOb25OdWxsKCkgOiBDU1NWYWx1ZVBvb2w6OnNpbmds
ZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCwg
aW1wbGljaXRQb3NpdGlvbik7CisKKyAgICBib29sIGltcGxpY2l0RWFzdEFzaWFuID0gIWVhc3RB
c2lhblZhbHVlOwogICAgIGlmICghZWFzdEFzaWFuVmFsdWUpCiAgICAgICAgIGVhc3RBc2lhblZh
bHVlID0gQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NT
VmFsdWVOb3JtYWwpOwotICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRFYXN0
QXNpYW4sIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIGVhc3RBc2lhblZhbHVlLnJlbGVhc2VOb25O
dWxsKCksIGltcG9ydGFudCk7CisgICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlGb250VmFyaWFu
dEVhc3RBc2lhbiwgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgZWFzdEFzaWFuVmFsdWUucmVsZWFz
ZU5vbk51bGwoKSwgaW1wb3J0YW50LCBpbXBsaWNpdEVhc3RBc2lhbik7CiAgICAgCiAgICAgcmV0
dXJuIHRydWU7CiB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRU
ZXN0cy9DaGFuZ2VMb2cKaW5kZXggMmFmM2JkMzY1ODUxZmFkMWM0YTRkOTZkYmYzMzAzZmI1YTJh
ZmI2My4uMGI2OWFhYWVlYTE5NzY5YTEyYjgyNTM5MjJhZDVjN2MzOTQ1Zjc4NyAxMDA2NDQKLS0t
IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAt
MSwzICsxLDEzIEBACisyMDIxLTA2LTE4ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisK
KyAgICAgICAgQ1NTT00gdGVzdCBmb3Igc2VyaWFsaXppbmcgZm9udC12YXJpYW50IGZhaWxzCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjY3NzAKKwor
ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGNzczMvZm9u
dC12YXJpYW50LXBhcnNpbmctZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGNzczMvZm9udC12YXJp
YW50LXBhcnNpbmcuaHRtbDoKKwogMjAyMS0wNi0xOCAgUnlhbiBIYWRkYWQgIDxyeWFuaGFkZGFk
QGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TIDE0LVNpbXVsYXRvciBXSzJdIGVkaXRpbmcvZGVs
ZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDQuaHRtbCBpcyBhIGZsYWt5IGZhaWx1cmUK
ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRU
ZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IDliZGUzM2RkMTM5ZmU4YjE5OGMzMzBm
NmJhYWE4NjNhNGI5OTFlOWYuLjg1MzVhM2Y0MmI1OTE5Nzc4MDg5NzI2NmU0MzRlZDY1ZjE2ZjY3
OTEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKKysrIGIv
TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIx
LTA2LTE4ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ1NTT00gdGVz
dCBmb3Igc2VyaWFsaXppbmcgZm9udC12YXJpYW50IGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjY3NzAKKworICAgICAgICBSZXZpZXdlZCBi
eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgaW1wcm92ZWQgdGVzdCByZXN1bHQu
CisKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mb250cy9wYXJzaW5nL2Zv
bnQtdmFyaWFudC1lYXN0LWFzaWFuLWludmFsaWQtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIHdl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZvbnRzL3BhcnNpbmcvZm9udC12YXJpYW50LXZhbGlk
LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzc29tL3Nl
cmlhbGl6ZS12YWx1ZXMtZXhwZWN0ZWQudHh0OgorCiAyMDIxLTA2LTE3ICBDaHJpcyBEdW1leiAg
PGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIHN1cHBvcnQgZm9yIElEQkN1cnNvci5y
ZXF1ZXN0CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2ZvbnQtdmFyaWFudC1wYXJzaW5n
LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2NzczMvZm9udC12YXJpYW50LXBhcnNpbmctZXhw
ZWN0ZWQudHh0CmluZGV4IDU1YWFkMjhkYzZkODAwM2U5MjVhMTBhM2NlNzJlNDJhZGNmZTk3MTku
LmI3NzRkOGFiMzYyNDJlY2VlMzNlMDMzMzRkZTU2M2JiNzdjMGRkMWEgMTAwNjQ0Ci0tLSBhL0xh
eW91dFRlc3RzL2NzczMvZm9udC12YXJpYW50LXBhcnNpbmctZXhwZWN0ZWQudHh0CisrKyBiL0xh
eW91dFRlc3RzL2NzczMvZm9udC12YXJpYW50LXBhcnNpbmctZXhwZWN0ZWQudHh0CkBAIC03NCwx
MyArNzQsMTMgQEAgUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZShkb2N1bWVudC5nZXRFbGVt
ZW50QnlJZCgndGVzdEVsZW1lbnQnKSkuZ2V0UHJvcGVydHkKIFBBU1Mgd2luZG93LmdldENvbXB1
dGVkU3R5bGUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3RFbGVtZW50JykpLmdldFByb3Bl
cnR5Q1NTVmFsdWUoJ2ZvbnQtdmFyaWFudC1lYXN0LWFzaWFuJykuY3NzVGV4dCBpcyAiZnVsbC13
aWR0aCIKIFBBU1Mgd2luZG93LmdldENvbXB1dGVkU3R5bGUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5
SWQoJ3Rlc3RFbGVtZW50JykpLmdldFByb3BlcnR5Q1NTVmFsdWUoJ2ZvbnQtdmFyaWFudC1lYXN0
LWFzaWFuJykuY3NzVGV4dCBpcyAicHJvcG9ydGlvbmFsLXdpZHRoIgogUEFTUyB3aW5kb3cuZ2V0
Q29tcHV0ZWRTdHlsZShkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGVzdEVsZW1lbnQnKSkuZ2V0
UHJvcGVydHlDU1NWYWx1ZSgnZm9udC12YXJpYW50LWVhc3QtYXNpYW4nKS5jc3NUZXh0IGlzICJy
dWJ5IgotUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZShkb2N1bWVudC5nZXRFbGVtZW50QnlJ
ZCgndGVzdEVsZW1lbnQnKSkuZ2V0UHJvcGVydHlDU1NWYWx1ZSgnZm9udC12YXJpYW50LWVhc3Qt
YXNpYW4nKS5jc3NUZXh0IGlzICJqaXM4MyIKLVBBU1Mgd2luZG93LmdldENvbXB1dGVkU3R5bGUo
ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3RFbGVtZW50JykpLmdldFByb3BlcnR5Q1NTVmFs
dWUoJ2ZvbnQtdmFyaWFudC1lYXN0LWFzaWFuJykuY3NzVGV4dCBpcyAidHJhZGl0aW9uYWwiCitQ
QVNTIHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0ZXN0
RWxlbWVudCcpKS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKCdmb250LXZhcmlhbnQtZWFzdC1hc2lhbicp
LmNzc1RleHQgaXMgIm5vcm1hbCIKK1BBU1Mgd2luZG93LmdldENvbXB1dGVkU3R5bGUoZG9jdW1l
bnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3RFbGVtZW50JykpLmdldFByb3BlcnR5Q1NTVmFsdWUoJ2Zv
bnQtdmFyaWFudC1lYXN0LWFzaWFuJykuY3NzVGV4dCBpcyAibm9ybWFsIgogUEFTUyB3aW5kb3cu
Z2V0Q29tcHV0ZWRTdHlsZShkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGVzdEVsZW1lbnQnKSku
Z2V0UHJvcGVydHlDU1NWYWx1ZSgnZm9udC12YXJpYW50LWVhc3QtYXNpYW4nKS5jc3NUZXh0IGlz
ICJ0cmFkaXRpb25hbCBmdWxsLXdpZHRoIgogUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZShk
b2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGVzdEVsZW1lbnQnKSkuZ2V0UHJvcGVydHlDU1NWYWx1
ZSgnZm9udC12YXJpYW50LWVhc3QtYXNpYW4nKS5jc3NUZXh0IGlzICJqaXMwNCBwcm9wb3J0aW9u
YWwtd2lkdGgiCiBQQVNTIHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKGRvY3VtZW50LmdldEVsZW1l
bnRCeUlkKCd0ZXN0RWxlbWVudCcpKS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKCdmb250LXZhcmlhbnQt
ZWFzdC1hc2lhbicpLmNzc1RleHQgaXMgImppczA0IHByb3BvcnRpb25hbC13aWR0aCBydWJ5Igog
UEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZShkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGVz
dEVsZW1lbnQnKSkuZ2V0UHJvcGVydHlDU1NWYWx1ZSgnZm9udC12YXJpYW50LWVhc3QtYXNpYW4n
KS5jc3NUZXh0IGlzICJqaXM4MyBydWJ5IgotUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZShk
b2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGVzdEVsZW1lbnQnKSkuZ2V0UHJvcGVydHlDU1NWYWx1
ZSgnZm9udC12YXJpYW50LWVhc3QtYXNpYW4nKS5jc3NUZXh0IGlzICJwcm9wb3J0aW9uYWwtd2lk
dGgiCitQQVNTIHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKGRvY3VtZW50LmdldEVsZW1lbnRCeUlk
KCd0ZXN0RWxlbWVudCcpKS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKCdmb250LXZhcmlhbnQtZWFzdC1h
c2lhbicpLmNzc1RleHQgaXMgIm5vcm1hbCIKIFBBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRy
dWUKIAogVEVTVCBDT01QTEVURQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9mb250LXZh
cmlhbnQtcGFyc2luZy5odG1sIGIvTGF5b3V0VGVzdHMvY3NzMy9mb250LXZhcmlhbnQtcGFyc2lu
Zy5odG1sCmluZGV4IGViNTFlNDI3NGNiMmY3YWI1NDZiZWU0YTdkYjZhYWJiN2E0MzZiZDkuLjlm
Y2Q4MTg1ODM1M2YzNGQ2YmM1ZjE5NWI0YTBiYWQyMDZkNjU4MzYgMTAwNjQ0Ci0tLSBhL0xheW91
dFRlc3RzL2NzczMvZm9udC12YXJpYW50LXBhcnNpbmcuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9j
c3MzL2ZvbnQtdmFyaWFudC1wYXJzaW5nLmh0bWwKQEAgLTk2LDEzICs5NiwxMyBAQCBydW5UZXN0
KCJmb250LXZhcmlhbnQtZWFzdC1hc2lhbiIsICJ0cmFkaXRpb25hbCIsICJ0cmFkaXRpb25hbCIp
OwogcnVuVGVzdCgiZm9udC12YXJpYW50LWVhc3QtYXNpYW4iLCAiZnVsbC13aWR0aCIsICJmdWxs
LXdpZHRoIik7CiBydW5UZXN0KCJmb250LXZhcmlhbnQtZWFzdC1hc2lhbiIsICJwcm9wb3J0aW9u
YWwtd2lkdGgiLCAicHJvcG9ydGlvbmFsLXdpZHRoIik7CiBydW5UZXN0KCJmb250LXZhcmlhbnQt
ZWFzdC1hc2lhbiIsICJydWJ5IiwgInJ1YnkiKTsKLXJ1blRlc3QoImZvbnQtdmFyaWFudC1lYXN0
LWFzaWFuIiwgImppczc4IGppczgzIiwgImppczgzIik7Ci1ydW5UZXN0KCJmb250LXZhcmlhbnQt
ZWFzdC1hc2lhbiIsICJqaXM5MCB0cmFkaXRpb25hbCIsICJ0cmFkaXRpb25hbCIpOworcnVuVGVz
dCgiZm9udC12YXJpYW50LWVhc3QtYXNpYW4iLCAiamlzNzggamlzODMiLCAibm9ybWFsIik7City
dW5UZXN0KCJmb250LXZhcmlhbnQtZWFzdC1hc2lhbiIsICJqaXM5MCB0cmFkaXRpb25hbCIsICJu
b3JtYWwiKTsKIHJ1blRlc3QoImZvbnQtdmFyaWFudC1lYXN0LWFzaWFuIiwgImZ1bGwtd2lkdGgg
dHJhZGl0aW9uYWwiLCAidHJhZGl0aW9uYWwgZnVsbC13aWR0aCIpOwogcnVuVGVzdCgiZm9udC12
YXJpYW50LWVhc3QtYXNpYW4iLCAiamlzMDQgcHJvcG9ydGlvbmFsLXdpZHRoIiwgImppczA0IHBy
b3BvcnRpb25hbC13aWR0aCIpOwogcnVuVGVzdCgiZm9udC12YXJpYW50LWVhc3QtYXNpYW4iLCAi
amlzMDQgcHJvcG9ydGlvbmFsLXdpZHRoIHJ1YnkiLCAiamlzMDQgcHJvcG9ydGlvbmFsLXdpZHRo
IHJ1YnkiKTsKIHJ1blRlc3QoImZvbnQtdmFyaWFudC1lYXN0LWFzaWFuIiwgImppczgzIHJ1Ynki
LCAiamlzODMgcnVieSIpOwotcnVuVGVzdCgiZm9udC12YXJpYW50LWVhc3QtYXNpYW4iLCAiZnVs
bC13aWR0aCBwcm9wb3J0aW9uYWwtd2lkdGgiLCAicHJvcG9ydGlvbmFsLXdpZHRoIik7CitydW5U
ZXN0KCJmb250LXZhcmlhbnQtZWFzdC1hc2lhbiIsICJmdWxsLXdpZHRoIHByb3BvcnRpb25hbC13
aWR0aCIsICJub3JtYWwiKTsKIDwvc2NyaXB0PgogPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy9q
cy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgogPC9ib2R5PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz
dHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZvbnRzL3BhcnNpbmcv
Zm9udC12YXJpYW50LWVhc3QtYXNpYW4taW52YWxpZC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0
cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZm9udHMvcGFyc2luZy9m
b250LXZhcmlhbnQtZWFzdC1hc2lhbi1pbnZhbGlkLWV4cGVjdGVkLnR4dAppbmRleCA1ZjZiOTU4
Njc3Nzg2Yzc4MmQ3ZWU4MWM1MDZkMjQ2YTkyMzg5ZTJlLi4yMGY2N2E0MzNjMjY0MGE0ZmY2MGJl
NWMxODM5MDhhMjkzMzZlOGJkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZm9udHMvcGFyc2luZy9mb250LXZhcmlhbnQtZWFz
dC1hc2lhbi1pbnZhbGlkLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZm9udHMvcGFyc2luZy9mb250LXZhcmlhbnQt
ZWFzdC1hc2lhbi1pbnZhbGlkLWV4cGVjdGVkLnR4dApAQCAtMSw1ICsxLDUgQEAKIAogUEFTUyBl
LnN0eWxlWydmb250LXZhcmlhbnQtZWFzdC1hc2lhbiddID0gIm5vcm1hbCBydWJ5IiBzaG91bGQg
bm90IHNldCB0aGUgcHJvcGVydHkgdmFsdWUKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50LWVh
c3QtYXNpYW4nXSA9ICJqaXM3OCBqaXM4MyIgc2hvdWxkIG5vdCBzZXQgdGhlIHByb3BlcnR5IHZh
bHVlIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkICIiIGJ1dCBnb3QgImppczgzIgotRkFJTCBlLnN0
eWxlWydmb250LXZhcmlhbnQtZWFzdC1hc2lhbiddID0gImZ1bGwtd2lkdGggcHJvcG9ydGlvbmFs
LXdpZHRoIiBzaG91bGQgbm90IHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X2VxdWFsczog
ZXhwZWN0ZWQgIiIgYnV0IGdvdCAicHJvcG9ydGlvbmFsLXdpZHRoIgorUEFTUyBlLnN0eWxlWydm
b250LXZhcmlhbnQtZWFzdC1hc2lhbiddID0gImppczc4IGppczgzIiBzaG91bGQgbm90IHNldCB0
aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50LWVhc3QtYXNpYW4n
XSA9ICJmdWxsLXdpZHRoIHByb3BvcnRpb25hbC13aWR0aCIgc2hvdWxkIG5vdCBzZXQgdGhlIHBy
b3BlcnR5IHZhbHVlCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mb250cy9wYXJzaW5nL2ZvbnQtdmFyaWFudC12YWxpZC1l
eHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3MtZm9udHMvcGFyc2luZy9mb250LXZhcmlhbnQtdmFsaWQtZXhwZWN0ZWQudHh0Cmlu
ZGV4IGZjMGJhMjYwYjAxZjkxMjJiOGIwMWVmZDRmZGRjZjQ5OGU2MWQyYzMuLmU4OTEyZDY2M2Q3
NWQwZjkwNDk1NzNlMmY5ZGJjZTlhY2M0MTE2ZWUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2lt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mb250cy9wYXJzaW5nL2ZvbnQt
dmFyaWFudC12YWxpZC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZvbnRzL3BhcnNpbmcvZm9udC12YXJpYW50LXZh
bGlkLWV4cGVjdGVkLnR4dApAQCAtMSwyMCArMSwyMCBAQAogCi1GQUlMIGUuc3R5bGVbJ2ZvbnQt
dmFyaWFudCddID0gIm5vcm1hbCIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0
X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUg
IiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAibm9uZSIgc2hvdWxkIHNldCB0aGUg
cHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQg
Z290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAi
Y29tbW9uLWxpZ2F0dXJlcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25v
dF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIK
LUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAibm8tY29tbW9uLWxpZ2F0dXJlcyIgc2hv
dWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNo
b3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12
YXJpYW50J10gPSAiZGlzY3JldGlvbmFyeS1saWdhdHVyZXMiIHNob3VsZCBzZXQgdGhlIHByb3Bl
cnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBk
aXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gIm5vLWRp
c2NyZXRpb25hcnktbGlnYXR1cmVzIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3Nl
cnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1
ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJoaXN0b3JpY2FsLWxpZ2F0dXJl
cyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3Bl
cnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsn
Zm9udC12YXJpYW50J10gPSAibm8taGlzdG9yaWNhbC1saWdhdHVyZXMiIHNob3VsZCBzZXQgdGhl
IHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0
IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0g
ImNvbnRleHR1YWwiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1
YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlM
IGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gIm5vLWNvbnRleHR1YWwiIHNob3VsZCBzZXQgdGhl
IHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0
IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0g
InNtYWxsLWNhcHMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1
YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlM
IGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImFsbC1zbWFsbC1jYXBzIiBzaG91bGQgc2V0IHRo
ZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNl
dCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9
ICJwZXRpdGUtY2FwcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9l
cXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZB
SUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiYWxsLXBldGl0ZS1jYXBzIiBzaG91bGQgc2V0
IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJl
IHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQn
XSA9ICJ1bmljYXNlIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2Vx
dWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJ
TCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJ0aXRsaW5nLWNhcHMiIHNob3VsZCBzZXQgdGhl
IHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0
IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0g
Im5vcm1hbCIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9u
dC12YXJpYW50J10gPSAibm9uZSIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1Mg
ZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiY29tbW9uLWxpZ2F0dXJlcyIgc2hvdWxkIHNldCB0
aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAibm8tY29t
bW9uLWxpZ2F0dXJlcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHls
ZVsnZm9udC12YXJpYW50J10gPSAiZGlzY3JldGlvbmFyeS1saWdhdHVyZXMiIHNob3VsZCBzZXQg
dGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gIm5vLWRp
c2NyZXRpb25hcnktbGlnYXR1cmVzIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFT
UyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJoaXN0b3JpY2FsLWxpZ2F0dXJlcyIgc2hvdWxk
IHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAi
bm8taGlzdG9yaWNhbC1saWdhdHVyZXMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQ
QVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImNvbnRleHR1YWwiIHNob3VsZCBzZXQgdGhl
IHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gIm5vLWNvbnRl
eHR1YWwiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQt
dmFyaWFudCddID0gInNtYWxsLWNhcHMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQ
QVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImFsbC1zbWFsbC1jYXBzIiBzaG91bGQgc2V0
IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJwZXRp
dGUtY2FwcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9u
dC12YXJpYW50J10gPSAiYWxsLXBldGl0ZS1jYXBzIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2
YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJ1bmljYXNlIiBzaG91bGQgc2V0
IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJ0aXRs
aW5nLWNhcHMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCiBGQUlMIGUuc3R5bGVbJ2Zv
bnQtdmFyaWFudCddID0gInN0eWxpc3RpYyhmbG93aW5nKSIgc2hvdWxkIHNldCB0aGUgcHJvcGVy
dHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRp
c2FsbG93ZWQgdmFsdWUgIiIKIEZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiaGlzdG9y
aWNhbC1mb3JtcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVh
bHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKIEZBSUwg
ZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAic3R5bGVzZXQoZmxvd2luZykiIHNob3VsZCBzZXQg
dGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUg
c2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCkBAIC0zMiwxNyArMzIsMTcgQEAgRkFJTCBlLnN0
eWxlWydmb250LXZhcmlhbnQnXSA9ICJkaWFnb25hbC1mcmFjdGlvbnMiIHNob3VsZCBzZXQgdGhl
IHByb3BlcnR5IHZhbHUKIEZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAic3RhY2tlZC1m
cmFjdGlvbnMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxz
OiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCiBGQUlMIGUu
c3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gIm9yZGluYWwiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5
IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNh
bGxvd2VkIHZhbHVlICIiCiBGQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInNsYXNoZWQt
emVybyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHBy
b3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHls
ZVsnZm9udC12YXJpYW50J10gPSAiamlzNzgiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVl
IGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2Vk
IHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImppczgzIiBzaG91bGQg
c2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxk
IGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlh
bnQnXSA9ICJqaXM5MCIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9l
cXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZB
SUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiamlzMDQiIHNob3VsZCBzZXQgdGhlIHByb3Bl
cnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBk
aXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInNpbXBs
aWZpZWQiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBw
cm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5
bGVbJ2ZvbnQtdmFyaWFudCddID0gInRyYWRpdGlvbmFsIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0
eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlz
YWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJmdWxsLXdp
ZHRoIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJv
cGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxl
Wydmb250LXZhcmlhbnQnXSA9ICJwcm9wb3J0aW9uYWwtd2lkdGgiIHNob3VsZCBzZXQgdGhlIHBy
b3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdv
dCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInJ1
YnkiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9w
ZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVb
J2ZvbnQtdmFyaWFudCddID0gInN1YiIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNz
ZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFs
dWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAic3VwZXIiIHNob3VsZCBzZXQg
dGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUg
c2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCdd
ID0gImppczc4IiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydm
b250LXZhcmlhbnQnXSA9ICJqaXM4MyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BB
U1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiamlzOTAiIHNob3VsZCBzZXQgdGhlIHByb3Bl
cnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImppczA0IiBzaG91bGQg
c2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJz
aW1wbGlmaWVkIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydm
b250LXZhcmlhbnQnXSA9ICJ0cmFkaXRpb25hbCIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFs
dWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiZnVsbC13aWR0aCIgc2hvdWxkIHNl
dCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAicHJv
cG9ydGlvbmFsLXdpZHRoIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0
eWxlWydmb250LXZhcmlhbnQnXSA9ICJydWJ5IiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1
ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJzdWIiIHNob3VsZCBzZXQgdGhlIHBy
b3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInN1cGVyIiBzaG91
bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQogRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9
ICJjb21tb24tbGlnYXR1cmVzIGRpc2NyZXRpb25hcnktbGlnYXR1cmVzIGhpc3RvcmljYWwtbGln
YXR1cmVzIGNvbnRleHR1YWwgc21hbGwtY2FwcyBzdHlsaXN0aWMoZmxvd2luZykgbGluaW5nLW51
bXMgcHJvcG9ydGlvbmFsLW51bXMgZGlhZ29uYWwtZnJhY3Rpb25zIG9yZGluYWwgc2xhc2hlZC16
ZXJvIGppczc4IGZ1bGwtd2lkdGggcnVieSBzdWIiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZh
bHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxv
d2VkIHZhbHVlICIiCiBGQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInN1cGVyIHByb3Bv
cnRpb25hbC13aWR0aCBqaXM4MyBzdGFja2VkLWZyYWN0aW9ucyB0YWJ1bGFyLW51bXMgb2xkc3R5
bGUtbnVtcyBoaXN0b3JpY2FsLWZvcm1zIGFsbC1zbWFsbC1jYXBzIG5vLWNvbnRleHR1YWwgbm8t
aGlzdG9yaWNhbC1saWdhdHVyZXMgbm8tZGlzY3JldGlvbmFyeS1saWdhdHVyZXMgbm8tY29tbW9u
LWxpZ2F0dXJlcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVh
bHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKIApkaWZm
IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3Nzb20vc2VyaWFsaXplLXZhbHVlcy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3NvbS9zZXJpYWxpemUtdmFsdWVzLWV4cGVj
dGVkLnR4dAppbmRleCA4MzBhZWViZmQ1ZDA0YWVhZTM3ODNjOWEzOTMyNjE3ODBmMDg5ZjQ0Li41
ZmExNmE0ZDAzYjkxOWIxZWY1MDhjODljMDBjYmFjODcxODc2ZTM1IDEwMDY0NAotLS0gYS9MYXlv
dXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3NvbS9zZXJpYWxp
emUtdmFsdWVzLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3NvbS9zZXJpYWxpemUtdmFsdWVzLWV4cGVjdGVkLnR4dApA
QCAtMzkzLDkgKzM5Myw5IEBAIFBBU1MgZm9udC1zdHlsZTogbm9ybWFsCiBQQVNTIGZvbnQtc3R5
bGU6IGl0YWxpYwogUEFTUyBmb250LXN0eWxlOiBvYmxpcXVlCiBQQVNTIGZvbnQtc3R5bGU6IGlu
aGVyaXQKLUZBSUwgZm9udC12YXJpYW50OiBub3JtYWwgYXNzZXJ0X2VxdWFsczogZm9udC12YXJp
YW50IHJhdyBpbmxpbmUgc3R5bGUgZGVjbGFyYXRpb24gZXhwZWN0ZWQgIm5vcm1hbCIgYnV0IGdv
dCAiIgotRkFJTCBmb250LXZhcmlhbnQ6IHNtYWxsLWNhcHMgYXNzZXJ0X2VxdWFsczogZm9udC12
YXJpYW50IHJhdyBpbmxpbmUgc3R5bGUgZGVjbGFyYXRpb24gZXhwZWN0ZWQgInNtYWxsLWNhcHMi
IGJ1dCBnb3QgIiIKLUZBSUwgZm9udC12YXJpYW50OiBpbmhlcml0IGFzc2VydF9lcXVhbHM6IGZv
bnQtdmFyaWFudCByYXcgaW5saW5lIHN0eWxlIGRlY2xhcmF0aW9uIGV4cGVjdGVkICJpbmhlcml0
IiBidXQgZ290ICIiCitQQVNTIGZvbnQtdmFyaWFudDogbm9ybWFsCitQQVNTIGZvbnQtdmFyaWFu
dDogc21hbGwtY2FwcworUEFTUyBmb250LXZhcmlhbnQ6IGluaGVyaXQKIFBBU1MgZm9udC13ZWln
aHQ6IG5vcm1hbAogUEFTUyBmb250LXdlaWdodDogYm9sZAogUEFTUyBmb250LXdlaWdodDogYm9s
ZGVyCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>431791</attachid>
            <date>2021-06-19 01:07:36 -0700</date>
            <delta_ts>2021-06-19 03:10:54 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-226770-20210619090734.patch</filename>
            <type>text/plain</type>
            <size>31660</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MDQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTIzZjg5ZDQyOWI2OWI2
OWQ4M2UxODk1ZWE0M2RkMjliMzRlMDU2Yy4uZDcyMGU3ZmZhOGY1NzU4MjM3NTNmNWVkZGExZDY5
OGVmYjY3NTI1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTA2LTE4ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ1NTT00gdGVzdCBmb3Igc2VyaWFs
aXppbmcgZm9udC12YXJpYW50IGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD0yMjY3NzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P
UFMhKS4KKworICAgICAgICBJbXBsZW1lbnQgZm9udC12YXJpYW50IHNlcmlhbGl6aW5nIGFjY29y
ZGluZyB0bzoKKyAgICAgICAgaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzc29tLyNzZXJpYWxp
emluZy1jc3MtdmFsdWVzCisKKyAgICAgICAgKiBjc3MvU3R5bGVQcm9wZXJ0aWVzLmNwcDoKKyAg
ICAgICAgKFdlYkNvcmU6OlN0eWxlUHJvcGVydGllczo6Z2V0UHJvcGVydHlWYWx1ZSBjb25zdCk6
CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVByb3BlcnRpZXM6OmFwcGVuZEZvbnRMb25naGFuZFZh
bHVlSWZFeHBsaWNpdCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVByb3BlcnRpZXM6
OmZvbnRWYXJpYW50VmFsdWUgY29uc3QpOgorICAgICAgICAqIGNzcy9TdHlsZVByb3BlcnRpZXMu
aDoKKyAgICAgICAgKiBjc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VyLmNwcDoKKyAgICAgICAg
KFdlYkNvcmU6OmNvbnN1bWVGb250VmFyaWFudEVhc3RBc2lhbik6CisgICAgICAgIChXZWJDb3Jl
OjpDU1NQcm9wZXJ0eVBhcnNlcjo6Y29uc3VtZUZvbnRWYXJpYW50U2hvcnRoYW5kKToKKwogMjAy
MS0wNi0xOCAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAg
ICAgW01TRV1bR1N0cmVhbWVyXSBTb3VuZGNsb3VkIHNlcnZlcyBNUDQgYXVkaW8gd2l0aCBlbXB0
eSB0ZmR0IGJveGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQcm9wZXJ0
aWVzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVByb3BlcnRpZXMuY3BwCmluZGV4IDZm
NmNlNDFkOTcxZmEyNDE1MTVmMGJjZTQ0ZWU1ZjgwZjQzYmRhZGEuLmVkN2FjN2NkZTY1ODgyYWNi
NDhlM2Y5NzFlMzMzMDRkODVlM2I3ZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9T
dHlsZVByb3BlcnRpZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVByb3BlcnRp
ZXMuY3BwCkBAIC0yMzcsNiArMjM3LDggQEAgU3RyaW5nIFN0eWxlUHJvcGVydGllczo6Z2V0UHJv
cGVydHlWYWx1ZShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQpIGNvbnN0CiAgICAgICAgIHJldHVy
biBnZXRBbGlnbm1lbnRTaG9ydGhhbmRWYWx1ZShwbGFjZVNlbGZTaG9ydGhhbmQoKSk7CiAgICAg
Y2FzZSBDU1NQcm9wZXJ0eUZvbnQ6CiAgICAgICAgIHJldHVybiBmb250VmFsdWUoKTsKKyAgICBj
YXNlIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQ6CisgICAgICAgIHJldHVybiBmb250VmFyaWFudFZh
bHVlKCk7CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUluc2V0OgogICAgICAgICByZXR1cm4gZ2V0NFZh
bHVlcyhpbnNldFNob3J0aGFuZCgpKTsKICAgICBjYXNlIENTU1Byb3BlcnR5SW5zZXRCbG9jazoK
QEAgLTM2Miw3ICszNjQsMTIgQEAgdm9pZCBTdHlsZVByb3BlcnRpZXM6OmFwcGVuZEZvbnRMb25n
aGFuZFZhbHVlSWZFeHBsaWNpdChDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQKICAgICBjYXNlIENT
U1Byb3BlcnR5Rm9udFN0eWxlOgogICAgICAgICBicmVhazsgLy8gTm8gcHJlZml4LgogICAgIGNh
c2UgQ1NTUHJvcGVydHlGb250RmFtaWx5OgorICAgIGNhc2UgQ1NTUHJvcGVydHlGb250VmFyaWFu
dEFsdGVybmF0ZXM6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50Q2FwczoKKyAgICBj
YXNlIENTU1Byb3BlcnR5Rm9udFZhcmlhbnRMaWdhdHVyZXM6CisgICAgY2FzZSBDU1NQcm9wZXJ0
eUZvbnRWYXJpYW50TnVtZXJpYzoKKyAgICBjYXNlIENTU1Byb3BlcnR5Rm9udFZhcmlhbnRQb3Np
dGlvbjoKKyAgICBjYXNlIENTU1Byb3BlcnR5Rm9udFZhcmlhbnRFYXN0QXNpYW46CiAgICAgY2Fz
ZSBDU1NQcm9wZXJ0eUZvbnRXZWlnaHQ6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRTdHJldGNo
OgogICAgICAgICBwcmVmaXggPSAnICc7CkBAIC00MTIsNiArNDE5LDIxIEBAIFN0cmluZyBTdHls
ZVByb3BlcnRpZXM6OmZvbnRWYWx1ZSgpIGNvbnN0CiAgICAgcmV0dXJuIHJlc3VsdC50b1N0cmlu
ZygpOwogfQogCitTdHJpbmcgU3R5bGVQcm9wZXJ0aWVzOjpmb250VmFyaWFudFZhbHVlKCkgY29u
c3QKK3sKKyAgICBTdHJpbmcgY29tbW9uVmFsdWU7CisgICAgU3RyaW5nQnVpbGRlciByZXN1bHQ7
CisgICAgYXBwZW5kRm9udExvbmdoYW5kVmFsdWVJZkV4cGxpY2l0KENTU1Byb3BlcnR5Rm9udFZh
cmlhbnRMaWdhdHVyZXMsIHJlc3VsdCwgY29tbW9uVmFsdWUpOworICAgIGlmIChpc0NTU1dpZGVW
YWx1ZUtleXdvcmQocmVzdWx0LnRvU3RyaW5nKCkpKQorICAgICAgICByZXR1cm4gcmVzdWx0LnRv
U3RyaW5nKCk7CisgICAgYXBwZW5kRm9udExvbmdoYW5kVmFsdWVJZkV4cGxpY2l0KENTU1Byb3Bl
cnR5Rm9udFZhcmlhbnRBbHRlcm5hdGVzLCByZXN1bHQsIGNvbW1vblZhbHVlKTsKKyAgICBhcHBl
bmRGb250TG9uZ2hhbmRWYWx1ZUlmRXhwbGljaXQoQ1NTUHJvcGVydHlGb250VmFyaWFudENhcHMs
IHJlc3VsdCwgY29tbW9uVmFsdWUpOworICAgIGFwcGVuZEZvbnRMb25naGFuZFZhbHVlSWZFeHBs
aWNpdChDU1NQcm9wZXJ0eUZvbnRWYXJpYW50RWFzdEFzaWFuLCByZXN1bHQsIGNvbW1vblZhbHVl
KTsKKyAgICBhcHBlbmRGb250TG9uZ2hhbmRWYWx1ZUlmRXhwbGljaXQoQ1NTUHJvcGVydHlGb250
VmFyaWFudE51bWVyaWMsIHJlc3VsdCwgY29tbW9uVmFsdWUpOworICAgIGFwcGVuZEZvbnRMb25n
aGFuZFZhbHVlSWZFeHBsaWNpdChDU1NQcm9wZXJ0eUZvbnRWYXJpYW50UG9zaXRpb24sIHJlc3Vs
dCwgY29tbW9uVmFsdWUpOworICAgIHJldHVybiByZXN1bHQudG9TdHJpbmcoKTsKK30KKwogU3Ry
aW5nIFN0eWxlUHJvcGVydGllczo6Z2V0MlZhbHVlcyhjb25zdCBTdHlsZVByb3BlcnR5U2hvcnRo
YW5kJiBzaG9ydGhhbmQpIGNvbnN0CiB7CiAgICAgLy8gQXNzdW1lIHRoZSBwcm9wZXJ0aWVzIGFy
ZSBpbiB0aGUgdXN1YWwgb3JkZXIgc3RhcnQsIGVuZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD
b3JlL2Nzcy9TdHlsZVByb3BlcnRpZXMuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVByb3Bl
cnRpZXMuaAppbmRleCBiMDIxYWViN2MyMDM3MGM5ZmMxN2JlNWZiNGM1ZmY2ZTQxN2ZiN2Q3Li5k
YTdkOWY2NmRmMGUwYzg2MWRlMWQ0NjJhYmM1MGM4ZGFhMzE0ODlmIDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViQ29yZS9jc3MvU3R5bGVQcm9wZXJ0aWVzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3Nz
L1N0eWxlUHJvcGVydGllcy5oCkBAIC0xNzIsNiArMTcyLDcgQEAgcHJpdmF0ZToKICAgICBTdHJp
bmcgZ2V0NFZhbHVlcyhjb25zdCBTdHlsZVByb3BlcnR5U2hvcnRoYW5kJikgY29uc3Q7CiAgICAg
U3RyaW5nIGJvcmRlclNwYWNpbmdWYWx1ZShjb25zdCBTdHlsZVByb3BlcnR5U2hvcnRoYW5kJikg
Y29uc3Q7CiAgICAgU3RyaW5nIGZvbnRWYWx1ZSgpIGNvbnN0OworICAgIFN0cmluZyBmb250VmFy
aWFudFZhbHVlKCkgY29uc3Q7CiAgICAgdm9pZCBhcHBlbmRGb250TG9uZ2hhbmRWYWx1ZUlmRXhw
bGljaXQoQ1NTUHJvcGVydHlJRCwgU3RyaW5nQnVpbGRlciYgcmVzdWx0LCBTdHJpbmcmIHZhbHVl
KSBjb25zdDsKIAogICAgIGZyaWVuZCBjbGFzcyBQcm9wZXJ0eVNldENTU1N0eWxlRGVjbGFyYXRp
b247CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFy
c2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3Bw
CmluZGV4IDg4NGYwNDE4ODZhZDM2MTEyZjc1OTM4MzUyOTExZDkzMTU5YzA4NmYuLjAxZGY0Yjlm
MzM5NTFkOTJhNGUzNDRlZWRjNmQ5MDFmZjBkMTIwZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl
L2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwCkBAIC02OTEsNDIgKzY5MSw2MCBAQCBz
dGF0aWMgUmVmUHRyPENTU1ZhbHVlPiBjb25zdW1lRm9udFZhcmlhbnRFYXN0QXNpYW4oQ1NTUGFy
c2VyVG9rZW5SYW5nZSYgcmFuZ2UpCiAgICAgICAgIHJldHVybiBjb25zdW1lSWRlbnQocmFuZ2Up
OwogICAgIAogICAgIFJlZlB0cjxDU1NWYWx1ZUxpc3Q+IHZhbHVlcyA9IENTU1ZhbHVlTGlzdDo6
Y3JlYXRlU3BhY2VTZXBhcmF0ZWQoKTsKLSAgICBGb250VmFyaWFudEVhc3RBc2lhblZhcmlhbnQg
dmFyaWFudCA9IEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6Tm9ybWFsOwotICAgIEZvbnRW
YXJpYW50RWFzdEFzaWFuV2lkdGggd2lkdGggPSBGb250VmFyaWFudEVhc3RBc2lhbldpZHRoOjpO
b3JtYWw7Ci0gICAgRm9udFZhcmlhbnRFYXN0QXNpYW5SdWJ5IHJ1YnkgPSBGb250VmFyaWFudEVh
c3RBc2lhblJ1Ynk6Ok5vcm1hbDsKKyAgICBzdGQ6Om9wdGlvbmFsPEZvbnRWYXJpYW50RWFzdEFz
aWFuVmFyaWFudD4gdmFyaWFudDsKKyAgICBzdGQ6Om9wdGlvbmFsPEZvbnRWYXJpYW50RWFzdEFz
aWFuV2lkdGg+IHdpZHRoOworICAgIHN0ZDo6b3B0aW9uYWw8Rm9udFZhcmlhbnRFYXN0QXNpYW5S
dWJ5PiBydWJ5OwogICAgIAogICAgIHdoaWxlICghcmFuZ2UuYXRFbmQoKSkgewogICAgICAgICBp
ZiAocmFuZ2UucGVlaygpLnR5cGUoKSAhPSBJZGVudFRva2VuKQogICAgICAgICAgICAgcmV0dXJu
IG51bGxwdHI7Ci0gICAgICAgIAorCiAgICAgICAgIGF1dG8gaWQgPSByYW5nZS5wZWVrKCkuaWQo
KTsKICAgICAgICAgCiAgICAgICAgIHN3aXRjaCAoaWQpIHsKICAgICAgICAgY2FzZSBDU1NWYWx1
ZUppczc4OgorICAgICAgICAgICAgaWYgKHZhcmlhbnQpCisgICAgICAgICAgICAgICAgcmV0dXJu
IG51bGxwdHI7CiAgICAgICAgICAgICB2YXJpYW50ID0gRm9udFZhcmlhbnRFYXN0QXNpYW5WYXJp
YW50OjpKaXM3ODsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIENTU1ZhbHVlSmlz
ODM6CisgICAgICAgICAgICBpZiAodmFyaWFudCkKKyAgICAgICAgICAgICAgICByZXR1cm4gbnVs
bHB0cjsKICAgICAgICAgICAgIHZhcmlhbnQgPSBGb250VmFyaWFudEVhc3RBc2lhblZhcmlhbnQ6
OkppczgzOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgQ1NTVmFsdWVKaXM5MDoK
KyAgICAgICAgICAgIGlmICh2YXJpYW50KQorICAgICAgICAgICAgICAgIHJldHVybiBudWxscHRy
OwogICAgICAgICAgICAgdmFyaWFudCA9IEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6Smlz
OTA7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBDU1NWYWx1ZUppczA0OgorICAg
ICAgICAgICAgaWYgKHZhcmlhbnQpCisgICAgICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAg
ICAgICAgICAgICB2YXJpYW50ID0gRm9udFZhcmlhbnRFYXN0QXNpYW5WYXJpYW50OjpKaXMwNDsK
ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIENTU1ZhbHVlU2ltcGxpZmllZDoKKyAg
ICAgICAgICAgIGlmICh2YXJpYW50KQorICAgICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwog
ICAgICAgICAgICAgdmFyaWFudCA9IEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6U2ltcGxp
ZmllZDsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIENTU1ZhbHVlVHJhZGl0aW9u
YWw6CisgICAgICAgICAgICBpZiAodmFyaWFudCkKKyAgICAgICAgICAgICAgICByZXR1cm4gbnVs
bHB0cjsKICAgICAgICAgICAgIHZhcmlhbnQgPSBGb250VmFyaWFudEVhc3RBc2lhblZhcmlhbnQ6
OlRyYWRpdGlvbmFsOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgQ1NTVmFsdWVG
dWxsV2lkdGg6CisgICAgICAgICAgICBpZiAod2lkdGgpCisgICAgICAgICAgICAgICAgcmV0dXJu
IG51bGxwdHI7CiAgICAgICAgICAgICB3aWR0aCA9IEZvbnRWYXJpYW50RWFzdEFzaWFuV2lkdGg6
OkZ1bGw7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBDU1NWYWx1ZVByb3BvcnRp
b25hbFdpZHRoOgorICAgICAgICAgICAgaWYgKHdpZHRoKQorICAgICAgICAgICAgICAgIHJldHVy
biBudWxscHRyOwogICAgICAgICAgICAgd2lkdGggPSBGb250VmFyaWFudEVhc3RBc2lhbldpZHRo
OjpQcm9wb3J0aW9uYWw7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBDU1NWYWx1
ZVJ1Ynk6CisgICAgICAgICAgICBpZiAocnVieSkKKyAgICAgICAgICAgICAgICByZXR1cm4gbnVs
bHB0cjsKICAgICAgICAgICAgIHJ1YnkgPSBGb250VmFyaWFudEVhc3RBc2lhblJ1Ynk6OlllczsK
ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBkZWZhdWx0OgpAQCAtNzM1LDQ2ICs3NTMsNTIg
QEAgc3RhdGljIFJlZlB0cjxDU1NWYWx1ZT4gY29uc3VtZUZvbnRWYXJpYW50RWFzdEFzaWFuKENT
U1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlKQogICAgICAgICAKICAgICAgICAgcmFuZ2UuY29uc3Vt
ZUluY2x1ZGluZ1doaXRlc3BhY2UoKTsKICAgICB9Ci0gICAgICAgIAotICAgIHN3aXRjaCAodmFy
aWFudCkgewotICAgIGNhc2UgRm9udFZhcmlhbnRFYXN0QXNpYW5WYXJpYW50OjpOb3JtYWw6Ci0g
ICAgICAgIGJyZWFrOwotICAgIGNhc2UgRm9udFZhcmlhbnRFYXN0QXNpYW5WYXJpYW50OjpKaXM3
ODoKLSAgICAgICAgdmFsdWVzLT5hcHBlbmQoQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVh
dGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVKaXM3OCkpOwotICAgICAgICBicmVhazsKLSAgICBj
YXNlIEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6SmlzODM6Ci0gICAgICAgIHZhbHVlcy0+
YXBwZW5kKENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENT
U1ZhbHVlSmlzODMpKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBGb250VmFyaWFudEVhc3RB
c2lhblZhcmlhbnQ6OkppczkwOgotICAgICAgICB2YWx1ZXMtPmFwcGVuZChDU1NWYWx1ZVBvb2w6
OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZUppczkwKSk7Ci0gICAg
ICAgIGJyZWFrOwotICAgIGNhc2UgRm9udFZhcmlhbnRFYXN0QXNpYW5WYXJpYW50OjpKaXMwNDoK
LSAgICAgICAgdmFsdWVzLT5hcHBlbmQoQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJ
ZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVKaXMwNCkpOwotICAgICAgICBicmVhazsKLSAgICBjYXNl
IEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6U2ltcGxpZmllZDoKLSAgICAgICAgdmFsdWVz
LT5hcHBlbmQoQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUo
Q1NTVmFsdWVTaW1wbGlmaWVkKSk7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgRm9udFZhcmlh
bnRFYXN0QXNpYW5WYXJpYW50OjpUcmFkaXRpb25hbDoKLSAgICAgICAgdmFsdWVzLT5hcHBlbmQo
Q1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVU
cmFkaXRpb25hbCkpOwotICAgICAgICBicmVhazsKKworICAgIGlmICh2YXJpYW50KSB7CisgICAg
ICAgIHN3aXRjaCAoKnZhcmlhbnQpIHsKKyAgICAgICAgY2FzZSBGb250VmFyaWFudEVhc3RBc2lh
blZhcmlhbnQ6Ok5vcm1hbDoKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIEZvbnRW
YXJpYW50RWFzdEFzaWFuVmFyaWFudDo6SmlzNzg6CisgICAgICAgICAgICB2YWx1ZXMtPmFwcGVu
ZChDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1
ZUppczc4KSk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBGb250VmFyaWFudEVh
c3RBc2lhblZhcmlhbnQ6OkppczgzOgorICAgICAgICAgICAgdmFsdWVzLT5hcHBlbmQoQ1NTVmFs
dWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVKaXM4Mykp
OworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgRm9udFZhcmlhbnRFYXN0QXNpYW5W
YXJpYW50OjpKaXM5MDoKKyAgICAgICAgICAgIHZhbHVlcy0+YXBwZW5kKENTU1ZhbHVlUG9vbDo6
c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlSmlzOTApKTsKKyAgICAg
ICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6
SmlzMDQ6CisgICAgICAgICAgICB2YWx1ZXMtPmFwcGVuZChDU1NWYWx1ZVBvb2w6OnNpbmdsZXRv
bigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZUppczA0KSk7CisgICAgICAgICAgICBi
cmVhazsKKyAgICAgICAgY2FzZSBGb250VmFyaWFudEVhc3RBc2lhblZhcmlhbnQ6OlNpbXBsaWZp
ZWQ6CisgICAgICAgICAgICB2YWx1ZXMtPmFwcGVuZChDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigp
LmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZVNpbXBsaWZpZWQpKTsKKyAgICAgICAgICAg
IGJyZWFrOworICAgICAgICBjYXNlIEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6VHJhZGl0
aW9uYWw6CisgICAgICAgICAgICB2YWx1ZXMtPmFwcGVuZChDU1NWYWx1ZVBvb2w6OnNpbmdsZXRv
bigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZVRyYWRpdGlvbmFsKSk7CisgICAgICAg
ICAgICBicmVhazsKKyAgICAgICAgfQogICAgIH0KLSAgICAgICAgCi0gICAgc3dpdGNoICh3aWR0
aCkgewotICAgIGNhc2UgRm9udFZhcmlhbnRFYXN0QXNpYW5XaWR0aDo6Tm9ybWFsOgotICAgICAg
ICBicmVhazsKLSAgICBjYXNlIEZvbnRWYXJpYW50RWFzdEFzaWFuV2lkdGg6OkZ1bGw6Ci0gICAg
ICAgIHZhbHVlcy0+YXBwZW5kKENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRp
ZmllclZhbHVlKENTU1ZhbHVlRnVsbFdpZHRoKSk7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2Ug
Rm9udFZhcmlhbnRFYXN0QXNpYW5XaWR0aDo6UHJvcG9ydGlvbmFsOgotICAgICAgICB2YWx1ZXMt
PmFwcGVuZChDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShD
U1NWYWx1ZVByb3BvcnRpb25hbFdpZHRoKSk7Ci0gICAgICAgIGJyZWFrOworCisgICAgaWYgKHdp
ZHRoKSB7CisgICAgICAgIHN3aXRjaCAoKndpZHRoKSB7CisgICAgICAgIGNhc2UgRm9udFZhcmlh
bnRFYXN0QXNpYW5XaWR0aDo6Tm9ybWFsOgorICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNh
c2UgRm9udFZhcmlhbnRFYXN0QXNpYW5XaWR0aDo6RnVsbDoKKyAgICAgICAgICAgIHZhbHVlcy0+
YXBwZW5kKENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENT
U1ZhbHVlRnVsbFdpZHRoKSk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBGb250
VmFyaWFudEVhc3RBc2lhbldpZHRoOjpQcm9wb3J0aW9uYWw6CisgICAgICAgICAgICB2YWx1ZXMt
PmFwcGVuZChDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShD
U1NWYWx1ZVByb3BvcnRpb25hbFdpZHRoKSk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAg
fQogICAgIH0KICAgICAgICAgCi0gICAgc3dpdGNoIChydWJ5KSB7Ci0gICAgY2FzZSBGb250VmFy
aWFudEVhc3RBc2lhblJ1Ynk6Ok5vcm1hbDoKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBGb250
VmFyaWFudEVhc3RBc2lhblJ1Ynk6OlllczoKLSAgICAgICAgdmFsdWVzLT5hcHBlbmQoQ1NTVmFs
dWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVSdWJ5KSk7
CisgICAgaWYgKHJ1YnkpIHsKKyAgICAgICAgc3dpdGNoICgqcnVieSkgeworICAgICAgICBjYXNl
IEZvbnRWYXJpYW50RWFzdEFzaWFuUnVieTo6Tm9ybWFsOgorICAgICAgICAgICAgYnJlYWs7Cisg
ICAgICAgIGNhc2UgRm9udFZhcmlhbnRFYXN0QXNpYW5SdWJ5OjpZZXM6CisgICAgICAgICAgICB2
YWx1ZXMtPmFwcGVuZChDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJW
YWx1ZShDU1NWYWx1ZVJ1YnkpKTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIGlmICghdmFsdWVz
LT5sZW5ndGgoKSkKQEAgLTQ5NDAsOSArNDk2NCw5IEBAIGJvb2wgQ1NTUHJvcGVydHlQYXJzZXI6
OmNvbnN1bWVGb250VmFyaWFudFNob3J0aGFuZChib29sIGltcG9ydGFudCkKIHsKICAgICBpZiAo
aWRlbnRNYXRjaGVzPENTU1ZhbHVlTm9ybWFsLCBDU1NWYWx1ZU5vbmU+KG1fcmFuZ2UucGVlaygp
LmlkKCkpKSB7CiAgICAgICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRMaWdh
dHVyZXMsIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIGNvbnN1bWVJZGVudChtX3JhbmdlKS5yZWxl
YXNlTm9uTnVsbCgpLCBpbXBvcnRhbnQpOwotICAgICAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0
eUZvbnRWYXJpYW50Q2FwcywgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgQ1NTVmFsdWVQb29sOjpz
aW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwpLCBpbXBvcnRh
bnQpOwotICAgICAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50RWFzdEFzaWFu
LCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0
ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCk7Ci0gICAgICAgIGFk
ZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRQb3NpdGlvbiwgQ1NTUHJvcGVydHlGb250
VmFyaWFudCwgQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUo
Q1NTVmFsdWVOb3JtYWwpLCBpbXBvcnRhbnQpOworICAgICAgICBhZGRQcm9wZXJ0eShDU1NQcm9w
ZXJ0eUZvbnRWYXJpYW50Q2FwcywgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgQ1NTVmFsdWVQb29s
OjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwpLCBpbXBv
cnRhbnQsIHRydWUpOworICAgICAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50
RWFzdEFzaWFuLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRv
bigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCwgdHJ1
ZSk7CisgICAgICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRQb3NpdGlvbiwg
Q1NTUHJvcGVydHlGb250VmFyaWFudCwgQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJ
ZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwpLCBpbXBvcnRhbnQsIHRydWUpOwogICAgICAg
ICByZXR1cm4gbV9yYW5nZS5hdEVuZCgpOwogICAgIH0KIApAQCAtNDk1Myw2ICs0OTc3LDggQEAg
Ym9vbCBDU1NQcm9wZXJ0eVBhcnNlcjo6Y29uc3VtZUZvbnRWYXJpYW50U2hvcnRoYW5kKGJvb2wg
aW1wb3J0YW50KQogICAgIFJlZlB0cjxDU1NWYWx1ZT4gZWFzdEFzaWFuVmFsdWU7CiAgICAgRm9u
dFZhcmlhbnRMaWdhdHVyZXNQYXJzZXIgbGlnYXR1cmVzUGFyc2VyOwogICAgIEZvbnRWYXJpYW50
TnVtZXJpY1BhcnNlciBudW1lcmljUGFyc2VyOworICAgIGJvb2wgaW1wbGljaXRMaWdhdHVyZXMg
PSB0cnVlOworICAgIGJvb2wgaW1wbGljaXROdW1lcmljID0gdHJ1ZTsKICAgICBkbyB7CiAgICAg
ICAgIGlmICghY2Fwc1ZhbHVlKSB7CiAgICAgICAgICAgICBjYXBzVmFsdWUgPSBjb25zdW1lRm9u
dFZhcmlhbnRDYXBzKG1fcmFuZ2UpOwpAQCAtNDk3NCw5ICs1MDAwLDE0IEBAIGJvb2wgQ1NTUHJv
cGVydHlQYXJzZXI6OmNvbnN1bWVGb250VmFyaWFudFNob3J0aGFuZChib29sIGltcG9ydGFudCkK
IAogICAgICAgICBGb250VmFyaWFudExpZ2F0dXJlc1BhcnNlcjo6UGFyc2VSZXN1bHQgbGlnYXR1
cmVzUGFyc2VSZXN1bHQgPSBsaWdhdHVyZXNQYXJzZXIuY29uc3VtZUxpZ2F0dXJlKG1fcmFuZ2Up
OwogICAgICAgICBGb250VmFyaWFudE51bWVyaWNQYXJzZXI6OlBhcnNlUmVzdWx0IG51bWVyaWNQ
YXJzZVJlc3VsdCA9IG51bWVyaWNQYXJzZXIuY29uc3VtZU51bWVyaWMobV9yYW5nZSk7Ci0gICAg
ICAgIGlmIChsaWdhdHVyZXNQYXJzZVJlc3VsdCA9PSBGb250VmFyaWFudExpZ2F0dXJlc1BhcnNl
cjo6UGFyc2VSZXN1bHQ6OkNvbnN1bWVkVmFsdWUKLSAgICAgICAgICAgIHx8IG51bWVyaWNQYXJz
ZVJlc3VsdCA9PSBGb250VmFyaWFudE51bWVyaWNQYXJzZXI6OlBhcnNlUmVzdWx0OjpDb25zdW1l
ZFZhbHVlKQorICAgICAgICBpZiAobGlnYXR1cmVzUGFyc2VSZXN1bHQgPT0gRm9udFZhcmlhbnRM
aWdhdHVyZXNQYXJzZXI6OlBhcnNlUmVzdWx0OjpDb25zdW1lZFZhbHVlKSB7CisgICAgICAgICAg
ICBpbXBsaWNpdExpZ2F0dXJlcyA9IGZhbHNlOworICAgICAgICAgICAgY29udGludWU7CisgICAg
ICAgIH0KKyAgICAgICAgaWYgKG51bWVyaWNQYXJzZVJlc3VsdCA9PSBGb250VmFyaWFudE51bWVy
aWNQYXJzZXI6OlBhcnNlUmVzdWx0OjpDb25zdW1lZFZhbHVlKSB7CisgICAgICAgICAgICBpbXBs
aWNpdE51bWVyaWMgPSBmYWxzZTsKICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CiAK
ICAgICAgICAgaWYgKGxpZ2F0dXJlc1BhcnNlUmVzdWx0ID09IEZvbnRWYXJpYW50TGlnYXR1cmVz
UGFyc2VyOjpQYXJzZVJlc3VsdDo6RGlzYWxsb3dlZFZhbHVlCiAgICAgICAgICAgICB8fCBudW1l
cmljUGFyc2VSZXN1bHQgPT0gRm9udFZhcmlhbnROdW1lcmljUGFyc2VyOjpQYXJzZVJlc3VsdDo6
RGlzYWxsb3dlZFZhbHVlKQpAQCAtNDk4NSw3ICs1MDE2LDcgQEAgYm9vbCBDU1NQcm9wZXJ0eVBh
cnNlcjo6Y29uc3VtZUZvbnRWYXJpYW50U2hvcnRoYW5kKGJvb2wgaW1wb3J0YW50KQogICAgICAg
ICBpZiAoIWVhc3RBc2lhblZhbHVlKSB7CiAgICAgICAgICAgICBlYXN0QXNpYW5WYWx1ZSA9IGNv
bnN1bWVGb250VmFyaWFudEVhc3RBc2lhbihtX3JhbmdlKTsKICAgICAgICAgICAgIGlmIChlYXN0
QXNpYW5WYWx1ZSkKLSAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgICAgIGNvbnRp
bnVlOwogICAgICAgICB9CiAKICAgICAgICAgLy8gU2F3IHNvbWUgdmFsdWUgdGhhdCBkaWRuJ3Qg
bWF0Y2ggYW55dGhpbmcgZWxzZS4KQEAgLTQ5OTMsMTUgKzUwMjQsMTkgQEAgYm9vbCBDU1NQcm9w
ZXJ0eVBhcnNlcjo6Y29uc3VtZUZvbnRWYXJpYW50U2hvcnRoYW5kKGJvb2wgaW1wb3J0YW50KQog
CiAgICAgfSB3aGlsZSAoIW1fcmFuZ2UuYXRFbmQoKSk7CiAKLSAgICBhZGRQcm9wZXJ0eShDU1NQ
cm9wZXJ0eUZvbnRWYXJpYW50TGlnYXR1cmVzLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBsaWdh
dHVyZXNQYXJzZXIuZmluYWxpemVWYWx1ZSgpLnJlbGVhc2VOb25OdWxsKCksIGltcG9ydGFudCk7
Ci0gICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlGb250VmFyaWFudE51bWVyaWMsIENTU1Byb3Bl
cnR5Rm9udFZhcmlhbnQsIG51bWVyaWNQYXJzZXIuZmluYWxpemVWYWx1ZSgpLnJlbGVhc2VOb25O
dWxsKCksIGltcG9ydGFudCk7Ci0gICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlGb250VmFyaWFu
dENhcHMsIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIGNhcHNWYWx1ZSA/IGNhcHNWYWx1ZS5yZWxl
YXNlTm9uTnVsbCgpIDogQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVy
VmFsdWUoQ1NTVmFsdWVOb3JtYWwpLCBpbXBvcnRhbnQpOwotICAgIGFkZFByb3BlcnR5KENTU1By
b3BlcnR5Rm9udFZhcmlhbnRBbHRlcm5hdGVzLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBhbHRl
cm5hdGVzVmFsdWUgPyBhbHRlcm5hdGVzVmFsdWUucmVsZWFzZU5vbk51bGwoKSA6IENTU1ZhbHVl
UG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlTm9ybWFsKSwg
aW1wb3J0YW50KTsKLSAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50UG9zaXRp
b24sIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIHBvc2l0aW9uVmFsdWUgPyBwb3NpdGlvblZhbHVl
LnJlbGVhc2VOb25OdWxsKCkgOiBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50
aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCk7Ci0gICAgCisgICAgYWRkUHJv
cGVydHkoQ1NTUHJvcGVydHlGb250VmFyaWFudExpZ2F0dXJlcywgQ1NTUHJvcGVydHlGb250VmFy
aWFudCwgbGlnYXR1cmVzUGFyc2VyLmZpbmFsaXplVmFsdWUoKS5yZWxlYXNlTm9uTnVsbCgpLCBp
bXBvcnRhbnQsIGltcGxpY2l0TGlnYXR1cmVzKTsKKyAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0
eUZvbnRWYXJpYW50TnVtZXJpYywgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgbnVtZXJpY1BhcnNl
ci5maW5hbGl6ZVZhbHVlKCkucmVsZWFzZU5vbk51bGwoKSwgaW1wb3J0YW50LCBpbXBsaWNpdE51
bWVyaWMpOworICAgIGJvb2wgaW1wbGljaXRDYXBzID0gIWNhcHNWYWx1ZTsKKyAgICBhZGRQcm9w
ZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50Q2FwcywgQ1NTUHJvcGVydHlGb250VmFyaWFudCwg
Y2Fwc1ZhbHVlID8gY2Fwc1ZhbHVlLnJlbGVhc2VOb25OdWxsKCkgOiBDU1NWYWx1ZVBvb2w6OnNp
bmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFu
dCwgaW1wbGljaXRDYXBzKTsKKyAgICBib29sIGltcGxpY2l0QWx0ZXJuYXRlcyA9IGFsdGVybmF0
ZXNWYWx1ZTsKKyAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50QWx0ZXJuYXRl
cywgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgYWx0ZXJuYXRlc1ZhbHVlID8gYWx0ZXJuYXRlc1Zh
bHVlLnJlbGVhc2VOb25OdWxsKCkgOiBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlk
ZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCwgaW1wbGljaXRBbHRlcm5h
dGVzKTsKKyAgICBib29sIGltcGxpY2l0UG9zaXRpb24gPSAhcG9zaXRpb25WYWx1ZTsKKyAgICBh
ZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50UG9zaXRpb24sIENTU1Byb3BlcnR5Rm9u
dFZhcmlhbnQsIHBvc2l0aW9uVmFsdWUgPyBwb3NpdGlvblZhbHVlLnJlbGVhc2VOb25OdWxsKCkg
OiBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1
ZU5vcm1hbCksIGltcG9ydGFudCwgaW1wbGljaXRQb3NpdGlvbik7CisKKyAgICBib29sIGltcGxp
Y2l0RWFzdEFzaWFuID0gIWVhc3RBc2lhblZhbHVlOwogICAgIGlmICghZWFzdEFzaWFuVmFsdWUp
CiAgICAgICAgIGVhc3RBc2lhblZhbHVlID0gQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVh
dGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwpOwotICAgIGFkZFByb3BlcnR5KENTU1By
b3BlcnR5Rm9udFZhcmlhbnRFYXN0QXNpYW4sIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIGVhc3RB
c2lhblZhbHVlLnJlbGVhc2VOb25OdWxsKCksIGltcG9ydGFudCk7CisgICAgYWRkUHJvcGVydHko
Q1NTUHJvcGVydHlGb250VmFyaWFudEVhc3RBc2lhbiwgQ1NTUHJvcGVydHlGb250VmFyaWFudCwg
ZWFzdEFzaWFuVmFsdWUucmVsZWFzZU5vbk51bGwoKSwgaW1wb3J0YW50LCBpbXBsaWNpdEVhc3RB
c2lhbik7CiAgICAgCiAgICAgcmV0dXJuIHRydWU7CiB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0
cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMmFmM2JkMzY1ODUxZmFk
MWM0YTRkOTZkYmYzMzAzZmI1YTJhZmI2My4uMGI2OWFhYWVlYTE5NzY5YTEyYjgyNTM5MjJhZDVj
N2MzOTQ1Zjc4NyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91
dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIxLTA2LTE4ICBSb2IgQnVpcyAg
PHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ1NTT00gdGVzdCBmb3Igc2VyaWFsaXppbmcg
Zm9udC12YXJpYW50IGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df
YnVnLmNnaT9pZD0yMjY3NzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICAqIGNzczMvZm9udC12YXJpYW50LXBhcnNpbmctZXhwZWN0ZWQudHh0OgorICAg
ICAgICAqIGNzczMvZm9udC12YXJpYW50LXBhcnNpbmcuaHRtbDoKKwogMjAyMS0wNi0xOCAgUnlh
biBIYWRkYWQgIDxyeWFuaGFkZGFkQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TIDE0LVNpbXVs
YXRvciBXSzJdIGVkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDQuaHRt
bCBpcyBhIGZsYWt5IGZhaWx1cmUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz
Yy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IDli
ZGUzM2RkMTM5ZmU4YjE5OGMzMzBmNmJhYWE4NjNhNGI5OTFlOWYuLjg1MzVhM2Y0MmI1OTE5Nzc4
MDg5NzI2NmU0MzRlZDY1ZjE2ZjY3OTEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVk
L3czYy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpA
QCAtMSwzICsxLDE2IEBACisyMDIxLTA2LTE4ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+
CisKKyAgICAgICAgQ1NTT00gdGVzdCBmb3Igc2VyaWFsaXppbmcgZm9udC12YXJpYW50IGZhaWxz
CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjY3NzAK
KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGUg
aW1wcm92ZWQgdGVzdCByZXN1bHQuCisKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy1mb250cy9wYXJzaW5nL2ZvbnQtdmFyaWFudC1lYXN0LWFzaWFuLWludmFsaWQtZXhwZWN0
ZWQudHh0OgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZvbnRzL3BhcnNp
bmcvZm9udC12YXJpYW50LXZhbGlkLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiB3ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzc29tL3NlcmlhbGl6ZS12YWx1ZXMtZXhwZWN0ZWQudHh0OgorCiAyMDIx
LTA2LTE3ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIHN1
cHBvcnQgZm9yIElEQkN1cnNvci5yZXF1ZXN0CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3Mz
L2ZvbnQtdmFyaWFudC1wYXJzaW5nLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2NzczMvZm9u
dC12YXJpYW50LXBhcnNpbmctZXhwZWN0ZWQudHh0CmluZGV4IDU1YWFkMjhkYzZkODAwM2U5MjVh
MTBhM2NlNzJlNDJhZGNmZTk3MTkuLmI3NzRkOGFiMzYyNDJlY2VlMzNlMDMzMzRkZTU2M2JiNzdj
MGRkMWEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2NzczMvZm9udC12YXJpYW50LXBhcnNpbmct
ZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2NzczMvZm9udC12YXJpYW50LXBhcnNpbmct
ZXhwZWN0ZWQudHh0CkBAIC03NCwxMyArNzQsMTMgQEAgUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRT
dHlsZShkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGVzdEVsZW1lbnQnKSkuZ2V0UHJvcGVydHkK
IFBBU1Mgd2luZG93LmdldENvbXB1dGVkU3R5bGUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rl
c3RFbGVtZW50JykpLmdldFByb3BlcnR5Q1NTVmFsdWUoJ2ZvbnQtdmFyaWFudC1lYXN0LWFzaWFu
JykuY3NzVGV4dCBpcyAiZnVsbC13aWR0aCIKIFBBU1Mgd2luZG93LmdldENvbXB1dGVkU3R5bGUo
ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3RFbGVtZW50JykpLmdldFByb3BlcnR5Q1NTVmFs
dWUoJ2ZvbnQtdmFyaWFudC1lYXN0LWFzaWFuJykuY3NzVGV4dCBpcyAicHJvcG9ydGlvbmFsLXdp
ZHRoIgogUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZShkb2N1bWVudC5nZXRFbGVtZW50QnlJ
ZCgndGVzdEVsZW1lbnQnKSkuZ2V0UHJvcGVydHlDU1NWYWx1ZSgnZm9udC12YXJpYW50LWVhc3Qt
YXNpYW4nKS5jc3NUZXh0IGlzICJydWJ5IgotUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZShk
b2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGVzdEVsZW1lbnQnKSkuZ2V0UHJvcGVydHlDU1NWYWx1
ZSgnZm9udC12YXJpYW50LWVhc3QtYXNpYW4nKS5jc3NUZXh0IGlzICJqaXM4MyIKLVBBU1Mgd2lu
ZG93LmdldENvbXB1dGVkU3R5bGUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3RFbGVtZW50
JykpLmdldFByb3BlcnR5Q1NTVmFsdWUoJ2ZvbnQtdmFyaWFudC1lYXN0LWFzaWFuJykuY3NzVGV4
dCBpcyAidHJhZGl0aW9uYWwiCitQQVNTIHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKGRvY3VtZW50
LmdldEVsZW1lbnRCeUlkKCd0ZXN0RWxlbWVudCcpKS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKCdmb250
LXZhcmlhbnQtZWFzdC1hc2lhbicpLmNzc1RleHQgaXMgIm5vcm1hbCIKK1BBU1Mgd2luZG93Lmdl
dENvbXB1dGVkU3R5bGUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3RFbGVtZW50JykpLmdl
dFByb3BlcnR5Q1NTVmFsdWUoJ2ZvbnQtdmFyaWFudC1lYXN0LWFzaWFuJykuY3NzVGV4dCBpcyAi
bm9ybWFsIgogUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZShkb2N1bWVudC5nZXRFbGVtZW50
QnlJZCgndGVzdEVsZW1lbnQnKSkuZ2V0UHJvcGVydHlDU1NWYWx1ZSgnZm9udC12YXJpYW50LWVh
c3QtYXNpYW4nKS5jc3NUZXh0IGlzICJ0cmFkaXRpb25hbCBmdWxsLXdpZHRoIgogUEFTUyB3aW5k
b3cuZ2V0Q29tcHV0ZWRTdHlsZShkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGVzdEVsZW1lbnQn
KSkuZ2V0UHJvcGVydHlDU1NWYWx1ZSgnZm9udC12YXJpYW50LWVhc3QtYXNpYW4nKS5jc3NUZXh0
IGlzICJqaXMwNCBwcm9wb3J0aW9uYWwtd2lkdGgiCiBQQVNTIHdpbmRvdy5nZXRDb21wdXRlZFN0
eWxlKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0ZXN0RWxlbWVudCcpKS5nZXRQcm9wZXJ0eUNT
U1ZhbHVlKCdmb250LXZhcmlhbnQtZWFzdC1hc2lhbicpLmNzc1RleHQgaXMgImppczA0IHByb3Bv
cnRpb25hbC13aWR0aCBydWJ5IgogUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZShkb2N1bWVu
dC5nZXRFbGVtZW50QnlJZCgndGVzdEVsZW1lbnQnKSkuZ2V0UHJvcGVydHlDU1NWYWx1ZSgnZm9u
dC12YXJpYW50LWVhc3QtYXNpYW4nKS5jc3NUZXh0IGlzICJqaXM4MyBydWJ5IgotUEFTUyB3aW5k
b3cuZ2V0Q29tcHV0ZWRTdHlsZShkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGVzdEVsZW1lbnQn
KSkuZ2V0UHJvcGVydHlDU1NWYWx1ZSgnZm9udC12YXJpYW50LWVhc3QtYXNpYW4nKS5jc3NUZXh0
IGlzICJwcm9wb3J0aW9uYWwtd2lkdGgiCitQQVNTIHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKGRv
Y3VtZW50LmdldEVsZW1lbnRCeUlkKCd0ZXN0RWxlbWVudCcpKS5nZXRQcm9wZXJ0eUNTU1ZhbHVl
KCdmb250LXZhcmlhbnQtZWFzdC1hc2lhbicpLmNzc1RleHQgaXMgIm5vcm1hbCIKIFBBU1Mgc3Vj
Y2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKIAogVEVTVCBDT01QTEVURQpkaWZmIC0tZ2l0IGEvTGF5
b3V0VGVzdHMvY3NzMy9mb250LXZhcmlhbnQtcGFyc2luZy5odG1sIGIvTGF5b3V0VGVzdHMvY3Nz
My9mb250LXZhcmlhbnQtcGFyc2luZy5odG1sCmluZGV4IGViNTFlNDI3NGNiMmY3YWI1NDZiZWU0
YTdkYjZhYWJiN2E0MzZiZDkuLjlmY2Q4MTg1ODM1M2YzNGQ2YmM1ZjE5NWI0YTBiYWQyMDZkNjU4
MzYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2NzczMvZm9udC12YXJpYW50LXBhcnNpbmcuaHRt
bAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL2ZvbnQtdmFyaWFudC1wYXJzaW5nLmh0bWwKQEAgLTk2
LDEzICs5NiwxMyBAQCBydW5UZXN0KCJmb250LXZhcmlhbnQtZWFzdC1hc2lhbiIsICJ0cmFkaXRp
b25hbCIsICJ0cmFkaXRpb25hbCIpOwogcnVuVGVzdCgiZm9udC12YXJpYW50LWVhc3QtYXNpYW4i
LCAiZnVsbC13aWR0aCIsICJmdWxsLXdpZHRoIik7CiBydW5UZXN0KCJmb250LXZhcmlhbnQtZWFz
dC1hc2lhbiIsICJwcm9wb3J0aW9uYWwtd2lkdGgiLCAicHJvcG9ydGlvbmFsLXdpZHRoIik7CiBy
dW5UZXN0KCJmb250LXZhcmlhbnQtZWFzdC1hc2lhbiIsICJydWJ5IiwgInJ1YnkiKTsKLXJ1blRl
c3QoImZvbnQtdmFyaWFudC1lYXN0LWFzaWFuIiwgImppczc4IGppczgzIiwgImppczgzIik7Ci1y
dW5UZXN0KCJmb250LXZhcmlhbnQtZWFzdC1hc2lhbiIsICJqaXM5MCB0cmFkaXRpb25hbCIsICJ0
cmFkaXRpb25hbCIpOworcnVuVGVzdCgiZm9udC12YXJpYW50LWVhc3QtYXNpYW4iLCAiamlzNzgg
amlzODMiLCAibm9ybWFsIik7CitydW5UZXN0KCJmb250LXZhcmlhbnQtZWFzdC1hc2lhbiIsICJq
aXM5MCB0cmFkaXRpb25hbCIsICJub3JtYWwiKTsKIHJ1blRlc3QoImZvbnQtdmFyaWFudC1lYXN0
LWFzaWFuIiwgImZ1bGwtd2lkdGggdHJhZGl0aW9uYWwiLCAidHJhZGl0aW9uYWwgZnVsbC13aWR0
aCIpOwogcnVuVGVzdCgiZm9udC12YXJpYW50LWVhc3QtYXNpYW4iLCAiamlzMDQgcHJvcG9ydGlv
bmFsLXdpZHRoIiwgImppczA0IHByb3BvcnRpb25hbC13aWR0aCIpOwogcnVuVGVzdCgiZm9udC12
YXJpYW50LWVhc3QtYXNpYW4iLCAiamlzMDQgcHJvcG9ydGlvbmFsLXdpZHRoIHJ1YnkiLCAiamlz
MDQgcHJvcG9ydGlvbmFsLXdpZHRoIHJ1YnkiKTsKIHJ1blRlc3QoImZvbnQtdmFyaWFudC1lYXN0
LWFzaWFuIiwgImppczgzIHJ1YnkiLCAiamlzODMgcnVieSIpOwotcnVuVGVzdCgiZm9udC12YXJp
YW50LWVhc3QtYXNpYW4iLCAiZnVsbC13aWR0aCBwcm9wb3J0aW9uYWwtd2lkdGgiLCAicHJvcG9y
dGlvbmFsLXdpZHRoIik7CitydW5UZXN0KCJmb250LXZhcmlhbnQtZWFzdC1hc2lhbiIsICJmdWxs
LXdpZHRoIHByb3BvcnRpb25hbC13aWR0aCIsICJub3JtYWwiKTsKIDwvc2NyaXB0PgogPHNjcmlw
dCBzcmM9Ii4uL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgogPC9ib2R5Pgpk
aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLWZvbnRzL3BhcnNpbmcvZm9udC12YXJpYW50LWVhc3QtYXNpYW4taW52YWxpZC1leHBl
Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3MtZm9udHMvcGFyc2luZy9mb250LXZhcmlhbnQtZWFzdC1hc2lhbi1pbnZhbGlkLWV4cGVj
dGVkLnR4dAppbmRleCA1ZjZiOTU4Njc3Nzg2Yzc4MmQ3ZWU4MWM1MDZkMjQ2YTkyMzg5ZTJlLi4y
MGY2N2E0MzNjMjY0MGE0ZmY2MGJlNWMxODM5MDhhMjkzMzZlOGJkIDEwMDY0NAotLS0gYS9MYXlv
dXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZm9udHMvcGFy
c2luZy9mb250LXZhcmlhbnQtZWFzdC1hc2lhbi1pbnZhbGlkLWV4cGVjdGVkLnR4dAorKysgYi9M
YXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZm9udHMv
cGFyc2luZy9mb250LXZhcmlhbnQtZWFzdC1hc2lhbi1pbnZhbGlkLWV4cGVjdGVkLnR4dApAQCAt
MSw1ICsxLDUgQEAKIAogUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQtZWFzdC1hc2lhbiddID0g
Im5vcm1hbCBydWJ5IiBzaG91bGQgbm90IHNldCB0aGUgcHJvcGVydHkgdmFsdWUKLUZBSUwgZS5z
dHlsZVsnZm9udC12YXJpYW50LWVhc3QtYXNpYW4nXSA9ICJqaXM3OCBqaXM4MyIgc2hvdWxkIG5v
dCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkICIiIGJ1dCBn
b3QgImppczgzIgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQtZWFzdC1hc2lhbiddID0gImZ1
bGwtd2lkdGggcHJvcG9ydGlvbmFsLXdpZHRoIiBzaG91bGQgbm90IHNldCB0aGUgcHJvcGVydHkg
dmFsdWUgYXNzZXJ0X2VxdWFsczogZXhwZWN0ZWQgIiIgYnV0IGdvdCAicHJvcG9ydGlvbmFsLXdp
ZHRoIgorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQtZWFzdC1hc2lhbiddID0gImppczc4IGpp
czgzIiBzaG91bGQgbm90IHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9u
dC12YXJpYW50LWVhc3QtYXNpYW4nXSA9ICJmdWxsLXdpZHRoIHByb3BvcnRpb25hbC13aWR0aCIg
c2hvdWxkIG5vdCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCiAKZGlmZiAtLWdpdCBhL0xheW91dFRl
c3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mb250cy9wYXJzaW5n
L2ZvbnQtdmFyaWFudC12YWxpZC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZm9udHMvcGFyc2luZy9mb250LXZhcmlhbnQt
dmFsaWQtZXhwZWN0ZWQudHh0CmluZGV4IGZjMGJhMjYwYjAxZjkxMjJiOGIwMWVmZDRmZGRjZjQ5
OGU2MWQyYzMuLmU4OTEyZDY2M2Q3NWQwZjkwNDk1NzNlMmY5ZGJjZTlhY2M0MTE2ZWUgMTAwNjQ0
Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1mb250cy9wYXJzaW5nL2ZvbnQtdmFyaWFudC12YWxpZC1leHBlY3RlZC50eHQKKysrIGIvTGF5
b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZvbnRzL3Bh
cnNpbmcvZm9udC12YXJpYW50LXZhbGlkLWV4cGVjdGVkLnR4dApAQCAtMSwyMCArMSwyMCBAQAog
Ci1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gIm5vcm1hbCIgc2hvdWxkIHNldCB0aGUg
cHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQg
Z290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAi
bm9uZSIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHBy
b3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHls
ZVsnZm9udC12YXJpYW50J10gPSAiY29tbW9uLWxpZ2F0dXJlcyIgc2hvdWxkIHNldCB0aGUgcHJv
cGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290
IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAibm8t
Y29tbW9uLWxpZ2F0dXJlcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25v
dF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIK
LUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiZGlzY3JldGlvbmFyeS1saWdhdHVyZXMi
IHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0
eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2Zv
bnQtdmFyaWFudCddID0gIm5vLWRpc2NyZXRpb25hcnktbGlnYXR1cmVzIiBzaG91bGQgc2V0IHRo
ZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNl
dCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9
ICJoaXN0b3JpY2FsLWxpZ2F0dXJlcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNz
ZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFs
dWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAibm8taGlzdG9yaWNhbC1saWdh
dHVyZXMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBw
cm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5
bGVbJ2ZvbnQtdmFyaWFudCddID0gImNvbnRleHR1YWwiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5
IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNh
bGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gIm5vLWNvbnRl
eHR1YWwiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBw
cm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5
bGVbJ2ZvbnQtdmFyaWFudCddID0gInNtYWxsLWNhcHMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5
IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNh
bGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImFsbC1zbWFs
bC1jYXBzIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczog
cHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0
eWxlWydmb250LXZhcmlhbnQnXSA9ICJwZXRpdGUtY2FwcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVy
dHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRp
c2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiYWxsLXBl
dGl0ZS1jYXBzIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFs
czogcHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBl
LnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJ1bmljYXNlIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0
eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlz
YWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJ0aXRsaW5n
LWNhcHMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBw
cm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCitQQVNTIGUuc3R5
bGVbJ2ZvbnQtdmFyaWFudCddID0gIm5vcm1hbCIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFs
dWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAibm9uZSIgc2hvdWxkIHNldCB0aGUg
cHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiY29tbW9uLWxp
Z2F0dXJlcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9u
dC12YXJpYW50J10gPSAibm8tY29tbW9uLWxpZ2F0dXJlcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVy
dHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiZGlzY3JldGlvbmFyeS1s
aWdhdHVyZXMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2Zv
bnQtdmFyaWFudCddID0gIm5vLWRpc2NyZXRpb25hcnktbGlnYXR1cmVzIiBzaG91bGQgc2V0IHRo
ZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJoaXN0b3Jp
Y2FsLWxpZ2F0dXJlcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHls
ZVsnZm9udC12YXJpYW50J10gPSAibm8taGlzdG9yaWNhbC1saWdhdHVyZXMiIHNob3VsZCBzZXQg
dGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImNvbnRl
eHR1YWwiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQt
dmFyaWFudCddID0gIm5vLWNvbnRleHR1YWwiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVl
CitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInNtYWxsLWNhcHMiIHNob3VsZCBzZXQg
dGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImFsbC1z
bWFsbC1jYXBzIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydm
b250LXZhcmlhbnQnXSA9ICJwZXRpdGUtY2FwcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFs
dWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiYWxsLXBldGl0ZS1jYXBzIiBzaG91
bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9
ICJ1bmljYXNlIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydm
b250LXZhcmlhbnQnXSA9ICJ0aXRsaW5nLWNhcHMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZh
bHVlCiBGQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInN0eWxpc3RpYyhmbG93aW5nKSIg
c2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5
IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKIEZBSUwgZS5zdHlsZVsnZm9u
dC12YXJpYW50J10gPSAiaGlzdG9yaWNhbC1mb3JtcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkg
dmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2Fs
bG93ZWQgdmFsdWUgIiIKIEZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAic3R5bGVzZXQo
Zmxvd2luZykiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxz
OiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCkBAIC0zMiwx
NyArMzIsMTcgQEAgRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJkaWFnb25hbC1mcmFj
dGlvbnMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHUKIEZBSUwgZS5zdHlsZVsnZm9udC12
YXJpYW50J10gPSAic3RhY2tlZC1mcmFjdGlvbnMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZh
bHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxv
d2VkIHZhbHVlICIiCiBGQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gIm9yZGluYWwiIHNo
b3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBz
aG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCiBGQUlMIGUuc3R5bGVbJ2ZvbnQt
dmFyaWFudCddID0gInNsYXNoZWQtemVybyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUg
YXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQg
dmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiamlzNzgiIHNob3VsZCBz
ZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQg
YmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFu
dCddID0gImppczgzIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2Vx
dWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJ
TCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJqaXM5MCIgc2hvdWxkIHNldCB0aGUgcHJvcGVy
dHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRp
c2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiamlzMDQi
IHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0
eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2Zv
bnQtdmFyaWFudCddID0gInNpbXBsaWZpZWQiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVl
IGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2Vk
IHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInRyYWRpdGlvbmFsIiBz
aG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkg
c2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydmb250
LXZhcmlhbnQnXSA9ICJmdWxsLXdpZHRoIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBh
c3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2
YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJwcm9wb3J0aW9uYWwtd2lk
dGgiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9w
ZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVb
J2ZvbnQtdmFyaWFudCddID0gInJ1YnkiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFz
c2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZh
bHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInN1YiIgc2hvdWxkIHNldCB0
aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBz
ZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10g
PSAic3VwZXIiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxz
OiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCitQQVNTIGUu
c3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImppczc4IiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2
YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJqaXM4MyIgc2hvdWxkIHNldCB0
aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiamlzOTAi
IHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFu
dCddID0gImppczA0IiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxl
Wydmb250LXZhcmlhbnQnXSA9ICJzaW1wbGlmaWVkIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2
YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJ0cmFkaXRpb25hbCIgc2hvdWxk
IHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAi
ZnVsbC13aWR0aCIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsn
Zm9udC12YXJpYW50J10gPSAicHJvcG9ydGlvbmFsLXdpZHRoIiBzaG91bGQgc2V0IHRoZSBwcm9w
ZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJydWJ5IiBzaG91bGQg
c2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJz
dWIiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFy
aWFudCddID0gInN1cGVyIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQogRkFJTCBlLnN0
eWxlWydmb250LXZhcmlhbnQnXSA9ICJjb21tb24tbGlnYXR1cmVzIGRpc2NyZXRpb25hcnktbGln
YXR1cmVzIGhpc3RvcmljYWwtbGlnYXR1cmVzIGNvbnRleHR1YWwgc21hbGwtY2FwcyBzdHlsaXN0
aWMoZmxvd2luZykgbGluaW5nLW51bXMgcHJvcG9ydGlvbmFsLW51bXMgZGlhZ29uYWwtZnJhY3Rp
b25zIG9yZGluYWwgc2xhc2hlZC16ZXJvIGppczc4IGZ1bGwtd2lkdGggcnVieSBzdWIiIHNob3Vs
ZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91
bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCiBGQUlMIGUuc3R5bGVbJ2ZvbnQtdmFy
aWFudCddID0gInN1cGVyIHByb3BvcnRpb25hbC13aWR0aCBqaXM4MyBzdGFja2VkLWZyYWN0aW9u
cyB0YWJ1bGFyLW51bXMgb2xkc3R5bGUtbnVtcyBoaXN0b3JpY2FsLWZvcm1zIGFsbC1zbWFsbC1j
YXBzIG5vLWNvbnRleHR1YWwgbm8taGlzdG9yaWNhbC1saWdhdHVyZXMgbm8tZGlzY3JldGlvbmFy
eS1saWdhdHVyZXMgbm8tY29tbW9uLWxpZ2F0dXJlcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkg
dmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2Fs
bG93ZWQgdmFsdWUgIiIKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nzb20vc2VyaWFsaXplLXZhbHVlcy1leHBlY3RlZC50eHQg
Yi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3NvbS9z
ZXJpYWxpemUtdmFsdWVzLWV4cGVjdGVkLnR4dAppbmRleCA4MzBhZWViZmQ1ZDA0YWVhZTM3ODNj
OWEzOTMyNjE3ODBmMDg5ZjQ0Li41ZmExNmE0ZDAzYjkxOWIxZWY1MDhjODljMDBjYmFjODcxODc2
ZTM1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3NvbS9zZXJpYWxpemUtdmFsdWVzLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRU
ZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3NvbS9zZXJpYWxpemUt
dmFsdWVzLWV4cGVjdGVkLnR4dApAQCAtMzkzLDkgKzM5Myw5IEBAIFBBU1MgZm9udC1zdHlsZTog
bm9ybWFsCiBQQVNTIGZvbnQtc3R5bGU6IGl0YWxpYwogUEFTUyBmb250LXN0eWxlOiBvYmxpcXVl
CiBQQVNTIGZvbnQtc3R5bGU6IGluaGVyaXQKLUZBSUwgZm9udC12YXJpYW50OiBub3JtYWwgYXNz
ZXJ0X2VxdWFsczogZm9udC12YXJpYW50IHJhdyBpbmxpbmUgc3R5bGUgZGVjbGFyYXRpb24gZXhw
ZWN0ZWQgIm5vcm1hbCIgYnV0IGdvdCAiIgotRkFJTCBmb250LXZhcmlhbnQ6IHNtYWxsLWNhcHMg
YXNzZXJ0X2VxdWFsczogZm9udC12YXJpYW50IHJhdyBpbmxpbmUgc3R5bGUgZGVjbGFyYXRpb24g
ZXhwZWN0ZWQgInNtYWxsLWNhcHMiIGJ1dCBnb3QgIiIKLUZBSUwgZm9udC12YXJpYW50OiBpbmhl
cml0IGFzc2VydF9lcXVhbHM6IGZvbnQtdmFyaWFudCByYXcgaW5saW5lIHN0eWxlIGRlY2xhcmF0
aW9uIGV4cGVjdGVkICJpbmhlcml0IiBidXQgZ290ICIiCitQQVNTIGZvbnQtdmFyaWFudDogbm9y
bWFsCitQQVNTIGZvbnQtdmFyaWFudDogc21hbGwtY2FwcworUEFTUyBmb250LXZhcmlhbnQ6IGlu
aGVyaXQKIFBBU1MgZm9udC13ZWlnaHQ6IG5vcm1hbAogUEFTUyBmb250LXdlaWdodDogYm9sZAog
UEFTUyBmb250LXdlaWdodDogYm9sZGVyCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>431793</attachid>
            <date>2021-06-19 03:10:58 -0700</date>
            <delta_ts>2021-06-21 10:11:38 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-226770-20210619111057.patch</filename>
            <type>text/plain</type>
            <size>34077</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MDQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTIzZjg5ZDQyOWI2OWI2
OWQ4M2UxODk1ZWE0M2RkMjliMzRlMDU2Yy4uZDcyMGU3ZmZhOGY1NzU4MjM3NTNmNWVkZGExZDY5
OGVmYjY3NTI1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTA2LTE4ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ1NTT00gdGVzdCBmb3Igc2VyaWFs
aXppbmcgZm9udC12YXJpYW50IGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD0yMjY3NzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P
UFMhKS4KKworICAgICAgICBJbXBsZW1lbnQgZm9udC12YXJpYW50IHNlcmlhbGl6aW5nIGFjY29y
ZGluZyB0bzoKKyAgICAgICAgaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzc29tLyNzZXJpYWxp
emluZy1jc3MtdmFsdWVzCisKKyAgICAgICAgKiBjc3MvU3R5bGVQcm9wZXJ0aWVzLmNwcDoKKyAg
ICAgICAgKFdlYkNvcmU6OlN0eWxlUHJvcGVydGllczo6Z2V0UHJvcGVydHlWYWx1ZSBjb25zdCk6
CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVByb3BlcnRpZXM6OmFwcGVuZEZvbnRMb25naGFuZFZh
bHVlSWZFeHBsaWNpdCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVByb3BlcnRpZXM6
OmZvbnRWYXJpYW50VmFsdWUgY29uc3QpOgorICAgICAgICAqIGNzcy9TdHlsZVByb3BlcnRpZXMu
aDoKKyAgICAgICAgKiBjc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VyLmNwcDoKKyAgICAgICAg
KFdlYkNvcmU6OmNvbnN1bWVGb250VmFyaWFudEVhc3RBc2lhbik6CisgICAgICAgIChXZWJDb3Jl
OjpDU1NQcm9wZXJ0eVBhcnNlcjo6Y29uc3VtZUZvbnRWYXJpYW50U2hvcnRoYW5kKToKKwogMjAy
MS0wNi0xOCAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAg
ICAgW01TRV1bR1N0cmVhbWVyXSBTb3VuZGNsb3VkIHNlcnZlcyBNUDQgYXVkaW8gd2l0aCBlbXB0
eSB0ZmR0IGJveGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQcm9wZXJ0
aWVzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVByb3BlcnRpZXMuY3BwCmluZGV4IDZm
NmNlNDFkOTcxZmEyNDE1MTVmMGJjZTQ0ZWU1ZjgwZjQzYmRhZGEuLmVkN2FjN2NkZTY1ODgyYWNi
NDhlM2Y5NzFlMzMzMDRkODVlM2I3ZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9T
dHlsZVByb3BlcnRpZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVByb3BlcnRp
ZXMuY3BwCkBAIC0yMzcsNiArMjM3LDggQEAgU3RyaW5nIFN0eWxlUHJvcGVydGllczo6Z2V0UHJv
cGVydHlWYWx1ZShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQpIGNvbnN0CiAgICAgICAgIHJldHVy
biBnZXRBbGlnbm1lbnRTaG9ydGhhbmRWYWx1ZShwbGFjZVNlbGZTaG9ydGhhbmQoKSk7CiAgICAg
Y2FzZSBDU1NQcm9wZXJ0eUZvbnQ6CiAgICAgICAgIHJldHVybiBmb250VmFsdWUoKTsKKyAgICBj
YXNlIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQ6CisgICAgICAgIHJldHVybiBmb250VmFyaWFudFZh
bHVlKCk7CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUluc2V0OgogICAgICAgICByZXR1cm4gZ2V0NFZh
bHVlcyhpbnNldFNob3J0aGFuZCgpKTsKICAgICBjYXNlIENTU1Byb3BlcnR5SW5zZXRCbG9jazoK
QEAgLTM2Miw3ICszNjQsMTIgQEAgdm9pZCBTdHlsZVByb3BlcnRpZXM6OmFwcGVuZEZvbnRMb25n
aGFuZFZhbHVlSWZFeHBsaWNpdChDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQKICAgICBjYXNlIENT
U1Byb3BlcnR5Rm9udFN0eWxlOgogICAgICAgICBicmVhazsgLy8gTm8gcHJlZml4LgogICAgIGNh
c2UgQ1NTUHJvcGVydHlGb250RmFtaWx5OgorICAgIGNhc2UgQ1NTUHJvcGVydHlGb250VmFyaWFu
dEFsdGVybmF0ZXM6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50Q2FwczoKKyAgICBj
YXNlIENTU1Byb3BlcnR5Rm9udFZhcmlhbnRMaWdhdHVyZXM6CisgICAgY2FzZSBDU1NQcm9wZXJ0
eUZvbnRWYXJpYW50TnVtZXJpYzoKKyAgICBjYXNlIENTU1Byb3BlcnR5Rm9udFZhcmlhbnRQb3Np
dGlvbjoKKyAgICBjYXNlIENTU1Byb3BlcnR5Rm9udFZhcmlhbnRFYXN0QXNpYW46CiAgICAgY2Fz
ZSBDU1NQcm9wZXJ0eUZvbnRXZWlnaHQ6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRTdHJldGNo
OgogICAgICAgICBwcmVmaXggPSAnICc7CkBAIC00MTIsNiArNDE5LDIxIEBAIFN0cmluZyBTdHls
ZVByb3BlcnRpZXM6OmZvbnRWYWx1ZSgpIGNvbnN0CiAgICAgcmV0dXJuIHJlc3VsdC50b1N0cmlu
ZygpOwogfQogCitTdHJpbmcgU3R5bGVQcm9wZXJ0aWVzOjpmb250VmFyaWFudFZhbHVlKCkgY29u
c3QKK3sKKyAgICBTdHJpbmcgY29tbW9uVmFsdWU7CisgICAgU3RyaW5nQnVpbGRlciByZXN1bHQ7
CisgICAgYXBwZW5kRm9udExvbmdoYW5kVmFsdWVJZkV4cGxpY2l0KENTU1Byb3BlcnR5Rm9udFZh
cmlhbnRMaWdhdHVyZXMsIHJlc3VsdCwgY29tbW9uVmFsdWUpOworICAgIGlmIChpc0NTU1dpZGVW
YWx1ZUtleXdvcmQocmVzdWx0LnRvU3RyaW5nKCkpKQorICAgICAgICByZXR1cm4gcmVzdWx0LnRv
U3RyaW5nKCk7CisgICAgYXBwZW5kRm9udExvbmdoYW5kVmFsdWVJZkV4cGxpY2l0KENTU1Byb3Bl
cnR5Rm9udFZhcmlhbnRBbHRlcm5hdGVzLCByZXN1bHQsIGNvbW1vblZhbHVlKTsKKyAgICBhcHBl
bmRGb250TG9uZ2hhbmRWYWx1ZUlmRXhwbGljaXQoQ1NTUHJvcGVydHlGb250VmFyaWFudENhcHMs
IHJlc3VsdCwgY29tbW9uVmFsdWUpOworICAgIGFwcGVuZEZvbnRMb25naGFuZFZhbHVlSWZFeHBs
aWNpdChDU1NQcm9wZXJ0eUZvbnRWYXJpYW50RWFzdEFzaWFuLCByZXN1bHQsIGNvbW1vblZhbHVl
KTsKKyAgICBhcHBlbmRGb250TG9uZ2hhbmRWYWx1ZUlmRXhwbGljaXQoQ1NTUHJvcGVydHlGb250
VmFyaWFudE51bWVyaWMsIHJlc3VsdCwgY29tbW9uVmFsdWUpOworICAgIGFwcGVuZEZvbnRMb25n
aGFuZFZhbHVlSWZFeHBsaWNpdChDU1NQcm9wZXJ0eUZvbnRWYXJpYW50UG9zaXRpb24sIHJlc3Vs
dCwgY29tbW9uVmFsdWUpOworICAgIHJldHVybiByZXN1bHQudG9TdHJpbmcoKTsKK30KKwogU3Ry
aW5nIFN0eWxlUHJvcGVydGllczo6Z2V0MlZhbHVlcyhjb25zdCBTdHlsZVByb3BlcnR5U2hvcnRo
YW5kJiBzaG9ydGhhbmQpIGNvbnN0CiB7CiAgICAgLy8gQXNzdW1lIHRoZSBwcm9wZXJ0aWVzIGFy
ZSBpbiB0aGUgdXN1YWwgb3JkZXIgc3RhcnQsIGVuZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD
b3JlL2Nzcy9TdHlsZVByb3BlcnRpZXMuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVByb3Bl
cnRpZXMuaAppbmRleCBiMDIxYWViN2MyMDM3MGM5ZmMxN2JlNWZiNGM1ZmY2ZTQxN2ZiN2Q3Li5k
YTdkOWY2NmRmMGUwYzg2MWRlMWQ0NjJhYmM1MGM4ZGFhMzE0ODlmIDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViQ29yZS9jc3MvU3R5bGVQcm9wZXJ0aWVzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3Nz
L1N0eWxlUHJvcGVydGllcy5oCkBAIC0xNzIsNiArMTcyLDcgQEAgcHJpdmF0ZToKICAgICBTdHJp
bmcgZ2V0NFZhbHVlcyhjb25zdCBTdHlsZVByb3BlcnR5U2hvcnRoYW5kJikgY29uc3Q7CiAgICAg
U3RyaW5nIGJvcmRlclNwYWNpbmdWYWx1ZShjb25zdCBTdHlsZVByb3BlcnR5U2hvcnRoYW5kJikg
Y29uc3Q7CiAgICAgU3RyaW5nIGZvbnRWYWx1ZSgpIGNvbnN0OworICAgIFN0cmluZyBmb250VmFy
aWFudFZhbHVlKCkgY29uc3Q7CiAgICAgdm9pZCBhcHBlbmRGb250TG9uZ2hhbmRWYWx1ZUlmRXhw
bGljaXQoQ1NTUHJvcGVydHlJRCwgU3RyaW5nQnVpbGRlciYgcmVzdWx0LCBTdHJpbmcmIHZhbHVl
KSBjb25zdDsKIAogICAgIGZyaWVuZCBjbGFzcyBQcm9wZXJ0eVNldENTU1N0eWxlRGVjbGFyYXRp
b247CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFy
c2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3Bw
CmluZGV4IDg4NGYwNDE4ODZhZDM2MTEyZjc1OTM4MzUyOTExZDkzMTU5YzA4NmYuLmU3YzIyZTlk
NTc5OTM5MDRjYzMwNTM1YTllNzc3YjY1NjU1YTIzY2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl
L2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwCkBAIC02OTEsNDIgKzY5MSw2MCBAQCBz
dGF0aWMgUmVmUHRyPENTU1ZhbHVlPiBjb25zdW1lRm9udFZhcmlhbnRFYXN0QXNpYW4oQ1NTUGFy
c2VyVG9rZW5SYW5nZSYgcmFuZ2UpCiAgICAgICAgIHJldHVybiBjb25zdW1lSWRlbnQocmFuZ2Up
OwogICAgIAogICAgIFJlZlB0cjxDU1NWYWx1ZUxpc3Q+IHZhbHVlcyA9IENTU1ZhbHVlTGlzdDo6
Y3JlYXRlU3BhY2VTZXBhcmF0ZWQoKTsKLSAgICBGb250VmFyaWFudEVhc3RBc2lhblZhcmlhbnQg
dmFyaWFudCA9IEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6Tm9ybWFsOwotICAgIEZvbnRW
YXJpYW50RWFzdEFzaWFuV2lkdGggd2lkdGggPSBGb250VmFyaWFudEVhc3RBc2lhbldpZHRoOjpO
b3JtYWw7Ci0gICAgRm9udFZhcmlhbnRFYXN0QXNpYW5SdWJ5IHJ1YnkgPSBGb250VmFyaWFudEVh
c3RBc2lhblJ1Ynk6Ok5vcm1hbDsKKyAgICBzdGQ6Om9wdGlvbmFsPEZvbnRWYXJpYW50RWFzdEFz
aWFuVmFyaWFudD4gdmFyaWFudDsKKyAgICBzdGQ6Om9wdGlvbmFsPEZvbnRWYXJpYW50RWFzdEFz
aWFuV2lkdGg+IHdpZHRoOworICAgIHN0ZDo6b3B0aW9uYWw8Rm9udFZhcmlhbnRFYXN0QXNpYW5S
dWJ5PiBydWJ5OwogICAgIAogICAgIHdoaWxlICghcmFuZ2UuYXRFbmQoKSkgewogICAgICAgICBp
ZiAocmFuZ2UucGVlaygpLnR5cGUoKSAhPSBJZGVudFRva2VuKQogICAgICAgICAgICAgcmV0dXJu
IG51bGxwdHI7Ci0gICAgICAgIAorCiAgICAgICAgIGF1dG8gaWQgPSByYW5nZS5wZWVrKCkuaWQo
KTsKICAgICAgICAgCiAgICAgICAgIHN3aXRjaCAoaWQpIHsKICAgICAgICAgY2FzZSBDU1NWYWx1
ZUppczc4OgorICAgICAgICAgICAgaWYgKHZhcmlhbnQpCisgICAgICAgICAgICAgICAgcmV0dXJu
IG51bGxwdHI7CiAgICAgICAgICAgICB2YXJpYW50ID0gRm9udFZhcmlhbnRFYXN0QXNpYW5WYXJp
YW50OjpKaXM3ODsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIENTU1ZhbHVlSmlz
ODM6CisgICAgICAgICAgICBpZiAodmFyaWFudCkKKyAgICAgICAgICAgICAgICByZXR1cm4gbnVs
bHB0cjsKICAgICAgICAgICAgIHZhcmlhbnQgPSBGb250VmFyaWFudEVhc3RBc2lhblZhcmlhbnQ6
OkppczgzOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgQ1NTVmFsdWVKaXM5MDoK
KyAgICAgICAgICAgIGlmICh2YXJpYW50KQorICAgICAgICAgICAgICAgIHJldHVybiBudWxscHRy
OwogICAgICAgICAgICAgdmFyaWFudCA9IEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6Smlz
OTA7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBDU1NWYWx1ZUppczA0OgorICAg
ICAgICAgICAgaWYgKHZhcmlhbnQpCisgICAgICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAg
ICAgICAgICAgICB2YXJpYW50ID0gRm9udFZhcmlhbnRFYXN0QXNpYW5WYXJpYW50OjpKaXMwNDsK
ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIENTU1ZhbHVlU2ltcGxpZmllZDoKKyAg
ICAgICAgICAgIGlmICh2YXJpYW50KQorICAgICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwog
ICAgICAgICAgICAgdmFyaWFudCA9IEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6U2ltcGxp
ZmllZDsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIENTU1ZhbHVlVHJhZGl0aW9u
YWw6CisgICAgICAgICAgICBpZiAodmFyaWFudCkKKyAgICAgICAgICAgICAgICByZXR1cm4gbnVs
bHB0cjsKICAgICAgICAgICAgIHZhcmlhbnQgPSBGb250VmFyaWFudEVhc3RBc2lhblZhcmlhbnQ6
OlRyYWRpdGlvbmFsOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgQ1NTVmFsdWVG
dWxsV2lkdGg6CisgICAgICAgICAgICBpZiAod2lkdGgpCisgICAgICAgICAgICAgICAgcmV0dXJu
IG51bGxwdHI7CiAgICAgICAgICAgICB3aWR0aCA9IEZvbnRWYXJpYW50RWFzdEFzaWFuV2lkdGg6
OkZ1bGw7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBDU1NWYWx1ZVByb3BvcnRp
b25hbFdpZHRoOgorICAgICAgICAgICAgaWYgKHdpZHRoKQorICAgICAgICAgICAgICAgIHJldHVy
biBudWxscHRyOwogICAgICAgICAgICAgd2lkdGggPSBGb250VmFyaWFudEVhc3RBc2lhbldpZHRo
OjpQcm9wb3J0aW9uYWw7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBDU1NWYWx1
ZVJ1Ynk6CisgICAgICAgICAgICBpZiAocnVieSkKKyAgICAgICAgICAgICAgICByZXR1cm4gbnVs
bHB0cjsKICAgICAgICAgICAgIHJ1YnkgPSBGb250VmFyaWFudEVhc3RBc2lhblJ1Ynk6OlllczsK
ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBkZWZhdWx0OgpAQCAtNzM1LDQ2ICs3NTMsNTIg
QEAgc3RhdGljIFJlZlB0cjxDU1NWYWx1ZT4gY29uc3VtZUZvbnRWYXJpYW50RWFzdEFzaWFuKENT
U1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlKQogICAgICAgICAKICAgICAgICAgcmFuZ2UuY29uc3Vt
ZUluY2x1ZGluZ1doaXRlc3BhY2UoKTsKICAgICB9Ci0gICAgICAgIAotICAgIHN3aXRjaCAodmFy
aWFudCkgewotICAgIGNhc2UgRm9udFZhcmlhbnRFYXN0QXNpYW5WYXJpYW50OjpOb3JtYWw6Ci0g
ICAgICAgIGJyZWFrOwotICAgIGNhc2UgRm9udFZhcmlhbnRFYXN0QXNpYW5WYXJpYW50OjpKaXM3
ODoKLSAgICAgICAgdmFsdWVzLT5hcHBlbmQoQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVh
dGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVKaXM3OCkpOwotICAgICAgICBicmVhazsKLSAgICBj
YXNlIEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6SmlzODM6Ci0gICAgICAgIHZhbHVlcy0+
YXBwZW5kKENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENT
U1ZhbHVlSmlzODMpKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBGb250VmFyaWFudEVhc3RB
c2lhblZhcmlhbnQ6OkppczkwOgotICAgICAgICB2YWx1ZXMtPmFwcGVuZChDU1NWYWx1ZVBvb2w6
OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZUppczkwKSk7Ci0gICAg
ICAgIGJyZWFrOwotICAgIGNhc2UgRm9udFZhcmlhbnRFYXN0QXNpYW5WYXJpYW50OjpKaXMwNDoK
LSAgICAgICAgdmFsdWVzLT5hcHBlbmQoQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJ
ZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVKaXMwNCkpOwotICAgICAgICBicmVhazsKLSAgICBjYXNl
IEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6U2ltcGxpZmllZDoKLSAgICAgICAgdmFsdWVz
LT5hcHBlbmQoQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUo
Q1NTVmFsdWVTaW1wbGlmaWVkKSk7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgRm9udFZhcmlh
bnRFYXN0QXNpYW5WYXJpYW50OjpUcmFkaXRpb25hbDoKLSAgICAgICAgdmFsdWVzLT5hcHBlbmQo
Q1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVU
cmFkaXRpb25hbCkpOwotICAgICAgICBicmVhazsKKworICAgIGlmICh2YXJpYW50KSB7CisgICAg
ICAgIHN3aXRjaCAoKnZhcmlhbnQpIHsKKyAgICAgICAgY2FzZSBGb250VmFyaWFudEVhc3RBc2lh
blZhcmlhbnQ6Ok5vcm1hbDoKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIEZvbnRW
YXJpYW50RWFzdEFzaWFuVmFyaWFudDo6SmlzNzg6CisgICAgICAgICAgICB2YWx1ZXMtPmFwcGVu
ZChDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1
ZUppczc4KSk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBGb250VmFyaWFudEVh
c3RBc2lhblZhcmlhbnQ6OkppczgzOgorICAgICAgICAgICAgdmFsdWVzLT5hcHBlbmQoQ1NTVmFs
dWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVKaXM4Mykp
OworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgRm9udFZhcmlhbnRFYXN0QXNpYW5W
YXJpYW50OjpKaXM5MDoKKyAgICAgICAgICAgIHZhbHVlcy0+YXBwZW5kKENTU1ZhbHVlUG9vbDo6
c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlSmlzOTApKTsKKyAgICAg
ICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6
SmlzMDQ6CisgICAgICAgICAgICB2YWx1ZXMtPmFwcGVuZChDU1NWYWx1ZVBvb2w6OnNpbmdsZXRv
bigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZUppczA0KSk7CisgICAgICAgICAgICBi
cmVhazsKKyAgICAgICAgY2FzZSBGb250VmFyaWFudEVhc3RBc2lhblZhcmlhbnQ6OlNpbXBsaWZp
ZWQ6CisgICAgICAgICAgICB2YWx1ZXMtPmFwcGVuZChDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigp
LmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZVNpbXBsaWZpZWQpKTsKKyAgICAgICAgICAg
IGJyZWFrOworICAgICAgICBjYXNlIEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6VHJhZGl0
aW9uYWw6CisgICAgICAgICAgICB2YWx1ZXMtPmFwcGVuZChDU1NWYWx1ZVBvb2w6OnNpbmdsZXRv
bigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZVRyYWRpdGlvbmFsKSk7CisgICAgICAg
ICAgICBicmVhazsKKyAgICAgICAgfQogICAgIH0KLSAgICAgICAgCi0gICAgc3dpdGNoICh3aWR0
aCkgewotICAgIGNhc2UgRm9udFZhcmlhbnRFYXN0QXNpYW5XaWR0aDo6Tm9ybWFsOgotICAgICAg
ICBicmVhazsKLSAgICBjYXNlIEZvbnRWYXJpYW50RWFzdEFzaWFuV2lkdGg6OkZ1bGw6Ci0gICAg
ICAgIHZhbHVlcy0+YXBwZW5kKENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRp
ZmllclZhbHVlKENTU1ZhbHVlRnVsbFdpZHRoKSk7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2Ug
Rm9udFZhcmlhbnRFYXN0QXNpYW5XaWR0aDo6UHJvcG9ydGlvbmFsOgotICAgICAgICB2YWx1ZXMt
PmFwcGVuZChDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShD
U1NWYWx1ZVByb3BvcnRpb25hbFdpZHRoKSk7Ci0gICAgICAgIGJyZWFrOworCisgICAgaWYgKHdp
ZHRoKSB7CisgICAgICAgIHN3aXRjaCAoKndpZHRoKSB7CisgICAgICAgIGNhc2UgRm9udFZhcmlh
bnRFYXN0QXNpYW5XaWR0aDo6Tm9ybWFsOgorICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNh
c2UgRm9udFZhcmlhbnRFYXN0QXNpYW5XaWR0aDo6RnVsbDoKKyAgICAgICAgICAgIHZhbHVlcy0+
YXBwZW5kKENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENT
U1ZhbHVlRnVsbFdpZHRoKSk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBGb250
VmFyaWFudEVhc3RBc2lhbldpZHRoOjpQcm9wb3J0aW9uYWw6CisgICAgICAgICAgICB2YWx1ZXMt
PmFwcGVuZChDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShD
U1NWYWx1ZVByb3BvcnRpb25hbFdpZHRoKSk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAg
fQogICAgIH0KICAgICAgICAgCi0gICAgc3dpdGNoIChydWJ5KSB7Ci0gICAgY2FzZSBGb250VmFy
aWFudEVhc3RBc2lhblJ1Ynk6Ok5vcm1hbDoKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBGb250
VmFyaWFudEVhc3RBc2lhblJ1Ynk6OlllczoKLSAgICAgICAgdmFsdWVzLT5hcHBlbmQoQ1NTVmFs
dWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVSdWJ5KSk7
CisgICAgaWYgKHJ1YnkpIHsKKyAgICAgICAgc3dpdGNoICgqcnVieSkgeworICAgICAgICBjYXNl
IEZvbnRWYXJpYW50RWFzdEFzaWFuUnVieTo6Tm9ybWFsOgorICAgICAgICAgICAgYnJlYWs7Cisg
ICAgICAgIGNhc2UgRm9udFZhcmlhbnRFYXN0QXNpYW5SdWJ5OjpZZXM6CisgICAgICAgICAgICB2
YWx1ZXMtPmFwcGVuZChDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJW
YWx1ZShDU1NWYWx1ZVJ1YnkpKTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIGlmICghdmFsdWVz
LT5sZW5ndGgoKSkKQEAgLTQ5NDAsOSArNDk2NCw5IEBAIGJvb2wgQ1NTUHJvcGVydHlQYXJzZXI6
OmNvbnN1bWVGb250VmFyaWFudFNob3J0aGFuZChib29sIGltcG9ydGFudCkKIHsKICAgICBpZiAo
aWRlbnRNYXRjaGVzPENTU1ZhbHVlTm9ybWFsLCBDU1NWYWx1ZU5vbmU+KG1fcmFuZ2UucGVlaygp
LmlkKCkpKSB7CiAgICAgICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRMaWdh
dHVyZXMsIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIGNvbnN1bWVJZGVudChtX3JhbmdlKS5yZWxl
YXNlTm9uTnVsbCgpLCBpbXBvcnRhbnQpOwotICAgICAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0
eUZvbnRWYXJpYW50Q2FwcywgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgQ1NTVmFsdWVQb29sOjpz
aW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwpLCBpbXBvcnRh
bnQpOwotICAgICAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50RWFzdEFzaWFu
LCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0
ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCk7Ci0gICAgICAgIGFk
ZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRQb3NpdGlvbiwgQ1NTUHJvcGVydHlGb250
VmFyaWFudCwgQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUo
Q1NTVmFsdWVOb3JtYWwpLCBpbXBvcnRhbnQpOworICAgICAgICBhZGRQcm9wZXJ0eShDU1NQcm9w
ZXJ0eUZvbnRWYXJpYW50Q2FwcywgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgQ1NTVmFsdWVQb29s
OjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwpLCBpbXBv
cnRhbnQsIHRydWUpOworICAgICAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50
RWFzdEFzaWFuLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRv
bigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCwgdHJ1
ZSk7CisgICAgICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRQb3NpdGlvbiwg
Q1NTUHJvcGVydHlGb250VmFyaWFudCwgQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJ
ZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwpLCBpbXBvcnRhbnQsIHRydWUpOwogICAgICAg
ICByZXR1cm4gbV9yYW5nZS5hdEVuZCgpOwogICAgIH0KIApAQCAtNDk1Myw2ICs0OTc3LDggQEAg
Ym9vbCBDU1NQcm9wZXJ0eVBhcnNlcjo6Y29uc3VtZUZvbnRWYXJpYW50U2hvcnRoYW5kKGJvb2wg
aW1wb3J0YW50KQogICAgIFJlZlB0cjxDU1NWYWx1ZT4gZWFzdEFzaWFuVmFsdWU7CiAgICAgRm9u
dFZhcmlhbnRMaWdhdHVyZXNQYXJzZXIgbGlnYXR1cmVzUGFyc2VyOwogICAgIEZvbnRWYXJpYW50
TnVtZXJpY1BhcnNlciBudW1lcmljUGFyc2VyOworICAgIGJvb2wgaW1wbGljaXRMaWdhdHVyZXMg
PSB0cnVlOworICAgIGJvb2wgaW1wbGljaXROdW1lcmljID0gdHJ1ZTsKICAgICBkbyB7CiAgICAg
ICAgIGlmICghY2Fwc1ZhbHVlKSB7CiAgICAgICAgICAgICBjYXBzVmFsdWUgPSBjb25zdW1lRm9u
dFZhcmlhbnRDYXBzKG1fcmFuZ2UpOwpAQCAtNDk3NCw5ICs1MDAwLDE0IEBAIGJvb2wgQ1NTUHJv
cGVydHlQYXJzZXI6OmNvbnN1bWVGb250VmFyaWFudFNob3J0aGFuZChib29sIGltcG9ydGFudCkK
IAogICAgICAgICBGb250VmFyaWFudExpZ2F0dXJlc1BhcnNlcjo6UGFyc2VSZXN1bHQgbGlnYXR1
cmVzUGFyc2VSZXN1bHQgPSBsaWdhdHVyZXNQYXJzZXIuY29uc3VtZUxpZ2F0dXJlKG1fcmFuZ2Up
OwogICAgICAgICBGb250VmFyaWFudE51bWVyaWNQYXJzZXI6OlBhcnNlUmVzdWx0IG51bWVyaWNQ
YXJzZVJlc3VsdCA9IG51bWVyaWNQYXJzZXIuY29uc3VtZU51bWVyaWMobV9yYW5nZSk7Ci0gICAg
ICAgIGlmIChsaWdhdHVyZXNQYXJzZVJlc3VsdCA9PSBGb250VmFyaWFudExpZ2F0dXJlc1BhcnNl
cjo6UGFyc2VSZXN1bHQ6OkNvbnN1bWVkVmFsdWUKLSAgICAgICAgICAgIHx8IG51bWVyaWNQYXJz
ZVJlc3VsdCA9PSBGb250VmFyaWFudE51bWVyaWNQYXJzZXI6OlBhcnNlUmVzdWx0OjpDb25zdW1l
ZFZhbHVlKQorICAgICAgICBpZiAobGlnYXR1cmVzUGFyc2VSZXN1bHQgPT0gRm9udFZhcmlhbnRM
aWdhdHVyZXNQYXJzZXI6OlBhcnNlUmVzdWx0OjpDb25zdW1lZFZhbHVlKSB7CisgICAgICAgICAg
ICBpbXBsaWNpdExpZ2F0dXJlcyA9IGZhbHNlOworICAgICAgICAgICAgY29udGludWU7CisgICAg
ICAgIH0KKyAgICAgICAgaWYgKG51bWVyaWNQYXJzZVJlc3VsdCA9PSBGb250VmFyaWFudE51bWVy
aWNQYXJzZXI6OlBhcnNlUmVzdWx0OjpDb25zdW1lZFZhbHVlKSB7CisgICAgICAgICAgICBpbXBs
aWNpdE51bWVyaWMgPSBmYWxzZTsKICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CiAK
ICAgICAgICAgaWYgKGxpZ2F0dXJlc1BhcnNlUmVzdWx0ID09IEZvbnRWYXJpYW50TGlnYXR1cmVz
UGFyc2VyOjpQYXJzZVJlc3VsdDo6RGlzYWxsb3dlZFZhbHVlCiAgICAgICAgICAgICB8fCBudW1l
cmljUGFyc2VSZXN1bHQgPT0gRm9udFZhcmlhbnROdW1lcmljUGFyc2VyOjpQYXJzZVJlc3VsdDo6
RGlzYWxsb3dlZFZhbHVlKQpAQCAtNDk4NSw3ICs1MDE2LDcgQEAgYm9vbCBDU1NQcm9wZXJ0eVBh
cnNlcjo6Y29uc3VtZUZvbnRWYXJpYW50U2hvcnRoYW5kKGJvb2wgaW1wb3J0YW50KQogICAgICAg
ICBpZiAoIWVhc3RBc2lhblZhbHVlKSB7CiAgICAgICAgICAgICBlYXN0QXNpYW5WYWx1ZSA9IGNv
bnN1bWVGb250VmFyaWFudEVhc3RBc2lhbihtX3JhbmdlKTsKICAgICAgICAgICAgIGlmIChlYXN0
QXNpYW5WYWx1ZSkKLSAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgICAgIGNvbnRp
bnVlOwogICAgICAgICB9CiAKICAgICAgICAgLy8gU2F3IHNvbWUgdmFsdWUgdGhhdCBkaWRuJ3Qg
bWF0Y2ggYW55dGhpbmcgZWxzZS4KQEAgLTQ5OTMsMTUgKzUwMjQsMTkgQEAgYm9vbCBDU1NQcm9w
ZXJ0eVBhcnNlcjo6Y29uc3VtZUZvbnRWYXJpYW50U2hvcnRoYW5kKGJvb2wgaW1wb3J0YW50KQog
CiAgICAgfSB3aGlsZSAoIW1fcmFuZ2UuYXRFbmQoKSk7CiAKLSAgICBhZGRQcm9wZXJ0eShDU1NQ
cm9wZXJ0eUZvbnRWYXJpYW50TGlnYXR1cmVzLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBsaWdh
dHVyZXNQYXJzZXIuZmluYWxpemVWYWx1ZSgpLnJlbGVhc2VOb25OdWxsKCksIGltcG9ydGFudCk7
Ci0gICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlGb250VmFyaWFudE51bWVyaWMsIENTU1Byb3Bl
cnR5Rm9udFZhcmlhbnQsIG51bWVyaWNQYXJzZXIuZmluYWxpemVWYWx1ZSgpLnJlbGVhc2VOb25O
dWxsKCksIGltcG9ydGFudCk7Ci0gICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlGb250VmFyaWFu
dENhcHMsIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIGNhcHNWYWx1ZSA/IGNhcHNWYWx1ZS5yZWxl
YXNlTm9uTnVsbCgpIDogQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVy
VmFsdWUoQ1NTVmFsdWVOb3JtYWwpLCBpbXBvcnRhbnQpOwotICAgIGFkZFByb3BlcnR5KENTU1By
b3BlcnR5Rm9udFZhcmlhbnRBbHRlcm5hdGVzLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBhbHRl
cm5hdGVzVmFsdWUgPyBhbHRlcm5hdGVzVmFsdWUucmVsZWFzZU5vbk51bGwoKSA6IENTU1ZhbHVl
UG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlTm9ybWFsKSwg
aW1wb3J0YW50KTsKLSAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50UG9zaXRp
b24sIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIHBvc2l0aW9uVmFsdWUgPyBwb3NpdGlvblZhbHVl
LnJlbGVhc2VOb25OdWxsKCkgOiBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50
aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCk7Ci0gICAgCisgICAgYWRkUHJv
cGVydHkoQ1NTUHJvcGVydHlGb250VmFyaWFudExpZ2F0dXJlcywgQ1NTUHJvcGVydHlGb250VmFy
aWFudCwgbGlnYXR1cmVzUGFyc2VyLmZpbmFsaXplVmFsdWUoKS5yZWxlYXNlTm9uTnVsbCgpLCBp
bXBvcnRhbnQsIGltcGxpY2l0TGlnYXR1cmVzKTsKKyAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0
eUZvbnRWYXJpYW50TnVtZXJpYywgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgbnVtZXJpY1BhcnNl
ci5maW5hbGl6ZVZhbHVlKCkucmVsZWFzZU5vbk51bGwoKSwgaW1wb3J0YW50LCBpbXBsaWNpdE51
bWVyaWMpOworICAgIGJvb2wgaW1wbGljaXRDYXBzID0gIWNhcHNWYWx1ZTsKKyAgICBhZGRQcm9w
ZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50Q2FwcywgQ1NTUHJvcGVydHlGb250VmFyaWFudCwg
Y2Fwc1ZhbHVlID8gY2Fwc1ZhbHVlLnJlbGVhc2VOb25OdWxsKCkgOiBDU1NWYWx1ZVBvb2w6OnNp
bmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFu
dCwgaW1wbGljaXRDYXBzKTsKKyAgICBib29sIGltcGxpY2l0QWx0ZXJuYXRlcyA9ICFhbHRlcm5h
dGVzVmFsdWU7CisgICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlGb250VmFyaWFudEFsdGVybmF0
ZXMsIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIGFsdGVybmF0ZXNWYWx1ZSA/IGFsdGVybmF0ZXNW
YWx1ZS5yZWxlYXNlTm9uTnVsbCgpIDogQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJ
ZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwpLCBpbXBvcnRhbnQsIGltcGxpY2l0QWx0ZXJu
YXRlcyk7CisgICAgYm9vbCBpbXBsaWNpdFBvc2l0aW9uID0gIXBvc2l0aW9uVmFsdWU7CisgICAg
YWRkUHJvcGVydHkoQ1NTUHJvcGVydHlGb250VmFyaWFudFBvc2l0aW9uLCBDU1NQcm9wZXJ0eUZv
bnRWYXJpYW50LCBwb3NpdGlvblZhbHVlID8gcG9zaXRpb25WYWx1ZS5yZWxlYXNlTm9uTnVsbCgp
IDogQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFs
dWVOb3JtYWwpLCBpbXBvcnRhbnQsIGltcGxpY2l0UG9zaXRpb24pOworCisgICAgYm9vbCBpbXBs
aWNpdEVhc3RBc2lhbiA9ICFlYXN0QXNpYW5WYWx1ZTsKICAgICBpZiAoIWVhc3RBc2lhblZhbHVl
KQogICAgICAgICBlYXN0QXNpYW5WYWx1ZSA9IENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3Jl
YXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlTm9ybWFsKTsKLSAgICBhZGRQcm9wZXJ0eShDU1NQ
cm9wZXJ0eUZvbnRWYXJpYW50RWFzdEFzaWFuLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBlYXN0
QXNpYW5WYWx1ZS5yZWxlYXNlTm9uTnVsbCgpLCBpbXBvcnRhbnQpOworICAgIGFkZFByb3BlcnR5
KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRFYXN0QXNpYW4sIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQs
IGVhc3RBc2lhblZhbHVlLnJlbGVhc2VOb25OdWxsKCksIGltcG9ydGFudCwgaW1wbGljaXRFYXN0
QXNpYW4pOwogICAgIAogICAgIHJldHVybiB0cnVlOwogfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz
dHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDJhZjNiZDM2NTg1MWZh
ZDFjNGE0ZDk2ZGJmMzMwM2ZiNWEyYWZiNjMuLjBiNjlhYWFlZWExOTc2OWExMmI4MjUzOTIyYWQ1
YzdjMzk0NWY3ODcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlv
dXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMS0wNi0xOCAgUm9iIEJ1aXMg
IDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIENTU09NIHRlc3QgZm9yIHNlcmlhbGl6aW5n
IGZvbnQtdmFyaWFudCBmYWlscworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjI2NzcwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgKiBjc3MzL2ZvbnQtdmFyaWFudC1wYXJzaW5nLWV4cGVjdGVkLnR4dDoKKyAg
ICAgICAgKiBjc3MzL2ZvbnQtdmFyaWFudC1wYXJzaW5nLmh0bWw6CisKIDIwMjEtMDYtMTggIFJ5
YW4gSGFkZGFkICA8cnlhbmhhZGRhZEBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPUyAxNC1TaW11
bGF0b3IgV0syXSBlZGl0aW5nL2RlbGV0aW5nL3NtYXJ0LWRlbGV0ZS1wYXJhZ3JhcGgtMDA0Lmh0
bWwgaXMgYSBmbGFreSBmYWlsdXJlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93
M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwppbmRleCA5
YmRlMzNkZDEzOWZlOGIxOThjMzMwZjZiYWFhODYzYTRiOTkxZTlmLi44NTM1YTNmNDJiNTkxOTc3
ODA4OTcyNjZlNDM0ZWQ2NWYxNmY2NzkxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRl
ZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cK
QEAgLTEsMyArMSwxNiBAQAorMjAyMS0wNi0xOCAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29t
PgorCisgICAgICAgIENTU09NIHRlc3QgZm9yIHNlcmlhbGl6aW5nIGZvbnQtdmFyaWFudCBmYWls
cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2Nzcw
CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRl
IGltcHJvdmVkIHRlc3QgcmVzdWx0LgorCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3MtZm9udHMvcGFyc2luZy9mb250LXZhcmlhbnQtZWFzdC1hc2lhbi1pbnZhbGlkLWV4cGVj
dGVkLnR4dDoKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mb250cy9wYXJz
aW5nL2ZvbnQtdmFyaWFudC12YWxpZC1leHBlY3RlZC50eHQ6CisgICAgICAgICogd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3NvbS9zZXJpYWxpemUtdmFsdWVzLWV4cGVjdGVkLnR4dDoKKwogMjAy
MS0wNi0xNyAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBz
dXBwb3J0IGZvciBJREJDdXJzb3IucmVxdWVzdApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3Nz
My9mb250LXZhcmlhbnQtcGFyc2luZy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9jc3MzL2Zv
bnQtdmFyaWFudC1wYXJzaW5nLWV4cGVjdGVkLnR4dAppbmRleCA1NWFhZDI4ZGM2ZDgwMDNlOTI1
YTEwYTNjZTcyZTQyYWRjZmU5NzE5Li5iNzc0ZDhhYjM2MjQyZWNlZTMzZTAzMzM0ZGU1NjNiYjc3
YzBkZDFhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9jc3MzL2ZvbnQtdmFyaWFudC1wYXJzaW5n
LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL2ZvbnQtdmFyaWFudC1wYXJzaW5n
LWV4cGVjdGVkLnR4dApAQCAtNzQsMTMgKzc0LDEzIEBAIFBBU1Mgd2luZG93LmdldENvbXB1dGVk
U3R5bGUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3RFbGVtZW50JykpLmdldFByb3BlcnR5
CiBQQVNTIHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0
ZXN0RWxlbWVudCcpKS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKCdmb250LXZhcmlhbnQtZWFzdC1hc2lh
bicpLmNzc1RleHQgaXMgImZ1bGwtd2lkdGgiCiBQQVNTIHdpbmRvdy5nZXRDb21wdXRlZFN0eWxl
KGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0ZXN0RWxlbWVudCcpKS5nZXRQcm9wZXJ0eUNTU1Zh
bHVlKCdmb250LXZhcmlhbnQtZWFzdC1hc2lhbicpLmNzc1RleHQgaXMgInByb3BvcnRpb25hbC13
aWR0aCIKIFBBU1Mgd2luZG93LmdldENvbXB1dGVkU3R5bGUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5
SWQoJ3Rlc3RFbGVtZW50JykpLmdldFByb3BlcnR5Q1NTVmFsdWUoJ2ZvbnQtdmFyaWFudC1lYXN0
LWFzaWFuJykuY3NzVGV4dCBpcyAicnVieSIKLVBBU1Mgd2luZG93LmdldENvbXB1dGVkU3R5bGUo
ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3RFbGVtZW50JykpLmdldFByb3BlcnR5Q1NTVmFs
dWUoJ2ZvbnQtdmFyaWFudC1lYXN0LWFzaWFuJykuY3NzVGV4dCBpcyAiamlzODMiCi1QQVNTIHdp
bmRvdy5nZXRDb21wdXRlZFN0eWxlKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0ZXN0RWxlbWVu
dCcpKS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKCdmb250LXZhcmlhbnQtZWFzdC1hc2lhbicpLmNzc1Rl
eHQgaXMgInRyYWRpdGlvbmFsIgorUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZShkb2N1bWVu
dC5nZXRFbGVtZW50QnlJZCgndGVzdEVsZW1lbnQnKSkuZ2V0UHJvcGVydHlDU1NWYWx1ZSgnZm9u
dC12YXJpYW50LWVhc3QtYXNpYW4nKS5jc3NUZXh0IGlzICJub3JtYWwiCitQQVNTIHdpbmRvdy5n
ZXRDb21wdXRlZFN0eWxlKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0ZXN0RWxlbWVudCcpKS5n
ZXRQcm9wZXJ0eUNTU1ZhbHVlKCdmb250LXZhcmlhbnQtZWFzdC1hc2lhbicpLmNzc1RleHQgaXMg
Im5vcm1hbCIKIFBBU1Mgd2luZG93LmdldENvbXB1dGVkU3R5bGUoZG9jdW1lbnQuZ2V0RWxlbWVu
dEJ5SWQoJ3Rlc3RFbGVtZW50JykpLmdldFByb3BlcnR5Q1NTVmFsdWUoJ2ZvbnQtdmFyaWFudC1l
YXN0LWFzaWFuJykuY3NzVGV4dCBpcyAidHJhZGl0aW9uYWwgZnVsbC13aWR0aCIKIFBBU1Mgd2lu
ZG93LmdldENvbXB1dGVkU3R5bGUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3RFbGVtZW50
JykpLmdldFByb3BlcnR5Q1NTVmFsdWUoJ2ZvbnQtdmFyaWFudC1lYXN0LWFzaWFuJykuY3NzVGV4
dCBpcyAiamlzMDQgcHJvcG9ydGlvbmFsLXdpZHRoIgogUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRT
dHlsZShkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGVzdEVsZW1lbnQnKSkuZ2V0UHJvcGVydHlD
U1NWYWx1ZSgnZm9udC12YXJpYW50LWVhc3QtYXNpYW4nKS5jc3NUZXh0IGlzICJqaXMwNCBwcm9w
b3J0aW9uYWwtd2lkdGggcnVieSIKIFBBU1Mgd2luZG93LmdldENvbXB1dGVkU3R5bGUoZG9jdW1l
bnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3RFbGVtZW50JykpLmdldFByb3BlcnR5Q1NTVmFsdWUoJ2Zv
bnQtdmFyaWFudC1lYXN0LWFzaWFuJykuY3NzVGV4dCBpcyAiamlzODMgcnVieSIKLVBBU1Mgd2lu
ZG93LmdldENvbXB1dGVkU3R5bGUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3RFbGVtZW50
JykpLmdldFByb3BlcnR5Q1NTVmFsdWUoJ2ZvbnQtdmFyaWFudC1lYXN0LWFzaWFuJykuY3NzVGV4
dCBpcyAicHJvcG9ydGlvbmFsLXdpZHRoIgorUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZShk
b2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGVzdEVsZW1lbnQnKSkuZ2V0UHJvcGVydHlDU1NWYWx1
ZSgnZm9udC12YXJpYW50LWVhc3QtYXNpYW4nKS5jc3NUZXh0IGlzICJub3JtYWwiCiBQQVNTIHN1
Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCiAKIFRFU1QgQ09NUExFVEUKZGlmZiAtLWdpdCBhL0xh
eW91dFRlc3RzL2NzczMvZm9udC12YXJpYW50LXBhcnNpbmcuaHRtbCBiL0xheW91dFRlc3RzL2Nz
czMvZm9udC12YXJpYW50LXBhcnNpbmcuaHRtbAppbmRleCBlYjUxZTQyNzRjYjJmN2FiNTQ2YmVl
NGE3ZGI2YWFiYjdhNDM2YmQ5Li45ZmNkODE4NTgzNTNmMzRkNmJjNWYxOTViNGEwYmFkMjA2ZDY1
ODM2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9jc3MzL2ZvbnQtdmFyaWFudC1wYXJzaW5nLmh0
bWwKKysrIGIvTGF5b3V0VGVzdHMvY3NzMy9mb250LXZhcmlhbnQtcGFyc2luZy5odG1sCkBAIC05
NiwxMyArOTYsMTMgQEAgcnVuVGVzdCgiZm9udC12YXJpYW50LWVhc3QtYXNpYW4iLCAidHJhZGl0
aW9uYWwiLCAidHJhZGl0aW9uYWwiKTsKIHJ1blRlc3QoImZvbnQtdmFyaWFudC1lYXN0LWFzaWFu
IiwgImZ1bGwtd2lkdGgiLCAiZnVsbC13aWR0aCIpOwogcnVuVGVzdCgiZm9udC12YXJpYW50LWVh
c3QtYXNpYW4iLCAicHJvcG9ydGlvbmFsLXdpZHRoIiwgInByb3BvcnRpb25hbC13aWR0aCIpOwog
cnVuVGVzdCgiZm9udC12YXJpYW50LWVhc3QtYXNpYW4iLCAicnVieSIsICJydWJ5Iik7Ci1ydW5U
ZXN0KCJmb250LXZhcmlhbnQtZWFzdC1hc2lhbiIsICJqaXM3OCBqaXM4MyIsICJqaXM4MyIpOwot
cnVuVGVzdCgiZm9udC12YXJpYW50LWVhc3QtYXNpYW4iLCAiamlzOTAgdHJhZGl0aW9uYWwiLCAi
dHJhZGl0aW9uYWwiKTsKK3J1blRlc3QoImZvbnQtdmFyaWFudC1lYXN0LWFzaWFuIiwgImppczc4
IGppczgzIiwgIm5vcm1hbCIpOworcnVuVGVzdCgiZm9udC12YXJpYW50LWVhc3QtYXNpYW4iLCAi
amlzOTAgdHJhZGl0aW9uYWwiLCAibm9ybWFsIik7CiBydW5UZXN0KCJmb250LXZhcmlhbnQtZWFz
dC1hc2lhbiIsICJmdWxsLXdpZHRoIHRyYWRpdGlvbmFsIiwgInRyYWRpdGlvbmFsIGZ1bGwtd2lk
dGgiKTsKIHJ1blRlc3QoImZvbnQtdmFyaWFudC1lYXN0LWFzaWFuIiwgImppczA0IHByb3BvcnRp
b25hbC13aWR0aCIsICJqaXMwNCBwcm9wb3J0aW9uYWwtd2lkdGgiKTsKIHJ1blRlc3QoImZvbnQt
dmFyaWFudC1lYXN0LWFzaWFuIiwgImppczA0IHByb3BvcnRpb25hbC13aWR0aCBydWJ5IiwgImpp
czA0IHByb3BvcnRpb25hbC13aWR0aCBydWJ5Iik7CiBydW5UZXN0KCJmb250LXZhcmlhbnQtZWFz
dC1hc2lhbiIsICJqaXM4MyBydWJ5IiwgImppczgzIHJ1YnkiKTsKLXJ1blRlc3QoImZvbnQtdmFy
aWFudC1lYXN0LWFzaWFuIiwgImZ1bGwtd2lkdGggcHJvcG9ydGlvbmFsLXdpZHRoIiwgInByb3Bv
cnRpb25hbC13aWR0aCIpOworcnVuVGVzdCgiZm9udC12YXJpYW50LWVhc3QtYXNpYW4iLCAiZnVs
bC13aWR0aCBwcm9wb3J0aW9uYWwtd2lkdGgiLCAibm9ybWFsIik7CiA8L3NjcmlwdD4KIDxzY3Jp
cHQgc3JjPSIuLi9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KIDwvYm9keT4K
ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1mb250cy9wYXJzaW5nL2ZvbnQtdmFyaWFudC1lYXN0LWFzaWFuLWludmFsaWQtZXhw
ZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLWZvbnRzL3BhcnNpbmcvZm9udC12YXJpYW50LWVhc3QtYXNpYW4taW52YWxpZC1leHBl
Y3RlZC50eHQKaW5kZXggNWY2Yjk1ODY3Nzc4NmM3ODJkN2VlODFjNTA2ZDI0NmE5MjM4OWUyZS4u
MjBmNjdhNDMzYzI2NDBhNGZmNjBiZTVjMTgzOTA4YTI5MzM2ZThiZCAxMDA2NDQKLS0tIGEvTGF5
b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZvbnRzL3Bh
cnNpbmcvZm9udC12YXJpYW50LWVhc3QtYXNpYW4taW52YWxpZC1leHBlY3RlZC50eHQKKysrIGIv
TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZvbnRz
L3BhcnNpbmcvZm9udC12YXJpYW50LWVhc3QtYXNpYW4taW52YWxpZC1leHBlY3RlZC50eHQKQEAg
LTEsNSArMSw1IEBACiAKIFBBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50LWVhc3QtYXNpYW4nXSA9
ICJub3JtYWwgcnVieSIgc2hvdWxkIG5vdCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCi1GQUlMIGUu
c3R5bGVbJ2ZvbnQtdmFyaWFudC1lYXN0LWFzaWFuJ10gPSAiamlzNzggamlzODMiIHNob3VsZCBu
b3Qgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAiIiBidXQg
Z290ICJqaXM4MyIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50LWVhc3QtYXNpYW4nXSA9ICJm
dWxsLXdpZHRoIHByb3BvcnRpb25hbC13aWR0aCIgc2hvdWxkIG5vdCBzZXQgdGhlIHByb3BlcnR5
IHZhbHVlIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkICIiIGJ1dCBnb3QgInByb3BvcnRpb25hbC13
aWR0aCIKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50LWVhc3QtYXNpYW4nXSA9ICJqaXM3OCBq
aXM4MyIgc2hvdWxkIG5vdCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2Zv
bnQtdmFyaWFudC1lYXN0LWFzaWFuJ10gPSAiZnVsbC13aWR0aCBwcm9wb3J0aW9uYWwtd2lkdGgi
IHNob3VsZCBub3Qgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQogCmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZm9udHMvcGFyc2lu
Zy9mb250LXZhcmlhbnQtdmFsaWQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZvbnRzL3BhcnNpbmcvZm9udC12YXJpYW50
LXZhbGlkLWV4cGVjdGVkLnR4dAppbmRleCBmYzBiYTI2MGIwMWY5MTIyYjhiMDFlZmQ0ZmRkY2Y0
OThlNjFkMmMzLi5mMWEzYTU0ZjhhMjU5NjA2ZjFmM2JkMWUyMWExMWQ4YTExOWZiMmI5IDEwMDY0
NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3MtZm9udHMvcGFyc2luZy9mb250LXZhcmlhbnQtdmFsaWQtZXhwZWN0ZWQudHh0CisrKyBiL0xh
eW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mb250cy9w
YXJzaW5nL2ZvbnQtdmFyaWFudC12YWxpZC1leHBlY3RlZC50eHQKQEAgLTEsMjIgKzEsMjIgQEAK
IAotRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJub3JtYWwiIHNob3VsZCBzZXQgdGhl
IHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0
IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0g
Im5vbmUiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBw
cm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5
bGVbJ2ZvbnQtdmFyaWFudCddID0gImNvbW1vbi1saWdhdHVyZXMiIHNob3VsZCBzZXQgdGhlIHBy
b3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdv
dCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gIm5v
LWNvbW1vbi1saWdhdHVyZXMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9u
b3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIi
Ci1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImRpc2NyZXRpb25hcnktbGlnYXR1cmVz
IiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVy
dHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydm
b250LXZhcmlhbnQnXSA9ICJuby1kaXNjcmV0aW9uYXJ5LWxpZ2F0dXJlcyIgc2hvdWxkIHNldCB0
aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBz
ZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10g
PSAiaGlzdG9yaWNhbC1saWdhdHVyZXMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFz
c2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZh
bHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gIm5vLWhpc3RvcmljYWwtbGln
YXR1cmVzIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczog
cHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0
eWxlWydmb250LXZhcmlhbnQnXSA9ICJjb250ZXh0dWFsIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0
eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlz
YWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJuby1jb250
ZXh0dWFsIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczog
cHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0
eWxlWydmb250LXZhcmlhbnQnXSA9ICJzbWFsbC1jYXBzIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0
eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlz
YWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJhbGwtc21h
bGwtY2FwcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6
IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5z
dHlsZVsnZm9udC12YXJpYW50J10gPSAicGV0aXRlLWNhcHMiIHNob3VsZCBzZXQgdGhlIHByb3Bl
cnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBk
aXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImFsbC1w
ZXRpdGUtY2FwcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVh
bHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwg
ZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAidW5pY2FzZSIgc2hvdWxkIHNldCB0aGUgcHJvcGVy
dHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRp
c2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAidGl0bGlu
Zy1jYXBzIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczog
cHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgorUEFTUyBlLnN0
eWxlWydmb250LXZhcmlhbnQnXSA9ICJub3JtYWwiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZh
bHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gIm5vbmUiIHNob3VsZCBzZXQgdGhl
IHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImNvbW1vbi1s
aWdhdHVyZXMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2Zv
bnQtdmFyaWFudCddID0gIm5vLWNvbW1vbi1saWdhdHVyZXMiIHNob3VsZCBzZXQgdGhlIHByb3Bl
cnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImRpc2NyZXRpb25hcnkt
bGlnYXR1cmVzIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydm
b250LXZhcmlhbnQnXSA9ICJuby1kaXNjcmV0aW9uYXJ5LWxpZ2F0dXJlcyIgc2hvdWxkIHNldCB0
aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiaGlzdG9y
aWNhbC1saWdhdHVyZXMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5
bGVbJ2ZvbnQtdmFyaWFudCddID0gIm5vLWhpc3RvcmljYWwtbGlnYXR1cmVzIiBzaG91bGQgc2V0
IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJjb250
ZXh0dWFsIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250
LXZhcmlhbnQnXSA9ICJuby1jb250ZXh0dWFsIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1
ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJzbWFsbC1jYXBzIiBzaG91bGQgc2V0
IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJhbGwt
c21hbGwtY2FwcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsn
Zm9udC12YXJpYW50J10gPSAicGV0aXRlLWNhcHMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZh
bHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImFsbC1wZXRpdGUtY2FwcyIgc2hv
dWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10g
PSAidW5pY2FzZSIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsn
Zm9udC12YXJpYW50J10gPSAidGl0bGluZy1jYXBzIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2
YWx1ZQogRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJzdHlsaXN0aWMoZmxvd2luZyki
IHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0
eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2Zv
bnQtdmFyaWFudCddID0gImhpc3RvcmljYWwtZm9ybXMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5
IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNh
bGxvd2VkIHZhbHVlICIiCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImhpc3Rvcmlj
YWwtZm9ybXMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCiBGQUlMIGUuc3R5bGVbJ2Zv
bnQtdmFyaWFudCddID0gInN0eWxlc2V0KGZsb3dpbmcpIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0
eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlz
YWxsb3dlZCB2YWx1ZSAiIgogRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJjaGFyYWN0
ZXItdmFyaWFudChmbG93aW5nKSIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0
X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUg
IiIKIEZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAic3dhc2goZmxvd2luZykiIHNob3Vs
ZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91
bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCkBAIC0yNCwyNSArMjQsMjUgQEAgRkFJ
TCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJvcm5hbWVudHMoZmxvd2luZykiIHNob3VsZCBz
ZXQgdGhlIHByb3BlcnR5IHZhbHUKIEZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiYW5u
b3RhdGlvbihmbG93aW5nKSIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25v
dF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIK
IEZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAic3R5bGlzdGljKGZsb3dpbmcpIGhpc3Rv
cmljYWwtZm9ybXMgc3R5bGVzZXQoZmxvd2luZykgY2hhcmFjdGVyLXZhcmlhbnQoZmxvd2luZykg
c3dhc2goZmxvd2luZykgb3JuYW1lbnRzKGZsb3dpbmcpIGFubm90YXRpb24oZmxvd2luZykiIHNo
b3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBz
aG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCiBGQUlMIGUuc3R5bGVbJ2ZvbnQt
dmFyaWFudCddID0gImFubm90YXRpb24oZmxvd2luZykgb3JuYW1lbnRzKGZsb3dpbmcpIHN3YXNo
KGZsb3dpbmcpIGNoYXJhY3Rlci12YXJpYW50KGZsb3dpbmcpIHN0eWxlc2V0KGZsb3dpbmcpIGhp
c3RvcmljYWwtZm9ybXMgc3R5bGlzdGljKGZsb3dpbmcpIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0
eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlz
YWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJsaW5pbmct
bnVtcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHBy
b3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHls
ZVsnZm9udC12YXJpYW50J10gPSAib2xkc3R5bGUtbnVtcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVy
dHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRp
c2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAicHJvcG9y
dGlvbmFsLW51bXMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1
YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlM
IGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInRhYnVsYXItbnVtcyIgc2hvdWxkIHNldCB0aGUg
cHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQg
Z290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAi
ZGlhZ29uYWwtZnJhY3Rpb25zIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRf
bm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAi
IgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJzdGFja2VkLWZyYWN0aW9ucyIgc2hv
dWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNo
b3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12
YXJpYW50J10gPSAib3JkaW5hbCIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0
X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUg
IiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAic2xhc2hlZC16ZXJvIiBzaG91bGQg
c2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxk
IGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlh
bnQnXSA9ICJqaXM3OCIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9l
cXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZB
SUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiamlzODMiIHNob3VsZCBzZXQgdGhlIHByb3Bl
cnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBk
aXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImppczkw
IiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVy
dHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydm
b250LXZhcmlhbnQnXSA9ICJqaXMwNCIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNz
ZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFs
dWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAic2ltcGxpZmllZCIgc2hvdWxk
IHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3Vs
ZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJp
YW50J10gPSAidHJhZGl0aW9uYWwiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2Vy
dF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVl
ICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImZ1bGwtd2lkdGgiIHNob3VsZCBz
ZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQg
YmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFu
dCddID0gInByb3BvcnRpb25hbC13aWR0aCIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUg
YXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQg
dmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAicnVieSIgc2hvdWxkIHNl
dCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBi
ZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50
J10gPSAic3ViIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFs
czogcHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBl
LnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJzdXBlciIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkg
dmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2Fs
bG93ZWQgdmFsdWUgIiIKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAibGluaW5nLW51
bXMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFy
aWFudCddID0gIm9sZHN0eWxlLW51bXMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQ
QVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInByb3BvcnRpb25hbC1udW1zIiBzaG91bGQg
c2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJ0
YWJ1bGFyLW51bXMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVb
J2ZvbnQtdmFyaWFudCddID0gImRpYWdvbmFsLWZyYWN0aW9ucyIgc2hvdWxkIHNldCB0aGUgcHJv
cGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAic3RhY2tlZC1mcmFj
dGlvbnMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQt
dmFyaWFudCddID0gIm9yZGluYWwiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQQVNT
IGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInNsYXNoZWQtemVybyIgc2hvdWxkIHNldCB0aGUg
cHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiamlzNzgiIHNo
b3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCdd
ID0gImppczgzIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydm
b250LXZhcmlhbnQnXSA9ICJqaXM5MCIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BB
U1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiamlzMDQiIHNob3VsZCBzZXQgdGhlIHByb3Bl
cnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInNpbXBsaWZpZWQiIHNo
b3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCdd
ID0gInRyYWRpdGlvbmFsIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0
eWxlWydmb250LXZhcmlhbnQnXSA9ICJmdWxsLXdpZHRoIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0
eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJwcm9wb3J0aW9uYWwtd2lk
dGgiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFy
aWFudCddID0gInJ1YnkiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5
bGVbJ2ZvbnQtdmFyaWFudCddID0gInN1YiIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUK
K1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAic3VwZXIiIHNob3VsZCBzZXQgdGhlIHBy
b3BlcnR5IHZhbHVlCiBGQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImNvbW1vbi1saWdh
dHVyZXMgZGlzY3JldGlvbmFyeS1saWdhdHVyZXMgaGlzdG9yaWNhbC1saWdhdHVyZXMgY29udGV4
dHVhbCBzbWFsbC1jYXBzIHN0eWxpc3RpYyhmbG93aW5nKSBsaW5pbmctbnVtcyBwcm9wb3J0aW9u
YWwtbnVtcyBkaWFnb25hbC1mcmFjdGlvbnMgb3JkaW5hbCBzbGFzaGVkLXplcm8gamlzNzggZnVs
bC13aWR0aCBydWJ5IHN1YiIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25v
dF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIK
IEZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAic3VwZXIgcHJvcG9ydGlvbmFsLXdpZHRo
IGppczgzIHN0YWNrZWQtZnJhY3Rpb25zIHRhYnVsYXItbnVtcyBvbGRzdHlsZS1udW1zIGhpc3Rv
cmljYWwtZm9ybXMgYWxsLXNtYWxsLWNhcHMgbm8tY29udGV4dHVhbCBuby1oaXN0b3JpY2FsLWxp
Z2F0dXJlcyBuby1kaXNjcmV0aW9uYXJ5LWxpZ2F0dXJlcyBuby1jb21tb24tbGlnYXR1cmVzIiBz
aG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkg
c2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgogCmRpZmYgLS1naXQgYS9MYXlv
dXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3NvbS9zZXJpYWxp
emUtdmFsdWVzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzc29tL3NlcmlhbGl6ZS12YWx1ZXMtZXhwZWN0ZWQudHh0CmluZGV4
IDgzMGFlZWJmZDVkMDRhZWFlMzc4M2M5YTM5MzI2MTc4MGYwODlmNDQuLjVmYTE2YTRkMDNiOTE5
YjFlZjUwOGM4OWMwMGNiYWM4NzE4NzZlMzUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzc29tL3NlcmlhbGl6ZS12YWx1ZXMtZXhw
ZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzc29tL3NlcmlhbGl6ZS12YWx1ZXMtZXhwZWN0ZWQudHh0CkBAIC0zOTMsOSArMzkz
LDkgQEAgUEFTUyBmb250LXN0eWxlOiBub3JtYWwKIFBBU1MgZm9udC1zdHlsZTogaXRhbGljCiBQ
QVNTIGZvbnQtc3R5bGU6IG9ibGlxdWUKIFBBU1MgZm9udC1zdHlsZTogaW5oZXJpdAotRkFJTCBm
b250LXZhcmlhbnQ6IG5vcm1hbCBhc3NlcnRfZXF1YWxzOiBmb250LXZhcmlhbnQgcmF3IGlubGlu
ZSBzdHlsZSBkZWNsYXJhdGlvbiBleHBlY3RlZCAibm9ybWFsIiBidXQgZ290ICIiCi1GQUlMIGZv
bnQtdmFyaWFudDogc21hbGwtY2FwcyBhc3NlcnRfZXF1YWxzOiBmb250LXZhcmlhbnQgcmF3IGlu
bGluZSBzdHlsZSBkZWNsYXJhdGlvbiBleHBlY3RlZCAic21hbGwtY2FwcyIgYnV0IGdvdCAiIgot
RkFJTCBmb250LXZhcmlhbnQ6IGluaGVyaXQgYXNzZXJ0X2VxdWFsczogZm9udC12YXJpYW50IHJh
dyBpbmxpbmUgc3R5bGUgZGVjbGFyYXRpb24gZXhwZWN0ZWQgImluaGVyaXQiIGJ1dCBnb3QgIiIK
K1BBU1MgZm9udC12YXJpYW50OiBub3JtYWwKK1BBU1MgZm9udC12YXJpYW50OiBzbWFsbC1jYXBz
CitQQVNTIGZvbnQtdmFyaWFudDogaW5oZXJpdAogUEFTUyBmb250LXdlaWdodDogbm9ybWFsCiBQ
QVNTIGZvbnQtd2VpZ2h0OiBib2xkCiBQQVNTIGZvbnQtd2VpZ2h0OiBib2xkZXIK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>431872</attachid>
            <date>2021-06-21 10:11:43 -0700</date>
            <delta_ts>2021-06-21 11:19:03 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-226770-20210621181141.patch</filename>
            <type>text/plain</type>
            <size>31534</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MDY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDRhNjA0ODY3OWRjYWQy
MDNiMGYzMTg3MGNlZmRmYmExOGM5NWNiNS4uNzYzMzM2NmNmNGZlZDUwYzBlZWZhYzhjOGQ5ZDE4
ZTk4OTA2ZDRmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTA2LTIxICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ1NTT00gdGVzdCBmb3Igc2VyaWFs
aXppbmcgZm9udC12YXJpYW50IGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD0yMjY3NzAKKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxl
ci4KKworICAgICAgICBJbXBsZW1lbnQgZm9udC12YXJpYW50IHNlcmlhbGl6aW5nIGFjY29yZGlu
ZyB0bzoKKyAgICAgICAgaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzc29tLyNzZXJpYWxpemlu
Zy1jc3MtdmFsdWVzCisKKyAgICAgICAgKiBjc3MvU3R5bGVQcm9wZXJ0aWVzLmNwcDoKKyAgICAg
ICAgKFdlYkNvcmU6OlN0eWxlUHJvcGVydGllczo6Z2V0UHJvcGVydHlWYWx1ZSBjb25zdCk6Cisg
ICAgICAgIChXZWJDb3JlOjpTdHlsZVByb3BlcnRpZXM6OmFwcGVuZEZvbnRMb25naGFuZFZhbHVl
SWZFeHBsaWNpdCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVByb3BlcnRpZXM6OmZv
bnRWYXJpYW50VmFsdWUgY29uc3QpOgorICAgICAgICAqIGNzcy9TdHlsZVByb3BlcnRpZXMuaDoK
KyAgICAgICAgKiBjc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VyLmNwcDoKKyAgICAgICAgKFdl
YkNvcmU6OmNvbnN1bWVGb250VmFyaWFudEVhc3RBc2lhbik6CisgICAgICAgIChXZWJDb3JlOjpD
U1NQcm9wZXJ0eVBhcnNlcjo6Y29uc3VtZUZvbnRWYXJpYW50U2hvcnRoYW5kKToKKwogMjAyMS0w
Ni0yMSAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHJl
ZHVuZGFudCBIaXRUZXN0TG9jYXRpb24oY29uc3QgTGF5b3V0UG9pbnQmIGNlbnRlclBvaW50LCB1
bnNpZ25lZCB0b3BQYWRkaW5nLCB1bnNpZ25lZCByaWdodFBhZGRpbmcsIHVuc2lnbmVkIGJvdHRv
bVBhZGRpbmcsIHVuc2lnbmVkIGxlZnRQYWRkaW5nKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUvY3NzL1N0eWxlUHJvcGVydGllcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQcm9w
ZXJ0aWVzLmNwcAppbmRleCAxODczMmZkOWE1ZGM5NzM5N2UyZTliYWI1Y2NjZmUwNTUyNGY2MjA0
Li44ZDRhNmFiODY4NjkwNzczZTQ4OWMxYWYwMTZkMzg5NWM5ZWIzNWU3IDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQcm9wZXJ0aWVzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y
ZS9jc3MvU3R5bGVQcm9wZXJ0aWVzLmNwcApAQCAtMjM3LDYgKzIzNyw4IEBAIFN0cmluZyBTdHls
ZVByb3BlcnRpZXM6OmdldFByb3BlcnR5VmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlEKSBj
b25zdAogICAgICAgICByZXR1cm4gZ2V0QWxpZ25tZW50U2hvcnRoYW5kVmFsdWUocGxhY2VTZWxm
U2hvcnRoYW5kKCkpOwogICAgIGNhc2UgQ1NTUHJvcGVydHlGb250OgogICAgICAgICByZXR1cm4g
Zm9udFZhbHVlKCk7CisgICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50OgorICAgICAgICBy
ZXR1cm4gZm9udFZhcmlhbnRWYWx1ZSgpOwogICAgIGNhc2UgQ1NTUHJvcGVydHlJbnNldDoKICAg
ICAgICAgcmV0dXJuIGdldDRWYWx1ZXMoaW5zZXRTaG9ydGhhbmQoKSk7CiAgICAgY2FzZSBDU1NQ
cm9wZXJ0eUluc2V0QmxvY2s6CkBAIC0zNjIsNyArMzY0LDEyIEBAIHZvaWQgU3R5bGVQcm9wZXJ0
aWVzOjphcHBlbmRGb250TG9uZ2hhbmRWYWx1ZUlmRXhwbGljaXQoQ1NTUHJvcGVydHlJRCBwcm9w
ZXJ0eUlECiAgICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRTdHlsZToKICAgICAgICAgYnJlYWs7IC8v
IE5vIHByZWZpeC4KICAgICBjYXNlIENTU1Byb3BlcnR5Rm9udEZhbWlseToKKyAgICBjYXNlIENT
U1Byb3BlcnR5Rm9udFZhcmlhbnRBbHRlcm5hdGVzOgogICAgIGNhc2UgQ1NTUHJvcGVydHlGb250
VmFyaWFudENhcHM6CisgICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50TGlnYXR1cmVzOgor
ICAgIGNhc2UgQ1NTUHJvcGVydHlGb250VmFyaWFudE51bWVyaWM6CisgICAgY2FzZSBDU1NQcm9w
ZXJ0eUZvbnRWYXJpYW50UG9zaXRpb246CisgICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50
RWFzdEFzaWFuOgogICAgIGNhc2UgQ1NTUHJvcGVydHlGb250V2VpZ2h0OgogICAgIGNhc2UgQ1NT
UHJvcGVydHlGb250U3RyZXRjaDoKICAgICAgICAgcHJlZml4ID0gJyAnOwpAQCAtNDEyLDYgKzQx
OSwyMSBAQCBTdHJpbmcgU3R5bGVQcm9wZXJ0aWVzOjpmb250VmFsdWUoKSBjb25zdAogICAgIHJl
dHVybiByZXN1bHQudG9TdHJpbmcoKTsKIH0KIAorU3RyaW5nIFN0eWxlUHJvcGVydGllczo6Zm9u
dFZhcmlhbnRWYWx1ZSgpIGNvbnN0Cit7CisgICAgU3RyaW5nIGNvbW1vblZhbHVlOworICAgIFN0
cmluZ0J1aWxkZXIgcmVzdWx0OworICAgIGFwcGVuZEZvbnRMb25naGFuZFZhbHVlSWZFeHBsaWNp
dChDU1NQcm9wZXJ0eUZvbnRWYXJpYW50TGlnYXR1cmVzLCByZXN1bHQsIGNvbW1vblZhbHVlKTsK
KyAgICBpZiAoaXNDU1NXaWRlVmFsdWVLZXl3b3JkKHJlc3VsdC50b1N0cmluZygpKSkKKyAgICAg
ICAgcmV0dXJuIHJlc3VsdC50b1N0cmluZygpOworICAgIGFwcGVuZEZvbnRMb25naGFuZFZhbHVl
SWZFeHBsaWNpdChDU1NQcm9wZXJ0eUZvbnRWYXJpYW50QWx0ZXJuYXRlcywgcmVzdWx0LCBjb21t
b25WYWx1ZSk7CisgICAgYXBwZW5kRm9udExvbmdoYW5kVmFsdWVJZkV4cGxpY2l0KENTU1Byb3Bl
cnR5Rm9udFZhcmlhbnRDYXBzLCByZXN1bHQsIGNvbW1vblZhbHVlKTsKKyAgICBhcHBlbmRGb250
TG9uZ2hhbmRWYWx1ZUlmRXhwbGljaXQoQ1NTUHJvcGVydHlGb250VmFyaWFudEVhc3RBc2lhbiwg
cmVzdWx0LCBjb21tb25WYWx1ZSk7CisgICAgYXBwZW5kRm9udExvbmdoYW5kVmFsdWVJZkV4cGxp
Y2l0KENTU1Byb3BlcnR5Rm9udFZhcmlhbnROdW1lcmljLCByZXN1bHQsIGNvbW1vblZhbHVlKTsK
KyAgICBhcHBlbmRGb250TG9uZ2hhbmRWYWx1ZUlmRXhwbGljaXQoQ1NTUHJvcGVydHlGb250VmFy
aWFudFBvc2l0aW9uLCByZXN1bHQsIGNvbW1vblZhbHVlKTsKKyAgICByZXR1cm4gcmVzdWx0LnRv
U3RyaW5nKCk7Cit9CisKIFN0cmluZyBTdHlsZVByb3BlcnRpZXM6OmdldDJWYWx1ZXMoY29uc3Qg
U3R5bGVQcm9wZXJ0eVNob3J0aGFuZCYgc2hvcnRoYW5kKSBjb25zdAogewogICAgIC8vIEFzc3Vt
ZSB0aGUgcHJvcGVydGllcyBhcmUgaW4gdGhlIHVzdWFsIG9yZGVyIHN0YXJ0LCBlbmQuCmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQcm9wZXJ0aWVzLmggYi9Tb3VyY2UvV2Vi
Q29yZS9jc3MvU3R5bGVQcm9wZXJ0aWVzLmgKaW5kZXggNGVlNTQyN2FmYjhjNzE0YzNmNWE0NGRm
ZDcwMDQ5NWE4NWNmOTQ1MS4uYzU5OTE0NzMwY2ViYWI2OTIyMGU4NDliYTcyYWJhZTdjYjhmNmMx
NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVydGllcy5oCisrKyBi
L1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVByb3BlcnRpZXMuaApAQCAtMTcyLDYgKzE3Miw3IEBA
IHByaXZhdGU6CiAgICAgU3RyaW5nIGdldDRWYWx1ZXMoY29uc3QgU3R5bGVQcm9wZXJ0eVNob3J0
aGFuZCYpIGNvbnN0OwogICAgIFN0cmluZyBib3JkZXJTcGFjaW5nVmFsdWUoY29uc3QgU3R5bGVQ
cm9wZXJ0eVNob3J0aGFuZCYpIGNvbnN0OwogICAgIFN0cmluZyBmb250VmFsdWUoKSBjb25zdDsK
KyAgICBTdHJpbmcgZm9udFZhcmlhbnRWYWx1ZSgpIGNvbnN0OwogICAgIHZvaWQgYXBwZW5kRm9u
dExvbmdoYW5kVmFsdWVJZkV4cGxpY2l0KENTU1Byb3BlcnR5SUQsIFN0cmluZ0J1aWxkZXImIHJl
c3VsdCwgU3RyaW5nJiB2YWx1ZSkgY29uc3Q7CiAKICAgICBmcmllbmQgY2xhc3MgUHJvcGVydHlT
ZXRDU1NTdHlsZURlY2xhcmF0aW9uOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL3Bh
cnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NT
U1Byb3BlcnR5UGFyc2VyLmNwcAppbmRleCBkNGU2MDVjYTc3NDQxNjViZTNhMTMyYjdhZDk3ZDVm
NGYyZThlZTU0Li40ZGY4YWUwZGMxYTRiNmFkOTE1YjNjYWZhNWM1OWU0OTNhMjY1YTk0IDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VyLmNwcAor
KysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VyLmNwcApAQCAt
NjkxLDQyICs2OTEsNjAgQEAgc3RhdGljIFJlZlB0cjxDU1NWYWx1ZT4gY29uc3VtZUZvbnRWYXJp
YW50RWFzdEFzaWFuKENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlKQogICAgICAgICByZXR1cm4g
Y29uc3VtZUlkZW50KHJhbmdlKTsKICAgICAKICAgICBSZWZQdHI8Q1NTVmFsdWVMaXN0PiB2YWx1
ZXMgPSBDU1NWYWx1ZUxpc3Q6OmNyZWF0ZVNwYWNlU2VwYXJhdGVkKCk7Ci0gICAgRm9udFZhcmlh
bnRFYXN0QXNpYW5WYXJpYW50IHZhcmlhbnQgPSBGb250VmFyaWFudEVhc3RBc2lhblZhcmlhbnQ6
Ok5vcm1hbDsKLSAgICBGb250VmFyaWFudEVhc3RBc2lhbldpZHRoIHdpZHRoID0gRm9udFZhcmlh
bnRFYXN0QXNpYW5XaWR0aDo6Tm9ybWFsOwotICAgIEZvbnRWYXJpYW50RWFzdEFzaWFuUnVieSBy
dWJ5ID0gRm9udFZhcmlhbnRFYXN0QXNpYW5SdWJ5OjpOb3JtYWw7CisgICAgc3RkOjpvcHRpb25h
bDxGb250VmFyaWFudEVhc3RBc2lhblZhcmlhbnQ+IHZhcmlhbnQ7CisgICAgc3RkOjpvcHRpb25h
bDxGb250VmFyaWFudEVhc3RBc2lhbldpZHRoPiB3aWR0aDsKKyAgICBzdGQ6Om9wdGlvbmFsPEZv
bnRWYXJpYW50RWFzdEFzaWFuUnVieT4gcnVieTsKICAgICAKICAgICB3aGlsZSAoIXJhbmdlLmF0
RW5kKCkpIHsKICAgICAgICAgaWYgKHJhbmdlLnBlZWsoKS50eXBlKCkgIT0gSWRlbnRUb2tlbikK
ICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwotICAgICAgICAKKwogICAgICAgICBhdXRvIGlk
ID0gcmFuZ2UucGVlaygpLmlkKCk7CiAgICAgICAgIAogICAgICAgICBzd2l0Y2ggKGlkKSB7CiAg
ICAgICAgIGNhc2UgQ1NTVmFsdWVKaXM3ODoKKyAgICAgICAgICAgIGlmICh2YXJpYW50KQorICAg
ICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgICAgICAgICAgdmFyaWFudCA9IEZvbnRW
YXJpYW50RWFzdEFzaWFuVmFyaWFudDo6SmlzNzg7CiAgICAgICAgICAgICBicmVhazsKICAgICAg
ICAgY2FzZSBDU1NWYWx1ZUppczgzOgorICAgICAgICAgICAgaWYgKHZhcmlhbnQpCisgICAgICAg
ICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgICAgICAgICB2YXJpYW50ID0gRm9udFZhcmlh
bnRFYXN0QXNpYW5WYXJpYW50OjpKaXM4MzsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBj
YXNlIENTU1ZhbHVlSmlzOTA6CisgICAgICAgICAgICBpZiAodmFyaWFudCkKKyAgICAgICAgICAg
ICAgICByZXR1cm4gbnVsbHB0cjsKICAgICAgICAgICAgIHZhcmlhbnQgPSBGb250VmFyaWFudEVh
c3RBc2lhblZhcmlhbnQ6OkppczkwOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2Ug
Q1NTVmFsdWVKaXMwNDoKKyAgICAgICAgICAgIGlmICh2YXJpYW50KQorICAgICAgICAgICAgICAg
IHJldHVybiBudWxscHRyOwogICAgICAgICAgICAgdmFyaWFudCA9IEZvbnRWYXJpYW50RWFzdEFz
aWFuVmFyaWFudDo6SmlzMDQ7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBDU1NW
YWx1ZVNpbXBsaWZpZWQ6CisgICAgICAgICAgICBpZiAodmFyaWFudCkKKyAgICAgICAgICAgICAg
ICByZXR1cm4gbnVsbHB0cjsKICAgICAgICAgICAgIHZhcmlhbnQgPSBGb250VmFyaWFudEVhc3RB
c2lhblZhcmlhbnQ6OlNpbXBsaWZpZWQ7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2Fz
ZSBDU1NWYWx1ZVRyYWRpdGlvbmFsOgorICAgICAgICAgICAgaWYgKHZhcmlhbnQpCisgICAgICAg
ICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgICAgICAgICB2YXJpYW50ID0gRm9udFZhcmlh
bnRFYXN0QXNpYW5WYXJpYW50OjpUcmFkaXRpb25hbDsKICAgICAgICAgICAgIGJyZWFrOwogICAg
ICAgICBjYXNlIENTU1ZhbHVlRnVsbFdpZHRoOgorICAgICAgICAgICAgaWYgKHdpZHRoKQorICAg
ICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgICAgICAgICAgd2lkdGggPSBGb250VmFy
aWFudEVhc3RBc2lhbldpZHRoOjpGdWxsOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNh
c2UgQ1NTVmFsdWVQcm9wb3J0aW9uYWxXaWR0aDoKKyAgICAgICAgICAgIGlmICh3aWR0aCkKKyAg
ICAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICAgICAgICAgIHdpZHRoID0gRm9udFZh
cmlhbnRFYXN0QXNpYW5XaWR0aDo6UHJvcG9ydGlvbmFsOwogICAgICAgICAgICAgYnJlYWs7CiAg
ICAgICAgIGNhc2UgQ1NTVmFsdWVSdWJ5OgorICAgICAgICAgICAgaWYgKHJ1YnkpCisgICAgICAg
ICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgICAgICAgICBydWJ5ID0gRm9udFZhcmlhbnRF
YXN0QXNpYW5SdWJ5OjpZZXM7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgZGVmYXVsdDoK
QEAgLTczNSw4ICs3NTMsOCBAQCBzdGF0aWMgUmVmUHRyPENTU1ZhbHVlPiBjb25zdW1lRm9udFZh
cmlhbnRFYXN0QXNpYW4oQ1NTUGFyc2VyVG9rZW5SYW5nZSYgcmFuZ2UpCiAgICAgICAgIAogICAg
ICAgICByYW5nZS5jb25zdW1lSW5jbHVkaW5nV2hpdGVzcGFjZSgpOwogICAgIH0KLSAgICAgICAg
Ci0gICAgc3dpdGNoICh2YXJpYW50KSB7CisKKyAgICBzd2l0Y2ggKHZhcmlhbnQudmFsdWVfb3Io
Rm9udFZhcmlhbnRFYXN0QXNpYW5WYXJpYW50OjpOb3JtYWwpKSB7CiAgICAgY2FzZSBGb250VmFy
aWFudEVhc3RBc2lhblZhcmlhbnQ6Ok5vcm1hbDoKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBG
b250VmFyaWFudEVhc3RBc2lhblZhcmlhbnQ6Okppczc4OgpAQCAtNzU4LDggKzc3Niw4IEBAIHN0
YXRpYyBSZWZQdHI8Q1NTVmFsdWU+IGNvbnN1bWVGb250VmFyaWFudEVhc3RBc2lhbihDU1NQYXJz
ZXJUb2tlblJhbmdlJiByYW5nZSkKICAgICAgICAgdmFsdWVzLT5hcHBlbmQoQ1NTVmFsdWVQb29s
OjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVUcmFkaXRpb25hbCkp
OwogICAgICAgICBicmVhazsKICAgICB9Ci0gICAgICAgIAotICAgIHN3aXRjaCAod2lkdGgpIHsK
KworICAgIHN3aXRjaCAod2lkdGgudmFsdWVfb3IoRm9udFZhcmlhbnRFYXN0QXNpYW5XaWR0aDo6
Tm9ybWFsKSkgewogICAgIGNhc2UgRm9udFZhcmlhbnRFYXN0QXNpYW5XaWR0aDo6Tm9ybWFsOgog
ICAgICAgICBicmVhazsKICAgICBjYXNlIEZvbnRWYXJpYW50RWFzdEFzaWFuV2lkdGg6OkZ1bGw6
CkBAIC03NzAsNyArNzg4LDcgQEAgc3RhdGljIFJlZlB0cjxDU1NWYWx1ZT4gY29uc3VtZUZvbnRW
YXJpYW50RWFzdEFzaWFuKENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlKQogICAgICAgICBicmVh
azsKICAgICB9CiAgICAgICAgIAotICAgIHN3aXRjaCAocnVieSkgeworICAgIHN3aXRjaCAocnVi
eS52YWx1ZV9vcihGb250VmFyaWFudEVhc3RBc2lhblJ1Ynk6Ok5vcm1hbCkpIHsKICAgICBjYXNl
IEZvbnRWYXJpYW50RWFzdEFzaWFuUnVieTo6Tm9ybWFsOgogICAgICAgICBicmVhazsKICAgICBj
YXNlIEZvbnRWYXJpYW50RWFzdEFzaWFuUnVieTo6WWVzOgpAQCAtNDkzMyw5ICs0OTUxLDkgQEAg
Ym9vbCBDU1NQcm9wZXJ0eVBhcnNlcjo6Y29uc3VtZUZvbnRWYXJpYW50U2hvcnRoYW5kKGJvb2wg
aW1wb3J0YW50KQogewogICAgIGlmIChpZGVudE1hdGNoZXM8Q1NTVmFsdWVOb3JtYWwsIENTU1Zh
bHVlTm9uZT4obV9yYW5nZS5wZWVrKCkuaWQoKSkpIHsKICAgICAgICAgYWRkUHJvcGVydHkoQ1NT
UHJvcGVydHlGb250VmFyaWFudExpZ2F0dXJlcywgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgY29u
c3VtZUlkZW50KG1fcmFuZ2UpLnJlbGVhc2VOb25OdWxsKCksIGltcG9ydGFudCk7Ci0gICAgICAg
IGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRDYXBzLCBDU1NQcm9wZXJ0eUZvbnRW
YXJpYW50LCBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShD
U1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCk7Ci0gICAgICAgIGFkZFByb3BlcnR5KENTU1Byb3Bl
cnR5Rm9udFZhcmlhbnRFYXN0QXNpYW4sIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIENTU1ZhbHVl
UG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlTm9ybWFsKSwg
aW1wb3J0YW50KTsKLSAgICAgICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlGb250VmFyaWFudFBv
c2l0aW9uLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigp
LmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCk7CisgICAg
ICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRDYXBzLCBDU1NQcm9wZXJ0eUZv
bnRWYXJpYW50LCBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1
ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCwgdHJ1ZSk7CisgICAgICAgIGFkZFByb3BlcnR5
KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRFYXN0QXNpYW4sIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQs
IENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVl
Tm9ybWFsKSwgaW1wb3J0YW50LCB0cnVlKTsKKyAgICAgICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVy
dHlGb250VmFyaWFudFBvc2l0aW9uLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBDU1NWYWx1ZVBv
b2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGlt
cG9ydGFudCwgdHJ1ZSk7CiAgICAgICAgIHJldHVybiBtX3JhbmdlLmF0RW5kKCk7CiAgICAgfQog
CkBAIC00OTQ2LDYgKzQ5NjQsOCBAQCBib29sIENTU1Byb3BlcnR5UGFyc2VyOjpjb25zdW1lRm9u
dFZhcmlhbnRTaG9ydGhhbmQoYm9vbCBpbXBvcnRhbnQpCiAgICAgUmVmUHRyPENTU1ZhbHVlPiBl
YXN0QXNpYW5WYWx1ZTsKICAgICBGb250VmFyaWFudExpZ2F0dXJlc1BhcnNlciBsaWdhdHVyZXNQ
YXJzZXI7CiAgICAgRm9udFZhcmlhbnROdW1lcmljUGFyc2VyIG51bWVyaWNQYXJzZXI7CisgICAg
Ym9vbCBpbXBsaWNpdExpZ2F0dXJlcyA9IHRydWU7CisgICAgYm9vbCBpbXBsaWNpdE51bWVyaWMg
PSB0cnVlOwogICAgIGRvIHsKICAgICAgICAgaWYgKCFjYXBzVmFsdWUpIHsKICAgICAgICAgICAg
IGNhcHNWYWx1ZSA9IGNvbnN1bWVGb250VmFyaWFudENhcHMobV9yYW5nZSk7CkBAIC00OTY3LDkg
KzQ5ODcsMTQgQEAgYm9vbCBDU1NQcm9wZXJ0eVBhcnNlcjo6Y29uc3VtZUZvbnRWYXJpYW50U2hv
cnRoYW5kKGJvb2wgaW1wb3J0YW50KQogCiAgICAgICAgIEZvbnRWYXJpYW50TGlnYXR1cmVzUGFy
c2VyOjpQYXJzZVJlc3VsdCBsaWdhdHVyZXNQYXJzZVJlc3VsdCA9IGxpZ2F0dXJlc1BhcnNlci5j
b25zdW1lTGlnYXR1cmUobV9yYW5nZSk7CiAgICAgICAgIEZvbnRWYXJpYW50TnVtZXJpY1BhcnNl
cjo6UGFyc2VSZXN1bHQgbnVtZXJpY1BhcnNlUmVzdWx0ID0gbnVtZXJpY1BhcnNlci5jb25zdW1l
TnVtZXJpYyhtX3JhbmdlKTsKLSAgICAgICAgaWYgKGxpZ2F0dXJlc1BhcnNlUmVzdWx0ID09IEZv
bnRWYXJpYW50TGlnYXR1cmVzUGFyc2VyOjpQYXJzZVJlc3VsdDo6Q29uc3VtZWRWYWx1ZQotICAg
ICAgICAgICAgfHwgbnVtZXJpY1BhcnNlUmVzdWx0ID09IEZvbnRWYXJpYW50TnVtZXJpY1BhcnNl
cjo6UGFyc2VSZXN1bHQ6OkNvbnN1bWVkVmFsdWUpCisgICAgICAgIGlmIChsaWdhdHVyZXNQYXJz
ZVJlc3VsdCA9PSBGb250VmFyaWFudExpZ2F0dXJlc1BhcnNlcjo6UGFyc2VSZXN1bHQ6OkNvbnN1
bWVkVmFsdWUpIHsKKyAgICAgICAgICAgIGltcGxpY2l0TGlnYXR1cmVzID0gZmFsc2U7CisgICAg
ICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorICAgICAgICBpZiAobnVtZXJpY1BhcnNlUmVz
dWx0ID09IEZvbnRWYXJpYW50TnVtZXJpY1BhcnNlcjo6UGFyc2VSZXN1bHQ6OkNvbnN1bWVkVmFs
dWUpIHsKKyAgICAgICAgICAgIGltcGxpY2l0TnVtZXJpYyA9IGZhbHNlOwogICAgICAgICAgICAg
Y29udGludWU7CisgICAgICAgIH0KIAogICAgICAgICBpZiAobGlnYXR1cmVzUGFyc2VSZXN1bHQg
PT0gRm9udFZhcmlhbnRMaWdhdHVyZXNQYXJzZXI6OlBhcnNlUmVzdWx0OjpEaXNhbGxvd2VkVmFs
dWUKICAgICAgICAgICAgIHx8IG51bWVyaWNQYXJzZVJlc3VsdCA9PSBGb250VmFyaWFudE51bWVy
aWNQYXJzZXI6OlBhcnNlUmVzdWx0OjpEaXNhbGxvd2VkVmFsdWUpCkBAIC00OTc4LDcgKzUwMDMs
NyBAQCBib29sIENTU1Byb3BlcnR5UGFyc2VyOjpjb25zdW1lRm9udFZhcmlhbnRTaG9ydGhhbmQo
Ym9vbCBpbXBvcnRhbnQpCiAgICAgICAgIGlmICghZWFzdEFzaWFuVmFsdWUpIHsKICAgICAgICAg
ICAgIGVhc3RBc2lhblZhbHVlID0gY29uc3VtZUZvbnRWYXJpYW50RWFzdEFzaWFuKG1fcmFuZ2Up
OwogICAgICAgICAgICAgaWYgKGVhc3RBc2lhblZhbHVlKQotICAgICAgICAgICAgY29udGludWU7
CisgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KIAogICAgICAgICAvLyBTYXcg
c29tZSB2YWx1ZSB0aGF0IGRpZG4ndCBtYXRjaCBhbnl0aGluZyBlbHNlLgpAQCAtNDk4NiwxNSAr
NTAxMSwxOSBAQCBib29sIENTU1Byb3BlcnR5UGFyc2VyOjpjb25zdW1lRm9udFZhcmlhbnRTaG9y
dGhhbmQoYm9vbCBpbXBvcnRhbnQpCiAKICAgICB9IHdoaWxlICghbV9yYW5nZS5hdEVuZCgpKTsK
IAotICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRMaWdhdHVyZXMsIENTU1By
b3BlcnR5Rm9udFZhcmlhbnQsIGxpZ2F0dXJlc1BhcnNlci5maW5hbGl6ZVZhbHVlKCkucmVsZWFz
ZU5vbk51bGwoKSwgaW1wb3J0YW50KTsKLSAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRW
YXJpYW50TnVtZXJpYywgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgbnVtZXJpY1BhcnNlci5maW5h
bGl6ZVZhbHVlKCkucmVsZWFzZU5vbk51bGwoKSwgaW1wb3J0YW50KTsKLSAgICBhZGRQcm9wZXJ0
eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50Q2FwcywgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgY2Fw
c1ZhbHVlID8gY2Fwc1ZhbHVlLnJlbGVhc2VOb25OdWxsKCkgOiBDU1NWYWx1ZVBvb2w6OnNpbmds
ZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCk7
Ci0gICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlGb250VmFyaWFudEFsdGVybmF0ZXMsIENTU1By
b3BlcnR5Rm9udFZhcmlhbnQsIGFsdGVybmF0ZXNWYWx1ZSA/IGFsdGVybmF0ZXNWYWx1ZS5yZWxl
YXNlTm9uTnVsbCgpIDogQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVy
VmFsdWUoQ1NTVmFsdWVOb3JtYWwpLCBpbXBvcnRhbnQpOwotICAgIGFkZFByb3BlcnR5KENTU1By
b3BlcnR5Rm9udFZhcmlhbnRQb3NpdGlvbiwgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgcG9zaXRp
b25WYWx1ZSA/IHBvc2l0aW9uVmFsdWUucmVsZWFzZU5vbk51bGwoKSA6IENTU1ZhbHVlUG9vbDo6
c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlTm9ybWFsKSwgaW1wb3J0
YW50KTsKLSAgICAKKyAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50TGlnYXR1
cmVzLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBsaWdhdHVyZXNQYXJzZXIuZmluYWxpemVWYWx1
ZSgpLnJlbGVhc2VOb25OdWxsKCksIGltcG9ydGFudCwgaW1wbGljaXRMaWdhdHVyZXMpOworICAg
IGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnROdW1lcmljLCBDU1NQcm9wZXJ0eUZv
bnRWYXJpYW50LCBudW1lcmljUGFyc2VyLmZpbmFsaXplVmFsdWUoKS5yZWxlYXNlTm9uTnVsbCgp
LCBpbXBvcnRhbnQsIGltcGxpY2l0TnVtZXJpYyk7CisgICAgYm9vbCBpbXBsaWNpdENhcHMgPSAh
Y2Fwc1ZhbHVlOworICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRDYXBzLCBD
U1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBjYXBzVmFsdWUgPyBjYXBzVmFsdWUucmVsZWFzZU5vbk51
bGwoKSA6IENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENT
U1ZhbHVlTm9ybWFsKSwgaW1wb3J0YW50LCBpbXBsaWNpdENhcHMpOworICAgIGJvb2wgaW1wbGlj
aXRBbHRlcm5hdGVzID0gIWFsdGVybmF0ZXNWYWx1ZTsKKyAgICBhZGRQcm9wZXJ0eShDU1NQcm9w
ZXJ0eUZvbnRWYXJpYW50QWx0ZXJuYXRlcywgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgYWx0ZXJu
YXRlc1ZhbHVlID8gYWx0ZXJuYXRlc1ZhbHVlLnJlbGVhc2VOb25OdWxsKCkgOiBDU1NWYWx1ZVBv
b2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGlt
cG9ydGFudCwgaW1wbGljaXRBbHRlcm5hdGVzKTsKKyAgICBib29sIGltcGxpY2l0UG9zaXRpb24g
PSAhcG9zaXRpb25WYWx1ZTsKKyAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50
UG9zaXRpb24sIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIHBvc2l0aW9uVmFsdWUgPyBwb3NpdGlv
blZhbHVlLnJlbGVhc2VOb25OdWxsKCkgOiBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0
ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCwgaW1wbGljaXRQb3Np
dGlvbik7CisKKyAgICBib29sIGltcGxpY2l0RWFzdEFzaWFuID0gIWVhc3RBc2lhblZhbHVlOwog
ICAgIGlmICghZWFzdEFzaWFuVmFsdWUpCiAgICAgICAgIGVhc3RBc2lhblZhbHVlID0gQ1NTVmFs
dWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwp
OwotICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRFYXN0QXNpYW4sIENTU1By
b3BlcnR5Rm9udFZhcmlhbnQsIGVhc3RBc2lhblZhbHVlLnJlbGVhc2VOb25OdWxsKCksIGltcG9y
dGFudCk7CisgICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlGb250VmFyaWFudEVhc3RBc2lhbiwg
Q1NTUHJvcGVydHlGb250VmFyaWFudCwgZWFzdEFzaWFuVmFsdWUucmVsZWFzZU5vbk51bGwoKSwg
aW1wb3J0YW50LCBpbXBsaWNpdEVhc3RBc2lhbik7CiAgICAgCiAgICAgcmV0dXJuIHRydWU7CiB9
CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM
b2cKaW5kZXggOGRiZGIyOGJmNzQ4YmVjMjQyNGZiYjIwNmQxNzBiYmI4NTczNmQ2My4uNWQyZTBl
YTdkZDljNmU5ODNmNjllODFkMWI0NjllYmVjM2MwYTM4NiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz
dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBA
CisyMDIxLTA2LTIxICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ1NT
T00gdGVzdCBmb3Igc2VyaWFsaXppbmcgZm9udC12YXJpYW50IGZhaWxzCisgICAgICAgIGh0dHBz
Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjY3NzAKKworICAgICAgICBSZXZp
ZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICAqIGNzczMvZm9udC12YXJpYW50LXBhcnNp
bmctZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGNzczMvZm9udC12YXJpYW50LXBhcnNpbmcuaHRt
bDoKKwogMjAyMS0wNi0yMCAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAg
ICAgQ1NTIGNvdW50ZXIgc3R5bGUgaW1wcm92ZW1lbnRzIGZvciBBcm1lbmlhbiwgVGFtaWwsIGFu
ZCBzb21lIENKSyBzdHlsZXMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9D
aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IDQzOTc4
Y2QzMGUyZDNiZmQzZTg4OGZmYmI3OWQxMjUyZGM1ZDI4NzQuLmFlYmE5MTQyNWJkNDMzN2E4NzI1
MGFjNDkzN2U4OTRkODEwODQxMGMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz
Yy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAt
MSwzICsxLDE2IEBACisyMDIxLTA2LTIxICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisK
KyAgICAgICAgQ1NTT00gdGVzdCBmb3Igc2VyaWFsaXppbmcgZm9udC12YXJpYW50IGZhaWxzCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjY3NzAKKwor
ICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBVcGRhdGUgaW1wcm92
ZWQgdGVzdCByZXN1bHQuCisKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1m
b250cy9wYXJzaW5nL2ZvbnQtdmFyaWFudC1lYXN0LWFzaWFuLWludmFsaWQtZXhwZWN0ZWQudHh0
OgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZvbnRzL3BhcnNpbmcvZm9u
dC12YXJpYW50LXZhbGlkLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzc29tL3NlcmlhbGl6ZS12YWx1ZXMtZXhwZWN0ZWQudHh0OgorCiAyMDIxLTA2LTE5
ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggQ1NTIHNlcmlh
bGl6YXRpb24gaXNzdWVzIGFmZmVjdGluZyBjc3MtY291bnRlci1zdHlsZXMgdGVzdHMKZGlmZiAt
LWdpdCBhL0xheW91dFRlc3RzL2NzczMvZm9udC12YXJpYW50LXBhcnNpbmctZXhwZWN0ZWQudHh0
IGIvTGF5b3V0VGVzdHMvY3NzMy9mb250LXZhcmlhbnQtcGFyc2luZy1leHBlY3RlZC50eHQKaW5k
ZXggNTVhYWQyOGRjNmQ4MDAzZTkyNWExMGEzY2U3MmU0MmFkY2ZlOTcxOS4uYjc3NGQ4YWIzNjI0
MmVjZWUzM2UwMzMzNGRlNTYzYmI3N2MwZGQxYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvY3Nz
My9mb250LXZhcmlhbnQtcGFyc2luZy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvY3Nz
My9mb250LXZhcmlhbnQtcGFyc2luZy1leHBlY3RlZC50eHQKQEAgLTc0LDEzICs3NCwxMyBAQCBQ
QVNTIHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0ZXN0
RWxlbWVudCcpKS5nZXRQcm9wZXJ0eQogUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZShkb2N1
bWVudC5nZXRFbGVtZW50QnlJZCgndGVzdEVsZW1lbnQnKSkuZ2V0UHJvcGVydHlDU1NWYWx1ZSgn
Zm9udC12YXJpYW50LWVhc3QtYXNpYW4nKS5jc3NUZXh0IGlzICJmdWxsLXdpZHRoIgogUEFTUyB3
aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZShkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGVzdEVsZW1l
bnQnKSkuZ2V0UHJvcGVydHlDU1NWYWx1ZSgnZm9udC12YXJpYW50LWVhc3QtYXNpYW4nKS5jc3NU
ZXh0IGlzICJwcm9wb3J0aW9uYWwtd2lkdGgiCiBQQVNTIHdpbmRvdy5nZXRDb21wdXRlZFN0eWxl
KGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0ZXN0RWxlbWVudCcpKS5nZXRQcm9wZXJ0eUNTU1Zh
bHVlKCdmb250LXZhcmlhbnQtZWFzdC1hc2lhbicpLmNzc1RleHQgaXMgInJ1YnkiCi1QQVNTIHdp
bmRvdy5nZXRDb21wdXRlZFN0eWxlKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0ZXN0RWxlbWVu
dCcpKS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKCdmb250LXZhcmlhbnQtZWFzdC1hc2lhbicpLmNzc1Rl
eHQgaXMgImppczgzIgotUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZShkb2N1bWVudC5nZXRF
bGVtZW50QnlJZCgndGVzdEVsZW1lbnQnKSkuZ2V0UHJvcGVydHlDU1NWYWx1ZSgnZm9udC12YXJp
YW50LWVhc3QtYXNpYW4nKS5jc3NUZXh0IGlzICJ0cmFkaXRpb25hbCIKK1BBU1Mgd2luZG93Lmdl
dENvbXB1dGVkU3R5bGUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3RFbGVtZW50JykpLmdl
dFByb3BlcnR5Q1NTVmFsdWUoJ2ZvbnQtdmFyaWFudC1lYXN0LWFzaWFuJykuY3NzVGV4dCBpcyAi
bm9ybWFsIgorUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZShkb2N1bWVudC5nZXRFbGVtZW50
QnlJZCgndGVzdEVsZW1lbnQnKSkuZ2V0UHJvcGVydHlDU1NWYWx1ZSgnZm9udC12YXJpYW50LWVh
c3QtYXNpYW4nKS5jc3NUZXh0IGlzICJub3JtYWwiCiBQQVNTIHdpbmRvdy5nZXRDb21wdXRlZFN0
eWxlKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0ZXN0RWxlbWVudCcpKS5nZXRQcm9wZXJ0eUNT
U1ZhbHVlKCdmb250LXZhcmlhbnQtZWFzdC1hc2lhbicpLmNzc1RleHQgaXMgInRyYWRpdGlvbmFs
IGZ1bGwtd2lkdGgiCiBQQVNTIHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKGRvY3VtZW50LmdldEVs
ZW1lbnRCeUlkKCd0ZXN0RWxlbWVudCcpKS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKCdmb250LXZhcmlh
bnQtZWFzdC1hc2lhbicpLmNzc1RleHQgaXMgImppczA0IHByb3BvcnRpb25hbC13aWR0aCIKIFBB
U1Mgd2luZG93LmdldENvbXB1dGVkU3R5bGUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3RF
bGVtZW50JykpLmdldFByb3BlcnR5Q1NTVmFsdWUoJ2ZvbnQtdmFyaWFudC1lYXN0LWFzaWFuJyku
Y3NzVGV4dCBpcyAiamlzMDQgcHJvcG9ydGlvbmFsLXdpZHRoIHJ1YnkiCiBQQVNTIHdpbmRvdy5n
ZXRDb21wdXRlZFN0eWxlKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0ZXN0RWxlbWVudCcpKS5n
ZXRQcm9wZXJ0eUNTU1ZhbHVlKCdmb250LXZhcmlhbnQtZWFzdC1hc2lhbicpLmNzc1RleHQgaXMg
ImppczgzIHJ1YnkiCi1QQVNTIHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKGRvY3VtZW50LmdldEVs
ZW1lbnRCeUlkKCd0ZXN0RWxlbWVudCcpKS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKCdmb250LXZhcmlh
bnQtZWFzdC1hc2lhbicpLmNzc1RleHQgaXMgInByb3BvcnRpb25hbC13aWR0aCIKK1BBU1Mgd2lu
ZG93LmdldENvbXB1dGVkU3R5bGUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3RFbGVtZW50
JykpLmdldFByb3BlcnR5Q1NTVmFsdWUoJ2ZvbnQtdmFyaWFudC1lYXN0LWFzaWFuJykuY3NzVGV4
dCBpcyAibm9ybWFsIgogUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQogCiBURVNUIENP
TVBMRVRFCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2ZvbnQtdmFyaWFudC1wYXJzaW5n
Lmh0bWwgYi9MYXlvdXRUZXN0cy9jc3MzL2ZvbnQtdmFyaWFudC1wYXJzaW5nLmh0bWwKaW5kZXgg
ZWI1MWU0Mjc0Y2IyZjdhYjU0NmJlZTRhN2RiNmFhYmI3YTQzNmJkOS4uOWZjZDgxODU4MzUzZjM0
ZDZiYzVmMTk1YjRhMGJhZDIwNmQ2NTgzNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvY3NzMy9m
b250LXZhcmlhbnQtcGFyc2luZy5odG1sCisrKyBiL0xheW91dFRlc3RzL2NzczMvZm9udC12YXJp
YW50LXBhcnNpbmcuaHRtbApAQCAtOTYsMTMgKzk2LDEzIEBAIHJ1blRlc3QoImZvbnQtdmFyaWFu
dC1lYXN0LWFzaWFuIiwgInRyYWRpdGlvbmFsIiwgInRyYWRpdGlvbmFsIik7CiBydW5UZXN0KCJm
b250LXZhcmlhbnQtZWFzdC1hc2lhbiIsICJmdWxsLXdpZHRoIiwgImZ1bGwtd2lkdGgiKTsKIHJ1
blRlc3QoImZvbnQtdmFyaWFudC1lYXN0LWFzaWFuIiwgInByb3BvcnRpb25hbC13aWR0aCIsICJw
cm9wb3J0aW9uYWwtd2lkdGgiKTsKIHJ1blRlc3QoImZvbnQtdmFyaWFudC1lYXN0LWFzaWFuIiwg
InJ1YnkiLCAicnVieSIpOwotcnVuVGVzdCgiZm9udC12YXJpYW50LWVhc3QtYXNpYW4iLCAiamlz
NzggamlzODMiLCAiamlzODMiKTsKLXJ1blRlc3QoImZvbnQtdmFyaWFudC1lYXN0LWFzaWFuIiwg
ImppczkwIHRyYWRpdGlvbmFsIiwgInRyYWRpdGlvbmFsIik7CitydW5UZXN0KCJmb250LXZhcmlh
bnQtZWFzdC1hc2lhbiIsICJqaXM3OCBqaXM4MyIsICJub3JtYWwiKTsKK3J1blRlc3QoImZvbnQt
dmFyaWFudC1lYXN0LWFzaWFuIiwgImppczkwIHRyYWRpdGlvbmFsIiwgIm5vcm1hbCIpOwogcnVu
VGVzdCgiZm9udC12YXJpYW50LWVhc3QtYXNpYW4iLCAiZnVsbC13aWR0aCB0cmFkaXRpb25hbCIs
ICJ0cmFkaXRpb25hbCBmdWxsLXdpZHRoIik7CiBydW5UZXN0KCJmb250LXZhcmlhbnQtZWFzdC1h
c2lhbiIsICJqaXMwNCBwcm9wb3J0aW9uYWwtd2lkdGgiLCAiamlzMDQgcHJvcG9ydGlvbmFsLXdp
ZHRoIik7CiBydW5UZXN0KCJmb250LXZhcmlhbnQtZWFzdC1hc2lhbiIsICJqaXMwNCBwcm9wb3J0
aW9uYWwtd2lkdGggcnVieSIsICJqaXMwNCBwcm9wb3J0aW9uYWwtd2lkdGggcnVieSIpOwogcnVu
VGVzdCgiZm9udC12YXJpYW50LWVhc3QtYXNpYW4iLCAiamlzODMgcnVieSIsICJqaXM4MyBydWJ5
Iik7Ci1ydW5UZXN0KCJmb250LXZhcmlhbnQtZWFzdC1hc2lhbiIsICJmdWxsLXdpZHRoIHByb3Bv
cnRpb25hbC13aWR0aCIsICJwcm9wb3J0aW9uYWwtd2lkdGgiKTsKK3J1blRlc3QoImZvbnQtdmFy
aWFudC1lYXN0LWFzaWFuIiwgImZ1bGwtd2lkdGggcHJvcG9ydGlvbmFsLXdpZHRoIiwgIm5vcm1h
bCIpOwogPC9zY3JpcHQ+CiA8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5q
cyI+PC9zY3JpcHQ+CiA8L2JvZHk+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZm9udHMvcGFyc2luZy9mb250LXZhcmlhbnQt
ZWFzdC1hc2lhbi1pbnZhbGlkLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mb250cy9wYXJzaW5nL2ZvbnQtdmFyaWFudC1l
YXN0LWFzaWFuLWludmFsaWQtZXhwZWN0ZWQudHh0CmluZGV4IDVmNmI5NTg2Nzc3ODZjNzgyZDdl
ZTgxYzUwNmQyNDZhOTIzODllMmUuLjIwZjY3YTQzM2MyNjQwYTRmZjYwYmU1YzE4MzkwOGEyOTMz
NmU4YmQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy1mb250cy9wYXJzaW5nL2ZvbnQtdmFyaWFudC1lYXN0LWFzaWFuLWludmFs
aWQtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1mb250cy9wYXJzaW5nL2ZvbnQtdmFyaWFudC1lYXN0LWFzaWFuLWlu
dmFsaWQtZXhwZWN0ZWQudHh0CkBAIC0xLDUgKzEsNSBAQAogCiBQQVNTIGUuc3R5bGVbJ2ZvbnQt
dmFyaWFudC1lYXN0LWFzaWFuJ10gPSAibm9ybWFsIHJ1YnkiIHNob3VsZCBub3Qgc2V0IHRoZSBw
cm9wZXJ0eSB2YWx1ZQotRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQtZWFzdC1hc2lhbiddID0g
Imppczc4IGppczgzIiBzaG91bGQgbm90IHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X2Vx
dWFsczogZXhwZWN0ZWQgIiIgYnV0IGdvdCAiamlzODMiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFy
aWFudC1lYXN0LWFzaWFuJ10gPSAiZnVsbC13aWR0aCBwcm9wb3J0aW9uYWwtd2lkdGgiIHNob3Vs
ZCBub3Qgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAiIiBi
dXQgZ290ICJwcm9wb3J0aW9uYWwtd2lkdGgiCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudC1l
YXN0LWFzaWFuJ10gPSAiamlzNzggamlzODMiIHNob3VsZCBub3Qgc2V0IHRoZSBwcm9wZXJ0eSB2
YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQtZWFzdC1hc2lhbiddID0gImZ1bGwtd2lk
dGggcHJvcG9ydGlvbmFsLXdpZHRoIiBzaG91bGQgbm90IHNldCB0aGUgcHJvcGVydHkgdmFsdWUK
IApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLWZvbnRzL3BhcnNpbmcvZm9udC12YXJpYW50LXZhbGlkLWV4cGVjdGVkLnR4dCBi
L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mb250
cy9wYXJzaW5nL2ZvbnQtdmFyaWFudC12YWxpZC1leHBlY3RlZC50eHQKaW5kZXggZmMwYmEyNjBi
MDFmOTEyMmI4YjAxZWZkNGZkZGNmNDk4ZTYxZDJjMy4uZjFhM2E1NGY4YTI1OTYwNmYxZjNiZDFl
MjFhMTFkOGExMTlmYjJiOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZvbnRzL3BhcnNpbmcvZm9udC12YXJpYW50LXZhbGlk
LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3MtZm9udHMvcGFyc2luZy9mb250LXZhcmlhbnQtdmFsaWQtZXhwZWN0ZWQu
dHh0CkBAIC0xLDIyICsxLDIyIEBACiAKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAi
bm9ybWFsIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczog
cHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0
eWxlWydmb250LXZhcmlhbnQnXSA9ICJub25lIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1
ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dl
ZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJjb21tb24tbGlnYXR1
cmVzIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJv
cGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxl
Wydmb250LXZhcmlhbnQnXSA9ICJuby1jb21tb24tbGlnYXR1cmVzIiBzaG91bGQgc2V0IHRoZSBw
cm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNldCBn
b3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJk
aXNjcmV0aW9uYXJ5LWxpZ2F0dXJlcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNz
ZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFs
dWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAibm8tZGlzY3JldGlvbmFyeS1s
aWdhdHVyZXMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxz
OiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUu
c3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImhpc3RvcmljYWwtbGlnYXR1cmVzIiBzaG91bGQgc2V0
IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJl
IHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQn
XSA9ICJuby1oaXN0b3JpY2FsLWxpZ2F0dXJlcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFs
dWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93
ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiY29udGV4dHVhbCIg
c2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5
IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9u
dC12YXJpYW50J10gPSAibm8tY29udGV4dHVhbCIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFs
dWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93
ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAic21hbGwtY2FwcyIg
c2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5
IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9u
dC12YXJpYW50J10gPSAiYWxsLXNtYWxsLWNhcHMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZh
bHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxv
d2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInBldGl0ZS1jYXBz
IiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVy
dHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydm
b250LXZhcmlhbnQnXSA9ICJhbGwtcGV0aXRlLWNhcHMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5
IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNh
bGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInVuaWNhc2Ui
IHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0
eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2Zv
bnQtdmFyaWFudCddID0gInRpdGxpbmctY2FwcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFs
dWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93
ZWQgdmFsdWUgIiIKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAibm9ybWFsIiBzaG91
bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9
ICJub25lIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250
LXZhcmlhbnQnXSA9ICJjb21tb24tbGlnYXR1cmVzIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2
YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJuby1jb21tb24tbGlnYXR1cmVz
IiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlh
bnQnXSA9ICJkaXNjcmV0aW9uYXJ5LWxpZ2F0dXJlcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkg
dmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAibm8tZGlzY3JldGlvbmFyeS1s
aWdhdHVyZXMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2Zv
bnQtdmFyaWFudCddID0gImhpc3RvcmljYWwtbGlnYXR1cmVzIiBzaG91bGQgc2V0IHRoZSBwcm9w
ZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJuby1oaXN0b3JpY2Fs
LWxpZ2F0dXJlcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsn
Zm9udC12YXJpYW50J10gPSAiY29udGV4dHVhbCIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFs
dWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAibm8tY29udGV4dHVhbCIgc2hvdWxk
IHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAi
c21hbGwtY2FwcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsn
Zm9udC12YXJpYW50J10gPSAiYWxsLXNtYWxsLWNhcHMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5
IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInBldGl0ZS1jYXBzIiBzaG91
bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9
ICJhbGwtcGV0aXRlLWNhcHMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUu
c3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInVuaWNhc2UiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5
IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInRpdGxpbmctY2FwcyIgc2hv
dWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUKIEZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10g
PSAic3R5bGlzdGljKGZsb3dpbmcpIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3Nl
cnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1
ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJoaXN0b3JpY2FsLWZvcm1zIiBz
aG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkg
c2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgorUEFTUyBlLnN0eWxlWydmb250
LXZhcmlhbnQnXSA9ICJoaXN0b3JpY2FsLWZvcm1zIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2
YWx1ZQogRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJzdHlsZXNldChmbG93aW5nKSIg
c2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5
IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKIEZBSUwgZS5zdHlsZVsnZm9u
dC12YXJpYW50J10gPSAiY2hhcmFjdGVyLXZhcmlhbnQoZmxvd2luZykiIHNob3VsZCBzZXQgdGhl
IHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0
IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCiBGQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0g
InN3YXNoKGZsb3dpbmcpIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90
X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgpA
QCAtMjQsMjUgKzI0LDI1IEBAIEZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAib3JuYW1l
bnRzKGZsb3dpbmcpIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1CiBGQUlMIGUuc3R5bGVb
J2ZvbnQtdmFyaWFudCddID0gImFubm90YXRpb24oZmxvd2luZykiIHNob3VsZCBzZXQgdGhlIHBy
b3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdv
dCBkaXNhbGxvd2VkIHZhbHVlICIiCiBGQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInN0
eWxpc3RpYyhmbG93aW5nKSBoaXN0b3JpY2FsLWZvcm1zIHN0eWxlc2V0KGZsb3dpbmcpIGNoYXJh
Y3Rlci12YXJpYW50KGZsb3dpbmcpIHN3YXNoKGZsb3dpbmcpIG9ybmFtZW50cyhmbG93aW5nKSBh
bm5vdGF0aW9uKGZsb3dpbmcpIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRf
bm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAi
IgogRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJhbm5vdGF0aW9uKGZsb3dpbmcpIG9y
bmFtZW50cyhmbG93aW5nKSBzd2FzaChmbG93aW5nKSBjaGFyYWN0ZXItdmFyaWFudChmbG93aW5n
KSBzdHlsZXNldChmbG93aW5nKSBoaXN0b3JpY2FsLWZvcm1zIHN0eWxpc3RpYyhmbG93aW5nKSIg
c2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5
IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9u
dC12YXJpYW50J10gPSAibGluaW5nLW51bXMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVl
IGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2Vk
IHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gIm9sZHN0eWxlLW51bXMi
IHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0
eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2Zv
bnQtdmFyaWFudCddID0gInByb3BvcnRpb25hbC1udW1zIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0
eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlz
YWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJ0YWJ1bGFy
LW51bXMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBw
cm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5
bGVbJ2ZvbnQtdmFyaWFudCddID0gImRpYWdvbmFsLWZyYWN0aW9ucyIgc2hvdWxkIHNldCB0aGUg
cHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQg
Z290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAi
c3RhY2tlZC1mcmFjdGlvbnMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9u
b3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIi
Ci1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gIm9yZGluYWwiIHNob3VsZCBzZXQgdGhl
IHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0
IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0g
InNsYXNoZWQtemVybyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0X25vdF9l
cXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUgIiIKLUZB
SUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiamlzNzgiIHNob3VsZCBzZXQgdGhlIHByb3Bl
cnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBk
aXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImppczgz
IiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVy
dHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydm
b250LXZhcmlhbnQnXSA9ICJqaXM5MCIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNz
ZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFs
dWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiamlzMDQiIHNob3VsZCBzZXQg
dGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUg
c2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCdd
ID0gInNpbXBsaWZpZWQiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3Rf
ZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1G
QUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInRyYWRpdGlvbmFsIiBzaG91bGQgc2V0IHRo
ZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2VxdWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNl
dCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJTCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9
ICJmdWxsLXdpZHRoIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZSBhc3NlcnRfbm90X2Vx
dWFsczogcHJvcGVydHkgc2hvdWxkIGJlIHNldCBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAiIgotRkFJ
TCBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJwcm9wb3J0aW9uYWwtd2lkdGgiIHNob3VsZCBz
ZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQg
YmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFu
dCddID0gInJ1YnkiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1
YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCi1GQUlM
IGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInN1YiIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkg
dmFsdWUgYXNzZXJ0X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2Fs
bG93ZWQgdmFsdWUgIiIKLUZBSUwgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAic3VwZXIiIHNo
b3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBz
aG91bGQgYmUgc2V0IGdvdCBkaXNhbGxvd2VkIHZhbHVlICIiCitQQVNTIGUuc3R5bGVbJ2ZvbnQt
dmFyaWFudCddID0gImxpbmluZy1udW1zIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQor
UEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJvbGRzdHlsZS1udW1zIiBzaG91bGQgc2V0
IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJwcm9w
b3J0aW9uYWwtbnVtcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHls
ZVsnZm9udC12YXJpYW50J10gPSAidGFidWxhci1udW1zIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0
eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJkaWFnb25hbC1mcmFjdGlv
bnMiIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFy
aWFudCddID0gInN0YWNrZWQtZnJhY3Rpb25zIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1
ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJvcmRpbmFsIiBzaG91bGQgc2V0IHRo
ZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJzbGFzaGVk
LXplcm8iIHNob3VsZCBzZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQt
dmFyaWFudCddID0gImppczc4IiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBl
LnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJqaXM4MyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkg
dmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiamlzOTAiIHNob3VsZCBzZXQg
dGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gImppczA0
IiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlh
bnQnXSA9ICJzaW1wbGlmaWVkIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQorUEFTUyBl
LnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJ0cmFkaXRpb25hbCIgc2hvdWxkIHNldCB0aGUgcHJv
cGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50J10gPSAiZnVsbC13aWR0aCIg
c2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUKK1BBU1MgZS5zdHlsZVsnZm9udC12YXJpYW50
J10gPSAicHJvcG9ydGlvbmFsLXdpZHRoIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQor
UEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJydWJ5IiBzaG91bGQgc2V0IHRoZSBwcm9w
ZXJ0eSB2YWx1ZQorUEFTUyBlLnN0eWxlWydmb250LXZhcmlhbnQnXSA9ICJzdWIiIHNob3VsZCBz
ZXQgdGhlIHByb3BlcnR5IHZhbHVlCitQQVNTIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInN1
cGVyIiBzaG91bGQgc2V0IHRoZSBwcm9wZXJ0eSB2YWx1ZQogRkFJTCBlLnN0eWxlWydmb250LXZh
cmlhbnQnXSA9ICJjb21tb24tbGlnYXR1cmVzIGRpc2NyZXRpb25hcnktbGlnYXR1cmVzIGhpc3Rv
cmljYWwtbGlnYXR1cmVzIGNvbnRleHR1YWwgc21hbGwtY2FwcyBzdHlsaXN0aWMoZmxvd2luZykg
bGluaW5nLW51bXMgcHJvcG9ydGlvbmFsLW51bXMgZGlhZ29uYWwtZnJhY3Rpb25zIG9yZGluYWwg
c2xhc2hlZC16ZXJvIGppczc4IGZ1bGwtd2lkdGggcnVieSBzdWIiIHNob3VsZCBzZXQgdGhlIHBy
b3BlcnR5IHZhbHVlIGFzc2VydF9ub3RfZXF1YWxzOiBwcm9wZXJ0eSBzaG91bGQgYmUgc2V0IGdv
dCBkaXNhbGxvd2VkIHZhbHVlICIiCiBGQUlMIGUuc3R5bGVbJ2ZvbnQtdmFyaWFudCddID0gInN1
cGVyIHByb3BvcnRpb25hbC13aWR0aCBqaXM4MyBzdGFja2VkLWZyYWN0aW9ucyB0YWJ1bGFyLW51
bXMgb2xkc3R5bGUtbnVtcyBoaXN0b3JpY2FsLWZvcm1zIGFsbC1zbWFsbC1jYXBzIG5vLWNvbnRl
eHR1YWwgbm8taGlzdG9yaWNhbC1saWdhdHVyZXMgbm8tZGlzY3JldGlvbmFyeS1saWdhdHVyZXMg
bm8tY29tbW9uLWxpZ2F0dXJlcyIgc2hvdWxkIHNldCB0aGUgcHJvcGVydHkgdmFsdWUgYXNzZXJ0
X25vdF9lcXVhbHM6IHByb3BlcnR5IHNob3VsZCBiZSBzZXQgZ290IGRpc2FsbG93ZWQgdmFsdWUg
IiIKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3Nzb20vc2VyaWFsaXplLXZhbHVlcy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0
cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3NvbS9zZXJpYWxpemUtdmFs
dWVzLWV4cGVjdGVkLnR4dAppbmRleCA4MzBhZWViZmQ1ZDA0YWVhZTM3ODNjOWEzOTMyNjE3ODBm
MDg5ZjQ0Li41ZmExNmE0ZDAzYjkxOWIxZWY1MDhjODljMDBjYmFjODcxODc2ZTM1IDEwMDY0NAot
LS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Nv
bS9zZXJpYWxpemUtdmFsdWVzLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3NvbS9zZXJpYWxpemUtdmFsdWVzLWV4cGVj
dGVkLnR4dApAQCAtMzkzLDkgKzM5Myw5IEBAIFBBU1MgZm9udC1zdHlsZTogbm9ybWFsCiBQQVNT
IGZvbnQtc3R5bGU6IGl0YWxpYwogUEFTUyBmb250LXN0eWxlOiBvYmxpcXVlCiBQQVNTIGZvbnQt
c3R5bGU6IGluaGVyaXQKLUZBSUwgZm9udC12YXJpYW50OiBub3JtYWwgYXNzZXJ0X2VxdWFsczog
Zm9udC12YXJpYW50IHJhdyBpbmxpbmUgc3R5bGUgZGVjbGFyYXRpb24gZXhwZWN0ZWQgIm5vcm1h
bCIgYnV0IGdvdCAiIgotRkFJTCBmb250LXZhcmlhbnQ6IHNtYWxsLWNhcHMgYXNzZXJ0X2VxdWFs
czogZm9udC12YXJpYW50IHJhdyBpbmxpbmUgc3R5bGUgZGVjbGFyYXRpb24gZXhwZWN0ZWQgInNt
YWxsLWNhcHMiIGJ1dCBnb3QgIiIKLUZBSUwgZm9udC12YXJpYW50OiBpbmhlcml0IGFzc2VydF9l
cXVhbHM6IGZvbnQtdmFyaWFudCByYXcgaW5saW5lIHN0eWxlIGRlY2xhcmF0aW9uIGV4cGVjdGVk
ICJpbmhlcml0IiBidXQgZ290ICIiCitQQVNTIGZvbnQtdmFyaWFudDogbm9ybWFsCitQQVNTIGZv
bnQtdmFyaWFudDogc21hbGwtY2FwcworUEFTUyBmb250LXZhcmlhbnQ6IGluaGVyaXQKIFBBU1Mg
Zm9udC13ZWlnaHQ6IG5vcm1hbAogUEFTUyBmb250LXdlaWdodDogYm9sZAogUEFTUyBmb250LXdl
aWdodDogYm9sZGVyCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>