<?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>217077</bug_id>
          
          <creation_ts>2020-09-28 19:28:32 -0700</creation_ts>
          <short_desc>Storage Access API: Enable per-page storage access scope and align test cases</short_desc>
          <delta_ts>2022-12-15 06:59:10 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>WebKit Misc.</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          <see_also>https://bugs.webkit.org/show_bug.cgi?id=249382</see_also>
          <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="John Wilander">wilander</reporter>
          <assigned_to name="John Wilander">wilander</assigned_to>
          <cc>bfulgham</cc>
    
    <cc>cdumez</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>kangil.han</cc>
    
    <cc>tsavell</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1692797</commentid>
    <comment_count>0</comment_count>
    <who name="John Wilander">wilander</who>
    <bug_when>2020-09-28 19:28:32 -0700</bug_when>
    <thetext>It was decided in https://github.com/privacycg/storage-access/issues/3 that browsers should grant storage access for all same-site resources on the whole page, not just the requesting iframe.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1692798</commentid>
    <comment_count>1</comment_count>
    <who name="John Wilander">wilander</who>
    <bug_when>2020-09-28 19:28:47 -0700</bug_when>
    <thetext>&lt;rdar://problem/69017878&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1692806</commentid>
    <comment_count>2</comment_count>
      <attachid>409955</attachid>
    <who name="John Wilander">wilander</who>
    <bug_when>2020-09-28 19:48:57 -0700</bug_when>
    <thetext>Created attachment 409955
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1693416</commentid>
    <comment_count>3</comment_count>
      <attachid>409955</attachid>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2020-09-30 09:55:14 -0700</bug_when>
    <thetext>Comment on attachment 409955
Patch

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

&gt; Source/WebCore/ChangeLog:21
&gt; +            Changed the default setting for m_storageAccessScope.

&quot;to per-page.&quot;

&gt; Source/WebCore/page/Settings.yaml:705
&gt; +  initial: true

Does this setting only exist to support test cases? I wonder if we should have some place to collect these kinds of settings (not relevant to this patch today, just an idea).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1693607</commentid>
    <comment_count>4</comment_count>
      <attachid>410184</attachid>
    <who name="John Wilander">wilander</who>
    <bug_when>2020-09-30 17:59:38 -0700</bug_when>
    <thetext>Created attachment 410184
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1693609</commentid>
    <comment_count>5</comment_count>
      <attachid>410185</attachid>
    <who name="John Wilander">wilander</who>
    <bug_when>2020-09-30 18:01:16 -0700</bug_when>
    <thetext>Created attachment 410185
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1693610</commentid>
    <comment_count>6</comment_count>
    <who name="John Wilander">wilander</who>
    <bug_when>2020-09-30 18:03:35 -0700</bug_when>
    <thetext>(In reply to Brent Fulgham from comment #3)
&gt; Comment on attachment 409955 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=409955&amp;action=review
&gt; 
&gt; &gt; Source/WebCore/ChangeLog:21
&gt; &gt; +            Changed the default setting for m_storageAccessScope.
&gt; 
&gt; &quot;to per-page.&quot;

Fixed.

&gt; &gt; Source/WebCore/page/Settings.yaml:705
&gt; &gt; +  initial: true
&gt; 
&gt; Does this setting only exist to support test cases? I wonder if we should
&gt; have some place to collect these kinds of settings (not relevant to this
&gt; patch today, just an idea).

It is only for test cases, yes.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1693611</commentid>
    <comment_count>7</comment_count>
    <who name="John Wilander">wilander</who>
    <bug_when>2020-09-30 18:03:46 -0700</bug_when>
    <thetext>Also, thanks for the review, Brent!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1693640</commentid>
    <comment_count>8</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-09-30 20:21:12 -0700</bug_when>
    <thetext>Committed r267817: &lt;https://trac.webkit.org/changeset/267817&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 410185.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1693749</commentid>
    <comment_count>9</comment_count>
    <who name="Truitt Savell">tsavell</who>
    <bug_when>2020-10-01 08:15:22 -0700</bug_when>
    <thetext>It looks like the changes in https://trac.webkit.org/changeset/267817/webkit

broke these two tests 
http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-iframe-from-prevalent-domain-without-user-interaction.html 
http/tests/storageAccess/request-storage-access-cross-origin-sandboxed-iframe-without-allow-token.html

History:
https://results.webkit.org/?suite=layout-tests&amp;suite=layout-tests&amp;test=http%2Ftests%2FstorageAccess%2Frequest-and-grant-access-cross-origin-sandboxed-iframe-from-prevalent-domain-without-user-interaction.html&amp;test=http%2Ftests%2FstorageAccess%2Frequest-storage-access-cross-origin-sandboxed-iframe-without-allow-token.html

Diffs

--- /Volumes/Data/slave/catalina-release-tests-wk2/build/layout-test-results/http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-iframe-from-prevalent-domain-without-user-interaction-expected.txt
+++ /Volumes/Data/slave/catalina-release-tests-wk2/build/layout-test-results/http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-iframe-from-prevalent-domain-without-user-interaction-actual.txt
@@ -3,8 +3,9 @@
 On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
 
 
-PASS Storage access was denied. document.cookie == , cookies seen server-side == &quot;No cookies&quot;
+FAIL FAIL Storage access was granted and requestStorageAccessResolved was not granted but should not have been granted. document.cookie ==
 PASS successfullyParsed is true
+Some tests failed.
 
 TEST COMPLETE
 

--- /Volumes/Data/slave/catalina-release-tests-wk2/build/layout-test-results/http/tests/storageAccess/request-storage-access-cross-origin-sandboxed-iframe-without-allow-token-expected.txt
+++ /Volumes/Data/slave/catalina-release-tests-wk2/build/layout-test-results/http/tests/storageAccess/request-storage-access-cross-origin-sandboxed-iframe-without-allow-token-actual.txt
@@ -3,8 +3,9 @@
 On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
 
 
-PASS Storage access was denied. document.cookie == , cookies seen server-side == &quot;No cookies&quot;
+FAIL Storage access was granted and requestStorageAccessResolved was not granted but should not have been granted. document.cookie ==
 PASS successfullyParsed is true
+Some tests failed.
 
 TEST COMPLETE</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1693752</commentid>
    <comment_count>10</comment_count>
    <who name="John Wilander">wilander</who>
    <bug_when>2020-10-01 08:24:50 -0700</bug_when>
    <thetext>All tests passed on my system and the previous patch was all green on EWS. You can revert my patch if you want. I’ll investigate.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1693793</commentid>
    <comment_count>11</comment_count>
    <who name="John Wilander">wilander</who>
    <bug_when>2020-10-01 10:43:23 -0700</bug_when>
    <thetext>I can reproduce the failures when not running with the -f flag.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1694244</commentid>
    <comment_count>12</comment_count>
    <who name="Truitt Savell">tsavell</who>
    <bug_when>2020-10-02 14:53:14 -0700</bug_when>
    <thetext>Reverted r267817 for reason:

Broke two tests on Mac

Committed r267897: &lt;https://trac.webkit.org/changeset/267897&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1694628</commentid>
    <comment_count>13</comment_count>
      <attachid>410500</attachid>
    <who name="John Wilander">wilander</who>
    <bug_when>2020-10-04 21:17:25 -0700</bug_when>
    <thetext>Created attachment 410500
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1694629</commentid>
    <comment_count>14</comment_count>
      <attachid>410500</attachid>
    <who name="John Wilander">wilander</who>
    <bug_when>2020-10-04 21:19:11 -0700</bug_when>
    <thetext>Comment on attachment 410500
Patch

Brent, I fixed the two failing tests by adding WebPage::clearPageLevelStorageAccess() and calling it in WebProcess::clearResourceLoadStatistics(). Your name is still as reviewer in the change log. If it looks good to you, please cq+. Thanks!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1694734</commentid>
    <comment_count>15</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-10-05 09:42:12 -0700</bug_when>
    <thetext>Committed r267973: &lt;https://trac.webkit.org/changeset/267973&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 410500.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>409955</attachid>
            <date>2020-09-28 19:48:57 -0700</date>
            <delta_ts>2020-09-30 17:59:36 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-217077-20200928194856.patch</filename>
            <type>text/plain</type>
            <size>23153</size>
            <attacher name="John Wilander">wilander</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NzE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmZjYzQyMmJjOTdiZTAx
MDA0MTRlM2I4M2RlYmVkZDBiMTU2MGNmMy4uZmY3OTY4MjUwMDA4NzdmMmE1MjRiNGJjMjA4YTY5
NGIxOTY5NTJlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIwLTA5LTI4ICBKb2hu
IFdpbGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIFN0b3JhZ2UgQWNjZXNz
IEFQSTogRW5hYmxlIHBlci1wYWdlIHN0b3JhZ2UgYWNjZXNzIHNjb3BlIGFuZCBhbGlnbiB0ZXN0
IGNhc2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y
MTcwNzcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY5MDE3ODc4PgorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gRXhpc3Rpbmcg
dGVzdHMgYWxpZ25lZCwgaW5jbHVkaW5nCisgICAgICAgIExheW91dFRlc3RzL2h0dHAvdGVzdHMv
c3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3Mtd2l0aC1wZXItcGFnZS1zY29w
ZS1hY2Nlc3MtZnJvbS1hbm90aGVyLWZyYW1lLmh0bWwKKyAgICAgICAgd2hpY2ggbm8gbG9uZ2Vy
IGNhbGxzCisgICAgICAgIGludGVybmFscy5zZXR0aW5ncy5zZXRTdG9yYWdlQWNjZXNzQVBJUGVy
UGFnZVNjb3BlRW5hYmxlZCh0cnVlKQorICAgICAgICB0byBvcHQgaW4gdG8gdGhlIHNldHRpbmcg
dGhhdCBpcyBub3cgdGhlIGRlZmF1bHQuCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnRTdG9yYWdl
QWNjZXNzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50U3RvcmFnZUFjY2Vzczo6cmVx
dWVzdFN0b3JhZ2VBY2Nlc3MpOgorICAgICAgICAgICAgQ2hhbmdlZCB0aGUgc2V0dGluZ3MgY2hl
Y2sgdG8gZG8gdGhlIHJldmVyc2UsIGkuZS4gYXNzdW1lCisgICAgICAgICAgICBwZXItcGFnZSBh
Y2Nlc3MgYnkgZGVmYXVsdCBhbmQgcGVyLWZyYW1lIGFjY2VzcyBhcyB0aGUKKyAgICAgICAgICAg
IGV4Y2VwdGlvbi4KKyAgICAgICAgKiBkb20vRG9jdW1lbnRTdG9yYWdlQWNjZXNzLmg6CisgICAg
ICAgICAgICBDaGFuZ2VkIHRoZSBkZWZhdWx0IHNldHRpbmcgZm9yIG1fc3RvcmFnZUFjY2Vzc1Nj
b3BlLgorICAgICAgICAqIHBhZ2UvU2V0dGluZ3MueWFtbDoKKyAgICAgICAgICAgIENoYW5nZWQg
dGhlIGRlZmF1bHQgdG8gdHJ1ZSBmb3IKKyAgICAgICAgICAgIHN0b3JhZ2VBY2Nlc3NBUElQZXJQ
YWdlU2NvcGVFbmFibGVkLgorCiAyMDIwLTA5LTI4ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxz
b25AYXBwbGUuY29tPgogCiAgICAgICAgIFtHUFVQXSBPdXQtb2YtYmFuZCBUZXh0VHJhY2tzCmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdl
TG9nCmluZGV4IDQ0MWVkYTkyYjFiOGFmMzBlMjZlMmE2ODZhMDRjYjZjMjAwZTFhMGEuLjc5ODc5
YWFjN2IzZmQ5YzdiYjg5ZDgwYzU0Yjg1MTQ1YmVhNGNiZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs
MTYgQEAKKzIwMjAtMDktMjggIEpvaG4gV2lsYW5kZXIgIDx3aWxhbmRlckBhcHBsZS5jb20+CisK
KyAgICAgICAgU3RvcmFnZSBBY2Nlc3MgQVBJOiBFbmFibGUgcGVyLXBhZ2Ugc3RvcmFnZSBhY2Nl
c3Mgc2NvcGUgYW5kIGFsaWduIHRlc3QgY2FzZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzA3NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjkw
MTc4Nzg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg
KiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBh
Z2U6Omhhc1N0b3JhZ2VBY2Nlc3MpOgorICAgICAgICAgICAgQWRkZWQgYSBjYWxsIHRvIFdlYlBh
Z2U6Omhhc1BhZ2VMZXZlbFN0b3JhZ2VBY2Nlc3MoKQorICAgICAgICAgICAgYW5kIGFuIGVhcmx5
IHJldHVybiBpZiBpdCByZXR1cm5zIHRydWUuCisKIDIwMjAtMDktMjggIEVyaWMgQ2FybHNvbiAg
PGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0dQVVBdIE91dC1vZi1iYW5kIFRl
eHRUcmFja3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudFN0b3JhZ2VB
Y2Nlc3MuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50U3RvcmFnZUFjY2Vzcy5jcHAK
aW5kZXggMjE5MGZiNTA0NzA5ZjgwMjcxZDNjZmYyMDdjOGMwNDRiY2NkMTNlNi4uODc0ZTU2MDhj
ZGNjMWNlZmFjYjc4NmZhMGIwM2QyMDA3YmM0NDk2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv
cmUvZG9tL0RvY3VtZW50U3RvcmFnZUFjY2Vzcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9t
L0RvY3VtZW50U3RvcmFnZUFjY2Vzcy5jcHAKQEAgLTE5Nyw4ICsxOTcsOCBAQCB2b2lkIERvY3Vt
ZW50U3RvcmFnZUFjY2Vzczo6cmVxdWVzdFN0b3JhZ2VBY2Nlc3MoUmVmPERlZmVycmVkUHJvbWlz
ZT4mJiBwcm9taXNlKQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgaWYgKHBhZ2UtPnNl
dHRpbmdzKCkuc3RvcmFnZUFjY2Vzc0FQSVBlclBhZ2VTY29wZUVuYWJsZWQoKSkKLSAgICAgICAg
bV9zdG9yYWdlQWNjZXNzU2NvcGUgPSBTdG9yYWdlQWNjZXNzU2NvcGU6OlBlclBhZ2U7CisgICAg
aWYgKCFwYWdlLT5zZXR0aW5ncygpLnN0b3JhZ2VBY2Nlc3NBUElQZXJQYWdlU2NvcGVFbmFibGVk
KCkpCisgICAgICAgIG1fc3RvcmFnZUFjY2Vzc1Njb3BlID0gU3RvcmFnZUFjY2Vzc1Njb3BlOjpQ
ZXJGcmFtZTsKIAogICAgIHBhZ2UtPmNocm9tZSgpLmNsaWVudCgpLnJlcXVlc3RTdG9yYWdlQWNj
ZXNzKFJlZ2lzdHJhYmxlRG9tYWluOjp1bmNoZWNrZWRDcmVhdGVGcm9tSG9zdChtX2RvY3VtZW50
LnNlY3VyaXR5T3JpZ2luKCkuaG9zdCgpKSwgUmVnaXN0cmFibGVEb21haW46OnVuY2hlY2tlZENy
ZWF0ZUZyb21Ib3N0KG1fZG9jdW1lbnQudG9wRG9jdW1lbnQoKS5zZWN1cml0eU9yaWdpbigpLmhv
c3QoKSksICpmcmFtZSwgbV9zdG9yYWdlQWNjZXNzU2NvcGUsIFt0aGlzLCB3ZWFrVGhpcyA9IG1h
a2VXZWFrUHRyKCp0aGlzKSwgcHJvbWlzZSA9IFdURk1vdmUocHJvbWlzZSldIChSZXF1ZXN0U3Rv
cmFnZUFjY2Vzc1Jlc3VsdCByZXN1bHQpIG11dGFibGUgewogICAgICAgICBpZiAoIXdlYWtUaGlz
KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50U3RvcmFnZUFjY2Vzcy5o
IGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50U3RvcmFnZUFjY2Vzcy5oCmluZGV4IDA2NmNl
YzdkZmM1NGQ3ZjI3OTlmZDcxMGVhYjE2MGExMWEwMTMyOGIuLmVjMTA3OWVkYjEyNDY2ZmQ5NTQ1
ZTUyNzZlMmQyYjU1YzYzNGNlZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1
bWVudFN0b3JhZ2VBY2Nlc3MuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRTdG9y
YWdlQWNjZXNzLmgKQEAgLTEwOSw3ICsxMDksNyBAQCBwcml2YXRlOgogCiAgICAgdWludDhfdCBt
X251bWJlck9mVGltZXNFeHBsaWNpdGx5RGVuaWVkRnJhbWVTcGVjaWZpY1N0b3JhZ2VBY2Nlc3Mg
PSAwOwogCi0gICAgU3RvcmFnZUFjY2Vzc1Njb3BlIG1fc3RvcmFnZUFjY2Vzc1Njb3BlID0gU3Rv
cmFnZUFjY2Vzc1Njb3BlOjpQZXJGcmFtZTsKKyAgICBTdG9yYWdlQWNjZXNzU2NvcGUgbV9zdG9y
YWdlQWNjZXNzU2NvcGUgPSBTdG9yYWdlQWNjZXNzU2NvcGU6OlBlclBhZ2U7CiB9OwogCiB0ZW1w
bGF0ZTxjbGFzcyBFbmNvZGVyPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0
aW5ncy55YW1sIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy55YW1sCmluZGV4IDdjZDVk
ZjEwZmZkMTBmZjczZDQ5M2JlMWMwOWE4MTlkMjQ1MjY0MDUuLmFiNGQ5NmUxMTEyMGM0YmYzNWE2
YTkyM2E5ZWNiMjVmNjk1MzljMWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0
dGluZ3MueWFtbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLnlhbWwKQEAgLTcw
Miw3ICs3MDIsNyBAQCBzdG9yYWdlQWNjZXNzQVBJRW5hYmxlZDoKICAgaW5pdGlhbDogdHJ1ZQog
CiBzdG9yYWdlQWNjZXNzQVBJUGVyUGFnZVNjb3BlRW5hYmxlZDoKLSAgaW5pdGlhbDogZmFsc2UK
KyAgaW5pdGlhbDogdHJ1ZQogCiB0aW1lV2l0aG91dE1vdXNlTW92ZW1lbnRCZWZvcmVIaWRpbmdD
b250cm9sczoKICAgdHlwZTogU2Vjb25kcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQ
cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi
UGFnZS9XZWJQYWdlLmNwcAppbmRleCBmZTFhZDA3NjExODA5NTM3YmNmOTZmMWNlZGZlZTU3OTg3
M2M0M2ExLi4zMTRhOWJhY2ZiOWNjMmY4OWE2ZWVmN2FiNDUzMjQzNDAyNjRjYThkIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9T
b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtNjgyMyw2ICs2
ODIzLDExIEBAIHZvaWQgV2ViUGFnZTo6ZnJhbWVCZWNhbWVSZW1vdGUoRnJhbWVJZGVudGlmaWVy
IGZyYW1lSUQsIEdsb2JhbEZyYW1lSWRlbnRpZmllciYmCiAjaWYgRU5BQkxFKFJFU09VUkNFX0xP
QURfU1RBVElTVElDUykKIHZvaWQgV2ViUGFnZTo6aGFzU3RvcmFnZUFjY2VzcyhSZWdpc3RyYWJs
ZURvbWFpbiYmIHN1YkZyYW1lRG9tYWluLCBSZWdpc3RyYWJsZURvbWFpbiYmIHRvcEZyYW1lRG9t
YWluLCBXZWJGcmFtZSYgZnJhbWUsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+JiYgY29t
cGxldGlvbkhhbmRsZXIpCiB7CisgICAgaWYgKGhhc1BhZ2VMZXZlbFN0b3JhZ2VBY2Nlc3ModG9w
RnJhbWVEb21haW4sIHN1YkZyYW1lRG9tYWluKSkgeworICAgICAgICBjb21wbGV0aW9uSGFuZGxl
cih0cnVlKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIFdlYlByb2Nlc3M6OnNpbmds
ZXRvbigpLmVuc3VyZU5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbigpLmNvbm5lY3Rpb24oKS5zZW5k
V2l0aEFzeW5jUmVwbHkoTWVzc2FnZXM6Ok5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpI
YXNTdG9yYWdlQWNjZXNzKFdURk1vdmUoc3ViRnJhbWVEb21haW4pLCBXVEZNb3ZlKHRvcEZyYW1l
RG9tYWluKSwgZnJhbWUuZnJhbWVJRCgpLCBtX2lkZW50aWZpZXIpLCBXVEZNb3ZlKGNvbXBsZXRp
b25IYW5kbGVyKSk7CiB9CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xh
eW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkMjA4NTU0N2RmOWYxM2EyMjAyZDc5ZDViZjdmMDEx
NTM0ZmJhNjg5Li42NzAyOTVmNWUwNmVjNTA1ZmJmNDk1ZmE0ZGQ4YmI1YjJiZjcwZmE1IDEwMDY0
NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n
CkBAIC0xLDMgKzEsMjUgQEAKKzIwMjAtMDktMjggIEpvaG4gV2lsYW5kZXIgIDx3aWxhbmRlckBh
cHBsZS5jb20+CisKKyAgICAgICAgU3RvcmFnZSBBY2Nlc3MgQVBJOiBFbmFibGUgcGVyLXBhZ2Ug
c3RvcmFnZSBhY2Nlc3Mgc2NvcGUgYW5kIGFsaWduIHRlc3QgY2FzZXMKKyAgICAgICAgaHR0cHM6
Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzA3NworICAgICAgICA8cmRhcjov
L3Byb2JsZW0vNjkwMTc4Nzg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgKiBodHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQt
YWNjZXNzLWNyb3NzLW9yaWdpbi1zYW5kYm94ZWQtaWZyYW1lLWZyb20tcHJldmFsZW50LWRvbWFp
bi13aXRoLXVzZXItaW50ZXJhY3Rpb24tYW5kLWFjY2Vzcy1mcm9tLXJpZ2h0LWZyYW1lLWRhdGFi
YXNlLmh0bWw6CisgICAgICAgICogaHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5k
LWdyYW50LWFjY2Vzcy1jcm9zcy1vcmlnaW4tc2FuZGJveGVkLWlmcmFtZS1mcm9tLXByZXZhbGVu
dC1kb21haW4td2l0aC11c2VyLWludGVyYWN0aW9uLWFuZC1hY2Nlc3MtZnJvbS1yaWdodC1mcmFt
ZS5odG1sOgorICAgICAgICAqIGh0dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1n
cmFudC1hY2Nlc3MtY3Jvc3Mtb3JpZ2luLXNhbmRib3hlZC1pZnJhbWUtZnJvbS1wcmV2YWxlbnQt
ZG9tYWluLXdpdGgtdXNlci1pbnRlcmFjdGlvbi1idXQtYWNjZXNzLWZyb20td3JvbmctZnJhbWUt
ZGF0YWJhc2UuaHRtbDoKKyAgICAgICAgKiBodHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVz
dC1hbmQtZ3JhbnQtYWNjZXNzLWNyb3NzLW9yaWdpbi1zYW5kYm94ZWQtaWZyYW1lLWZyb20tcHJl
dmFsZW50LWRvbWFpbi13aXRoLXVzZXItaW50ZXJhY3Rpb24tYnV0LWFjY2Vzcy1mcm9tLXdyb25n
LWZyYW1lLmh0bWw6CisgICAgICAgICogaHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3Qt
YW5kLWdyYW50LWFjY2Vzcy10aGVuLWRldGFjaC1zaG91bGQtbm90LWhhdmUtYWNjZXNzLWRhdGFi
YXNlLmh0bWw6CisgICAgICAgICogaHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5k
LWdyYW50LWFjY2Vzcy10aGVuLWRldGFjaC1zaG91bGQtbm90LWhhdmUtYWNjZXNzLmh0bWw6Cisg
ICAgICAgICogaHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vz
cy10aGVuLW5hdmlnYXRlLWNyb3NzLXNpdGUtc2hvdWxkLW5vdC1oYXZlLWFjY2Vzcy1kYXRhYmFz
ZS5odG1sOgorICAgICAgICAqIGh0dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1n
cmFudC1hY2Nlc3MtdGhlbi1uYXZpZ2F0ZS1jcm9zcy1zaXRlLXNob3VsZC1ub3QtaGF2ZS1hY2Nl
c3MuaHRtbDoKKyAgICAgICAgICAgIEFsbCBvZiB0aGUgYWJvdmUgbm8gZXhwbGljaXRseSBjYWxs
CisgICAgICAgICAgICBpbnRlcm5hbHMuc2V0dGluZ3Muc2V0U3RvcmFnZUFjY2Vzc0FQSVBlclBh
Z2VTY29wZUVuYWJsZWQoZmFsc2UpCisgICAgICAgICAgICB0byBvcHQgb3V0IG9mIHRoZSBuZXcg
ZGVmYXVsdCBzZXR0aW5nLgorICAgICAgICAqIGh0dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1
ZXN0LWFuZC1ncmFudC1hY2Nlc3Mtd2l0aC1wZXItcGFnZS1zY29wZS1hY2Nlc3MtZnJvbS1hbm90
aGVyLWZyYW1lLmh0bWw6CisgICAgICAgICAgICBDaGFuZ2VkIHRvIGFzc3VtZSBwZXItcGFnZSBp
cyB0aGUgZGVmYXVsdC4KKwogMjAyMC0wOS0yOCAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5G
dWppaUBzb255LmNvbT4KIAogICAgICAgICBbVGV4dHVyZU1hcHBlcl0gRW5hYmxlIGEgZGVwdGgg
YnVmZmVyIGZvciBwcmVzZXJ2ZS0zZApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0
cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy1jcm9zcy1vcmlnaW4tc2Fu
ZGJveGVkLWlmcmFtZS1mcm9tLXByZXZhbGVudC1kb21haW4td2l0aC11c2VyLWludGVyYWN0aW9u
LWFuZC1hY2Nlc3MtZnJvbS1yaWdodC1mcmFtZS1kYXRhYmFzZS5odG1sIGIvTGF5b3V0VGVzdHMv
aHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy1jcm9zcy1v
cmlnaW4tc2FuZGJveGVkLWlmcmFtZS1mcm9tLXByZXZhbGVudC1kb21haW4td2l0aC11c2VyLWlu
dGVyYWN0aW9uLWFuZC1hY2Nlc3MtZnJvbS1yaWdodC1mcmFtZS1kYXRhYmFzZS5odG1sCmluZGV4
IDQ2OTg1ZDRiMDQ5YTNhYTI1MDA3N2I3NTMyMGFmYzZhYzRjZDIyMTkuLmEyZTI2ODFlZDg1MDFj
YjgzYmY1NWUxYWY2N2I3YjY0M2RhNmY4NGIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAv
dGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3MtY3Jvc3Mtb3JpZ2lu
LXNhbmRib3hlZC1pZnJhbWUtZnJvbS1wcmV2YWxlbnQtZG9tYWluLXdpdGgtdXNlci1pbnRlcmFj
dGlvbi1hbmQtYWNjZXNzLWZyb20tcmlnaHQtZnJhbWUtZGF0YWJhc2UuaHRtbAorKysgYi9MYXlv
dXRUZXN0cy9odHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNz
LWNyb3NzLW9yaWdpbi1zYW5kYm94ZWQtaWZyYW1lLWZyb20tcHJldmFsZW50LWRvbWFpbi13aXRo
LXVzZXItaW50ZXJhY3Rpb24tYW5kLWFjY2Vzcy1mcm9tLXJpZ2h0LWZyYW1lLWRhdGFiYXNlLmh0
bWwKQEAgLTEwNiw2ICsxMDYsOCBAQAogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAg
ICAgICAgICAgICBjYXNlICIjc3RlcDYiOgogICAgICAgICAgICAgICAgICAgICBkb2N1bWVudC5s
b2NhdGlvbi5oYXNoID0gInN0ZXA3IjsKKyAgICAgICAgICAgICAgICAgICAgLy8gU2V0IHBlci1m
cmFtZSBhY2Nlc3Mgc2luY2UgY2xlYXJpbmcgYWNjZXNzIG9uIGNyb3NzLXNpdGUgbmF2aWdhdGlv
biBvZiB0aGUgaWZyYW1lIHJlcXVpcmVzIHBlci1mcmFtZSBhY2Nlc3MuCisgICAgICAgICAgICAg
ICAgICAgIGludGVybmFscy5zZXR0aW5ncy5zZXRTdG9yYWdlQWNjZXNzQVBJUGVyUGFnZVNjb3Bl
RW5hYmxlZChmYWxzZSk7CiAgICAgICAgICAgICAgICAgICAgIC8vIENyZWF0ZSBpZnJhbWUgdGhh
dCB3aWxsIHJlcXVlc3Qgc3RvcmFnZSBhY2Nlc3MuCiAgICAgICAgICAgICAgICAgICAgIGxldCBp
ZnJhbWVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaWZyYW1lIik7CiAgICAgICAg
ICAgICAgICAgICAgIGlmcmFtZUVsZW1lbnQuc2V0QXR0cmlidXRlKCJzYW5kYm94IiwgImFsbG93
LXN0b3JhZ2UtYWNjZXNzLWJ5LXVzZXItYWN0aXZhdGlvbiBhbGxvdy1zY3JpcHRzIGFsbG93LXNh
bWUtb3JpZ2luIGFsbG93LW1vZGFscyIpOwpAQCAtMTQ0LDYgKzE0Niw4IEBACiAgICAgICAgICAg
ICAgICAgICAgIGV4aXN0aW5nSWZyYW1lMy5zcmMgPSB0aGlyZFBhcnR5QmFzZVVybCArIHN1YlBh
dGhUb0dldENvb2tpZXMgKyAiJm1lc3NhZ2U9QWZ0ZXIgdGhlIHRvcCBmcmFtZSBuYXZpZ2F0ZXMg
dGhlIHN1YiBmcmFtZSBjcm9zcy1zaXRlIGFuZCBiYWNrLCB0aGUgc3ViIGZyYW1lIHNob3VsZCBu
byBsb25nZXIgaGF2ZSBhY2Nlc3MgdG8gY29va2llcy4iOwogICAgICAgICAgICAgICAgICAgICBi
cmVhazsKICAgICAgICAgICAgICAgICBjYXNlICIjc3RlcDEwIjoKKyAgICAgICAgICAgICAgICAg
ICAgLy8gUmVzZXQgYWNjZXNzIHNjb3BlLgorICAgICAgICAgICAgICAgICAgICBpbnRlcm5hbHMu
c2V0dGluZ3Muc2V0U3RvcmFnZUFjY2Vzc0FQSVBlclBhZ2VTY29wZUVuYWJsZWQodHJ1ZSk7CiAg
ICAgICAgICAgICAgICAgICAgIHNldEVuYWJsZUZlYXR1cmUoZmFsc2UsIGZpbmlzaEpTVGVzdCk7
CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQpkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFj
Y2Vzcy1jcm9zcy1vcmlnaW4tc2FuZGJveGVkLWlmcmFtZS1mcm9tLXByZXZhbGVudC1kb21haW4t
d2l0aC11c2VyLWludGVyYWN0aW9uLWFuZC1hY2Nlc3MtZnJvbS1yaWdodC1mcmFtZS5odG1sIGIv
TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFj
Y2Vzcy1jcm9zcy1vcmlnaW4tc2FuZGJveGVkLWlmcmFtZS1mcm9tLXByZXZhbGVudC1kb21haW4t
d2l0aC11c2VyLWludGVyYWN0aW9uLWFuZC1hY2Nlc3MtZnJvbS1yaWdodC1mcmFtZS5odG1sCmlu
ZGV4IDdlMmI0ZDQwMzJlMTAyYWM1OTY0MWEzYjdkMjFmYWIyNzk2MjU5MjcuLjE1MmM5M2VkY2U2
M2U1ODJmZmQxOTgyYTM4NzZmZWMwNTE3MzVkYTEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0
dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3MtY3Jvc3Mtb3Jp
Z2luLXNhbmRib3hlZC1pZnJhbWUtZnJvbS1wcmV2YWxlbnQtZG9tYWluLXdpdGgtdXNlci1pbnRl
cmFjdGlvbi1hbmQtYWNjZXNzLWZyb20tcmlnaHQtZnJhbWUuaHRtbAorKysgYi9MYXlvdXRUZXN0
cy9odHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNzLWNyb3Nz
LW9yaWdpbi1zYW5kYm94ZWQtaWZyYW1lLWZyb20tcHJldmFsZW50LWRvbWFpbi13aXRoLXVzZXIt
aW50ZXJhY3Rpb24tYW5kLWFjY2Vzcy1mcm9tLXJpZ2h0LWZyYW1lLmh0bWwKQEAgLTEwNSw2ICsx
MDUsOCBAQAogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICBjYXNl
ICIjc3RlcDYiOgogICAgICAgICAgICAgICAgICAgICBkb2N1bWVudC5sb2NhdGlvbi5oYXNoID0g
InN0ZXA3IjsKKyAgICAgICAgICAgICAgICAgICAgLy8gU2V0IHBlci1mcmFtZSBhY2Nlc3Mgc2lu
Y2UgY2xlYXJpbmcgYWNjZXNzIG9uIGNyb3NzLXNpdGUgbmF2aWdhdGlvbiBvZiB0aGUgaWZyYW1l
IHJlcXVpcmVzIHBlci1mcmFtZSBhY2Nlc3MuCisgICAgICAgICAgICAgICAgICAgIGludGVybmFs
cy5zZXR0aW5ncy5zZXRTdG9yYWdlQWNjZXNzQVBJUGVyUGFnZVNjb3BlRW5hYmxlZChmYWxzZSk7
CiAgICAgICAgICAgICAgICAgICAgIC8vIENyZWF0ZSBpZnJhbWUgdGhhdCB3aWxsIHJlcXVlc3Qg
c3RvcmFnZSBhY2Nlc3MuCiAgICAgICAgICAgICAgICAgICAgIGxldCBpZnJhbWVFbGVtZW50ID0g
ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaWZyYW1lIik7CiAgICAgICAgICAgICAgICAgICAgIGlm
cmFtZUVsZW1lbnQuc2V0QXR0cmlidXRlKCJzYW5kYm94IiwgImFsbG93LXN0b3JhZ2UtYWNjZXNz
LWJ5LXVzZXItYWN0aXZhdGlvbiBhbGxvdy1zY3JpcHRzIGFsbG93LXNhbWUtb3JpZ2luIGFsbG93
LW1vZGFscyIpOwpAQCAtMTQzLDYgKzE0NSw4IEBACiAgICAgICAgICAgICAgICAgICAgIGV4aXN0
aW5nSWZyYW1lMy5zcmMgPSB0aGlyZFBhcnR5QmFzZVVybCArIHN1YlBhdGhUb0dldENvb2tpZXMg
KyAiJm1lc3NhZ2U9QWZ0ZXIgdGhlIHRvcCBmcmFtZSBuYXZpZ2F0ZXMgdGhlIHN1YiBmcmFtZSBj
cm9zcy1zaXRlIGFuZCBiYWNrLCB0aGUgc3ViIGZyYW1lIHNob3VsZCBubyBsb25nZXIgaGF2ZSBh
Y2Nlc3MgdG8gY29va2llcy4iOwogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAg
ICAgICAgICBjYXNlICIjc3RlcDEwIjoKKyAgICAgICAgICAgICAgICAgICAgLy8gUmVzZXQgYWNj
ZXNzIHNjb3BlLgorICAgICAgICAgICAgICAgICAgICBpbnRlcm5hbHMuc2V0dGluZ3Muc2V0U3Rv
cmFnZUFjY2Vzc0FQSVBlclBhZ2VTY29wZUVuYWJsZWQodHJ1ZSk7CiAgICAgICAgICAgICAgICAg
ICAgIHNldEVuYWJsZUZlYXR1cmUoZmFsc2UsIGZpbmlzaEpTVGVzdCk7CiAgICAgICAgICAgICAg
ICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0
cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy1jcm9zcy1vcmln
aW4tc2FuZGJveGVkLWlmcmFtZS1mcm9tLXByZXZhbGVudC1kb21haW4td2l0aC11c2VyLWludGVy
YWN0aW9uLWJ1dC1hY2Nlc3MtZnJvbS13cm9uZy1mcmFtZS1kYXRhYmFzZS5odG1sIGIvTGF5b3V0
VGVzdHMvaHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy1j
cm9zcy1vcmlnaW4tc2FuZGJveGVkLWlmcmFtZS1mcm9tLXByZXZhbGVudC1kb21haW4td2l0aC11
c2VyLWludGVyYWN0aW9uLWJ1dC1hY2Nlc3MtZnJvbS13cm9uZy1mcmFtZS1kYXRhYmFzZS5odG1s
CmluZGV4IGM1NTQ4Njk2N2JhYzA0ZjQ3ZTI3YzNiZWY2YzllYmJhZTVmZDkwODUuLmI4ZTI0ZTg5
ZGRkNTk5ODk4MjAwYTAzMDJiMjAwYWNjOTEzNWY1MjAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz
L2h0dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3MtY3Jvc3Mt
b3JpZ2luLXNhbmRib3hlZC1pZnJhbWUtZnJvbS1wcmV2YWxlbnQtZG9tYWluLXdpdGgtdXNlci1p
bnRlcmFjdGlvbi1idXQtYWNjZXNzLWZyb20td3JvbmctZnJhbWUtZGF0YWJhc2UuaHRtbAorKysg
Yi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQt
YWNjZXNzLWNyb3NzLW9yaWdpbi1zYW5kYm94ZWQtaWZyYW1lLWZyb20tcHJldmFsZW50LWRvbWFp
bi13aXRoLXVzZXItaW50ZXJhY3Rpb24tYnV0LWFjY2Vzcy1mcm9tLXdyb25nLWZyYW1lLWRhdGFi
YXNlLmh0bWwKQEAgLTEwNSw2ICsxMDUsOCBAQAogICAgICAgICAgICAgICAgICAgICBicmVhazsK
ICAgICAgICAgICAgICAgICBjYXNlICIjc3RlcDYiOgogICAgICAgICAgICAgICAgICAgICBkb2N1
bWVudC5sb2NhdGlvbi5oYXNoID0gInN0ZXA3IjsKKyAgICAgICAgICAgICAgICAgICAgLy8gU2V0
IHBlci1mcmFtZSBhY2Nlc3Mgc2luY2Ugb3RoZXJ3aXNlIHRoZSBzaWJsaW5nIGlmcmFtZSB3aWxs
IGdldCBhY2Nlc3MuCisgICAgICAgICAgICAgICAgICAgIGludGVybmFscy5zZXR0aW5ncy5zZXRT
dG9yYWdlQWNjZXNzQVBJUGVyUGFnZVNjb3BlRW5hYmxlZChmYWxzZSk7CiAgICAgICAgICAgICAg
ICAgICAgIGxldCBpZnJhbWVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaWZyYW1l
Iik7CiAgICAgICAgICAgICAgICAgICAgIGlmcmFtZUVsZW1lbnQuc2V0QXR0cmlidXRlKCJzYW5k
Ym94IiwgImFsbG93LXN0b3JhZ2UtYWNjZXNzLWJ5LXVzZXItYWN0aXZhdGlvbiBhbGxvdy1zY3Jp
cHRzIGFsbG93LXNhbWUtb3JpZ2luIGFsbG93LW1vZGFscyIpOwogICAgICAgICAgICAgICAgICAg
ICBpZnJhbWVFbGVtZW50Lm9ubG9hZCA9IGZ1bmN0aW9uKCkgewpAQCAtMTIyLDYgKzEyNCw4IEBA
CiAgICAgICAgICAgICAgICAgICAgIG9wZW5JZnJhbWUodGhpcmRQYXJ0eUJhc2VVcmwgKyBzdWJQ
YXRoVG9HZXRDb29raWVzICsgIiZtZXNzYWdlPVNob3VsZCBub3QgcmVjZWl2ZSBjb29raWVzLiIs
IHJ1blRlc3QpOwogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICBj
YXNlICIjc3RlcDgiOgorICAgICAgICAgICAgICAgICAgICAvLyBSZXNldCBhY2Nlc3Mgc2NvcGUu
CisgICAgICAgICAgICAgICAgICAgIGludGVybmFscy5zZXR0aW5ncy5zZXRTdG9yYWdlQWNjZXNz
QVBJUGVyUGFnZVNjb3BlRW5hYmxlZCh0cnVlKTsKICAgICAgICAgICAgICAgICAgICAgc2V0RW5h
YmxlRmVhdHVyZShmYWxzZSwgZmluaXNoSlNUZXN0KTsKICAgICAgICAgICAgICAgICAgICAgYnJl
YWs7CiAgICAgICAgICAgICB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3N0
b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNzLWNyb3NzLW9yaWdpbi1zYW5kYm94
ZWQtaWZyYW1lLWZyb20tcHJldmFsZW50LWRvbWFpbi13aXRoLXVzZXItaW50ZXJhY3Rpb24tYnV0
LWFjY2Vzcy1mcm9tLXdyb25nLWZyYW1lLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3N0
b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNzLWNyb3NzLW9yaWdpbi1zYW5kYm94
ZWQtaWZyYW1lLWZyb20tcHJldmFsZW50LWRvbWFpbi13aXRoLXVzZXItaW50ZXJhY3Rpb24tYnV0
LWFjY2Vzcy1mcm9tLXdyb25nLWZyYW1lLmh0bWwKaW5kZXggMzc5ZDk4YjViY2UyMzkzNjA5YmRl
ODhhNjBhNDA2ODk3ZmVlMjE1My4uOTFhMzg1M2I2MWY0MTNjMjA4MzRkNWNlYTdmYWQxNGZkNGY2
YzMxNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3Jl
cXVlc3QtYW5kLWdyYW50LWFjY2Vzcy1jcm9zcy1vcmlnaW4tc2FuZGJveGVkLWlmcmFtZS1mcm9t
LXByZXZhbGVudC1kb21haW4td2l0aC11c2VyLWludGVyYWN0aW9uLWJ1dC1hY2Nlc3MtZnJvbS13
cm9uZy1mcmFtZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc3RvcmFnZUFjY2Vz
cy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3MtY3Jvc3Mtb3JpZ2luLXNhbmRib3hlZC1pZnJhbWUt
ZnJvbS1wcmV2YWxlbnQtZG9tYWluLXdpdGgtdXNlci1pbnRlcmFjdGlvbi1idXQtYWNjZXNzLWZy
b20td3JvbmctZnJhbWUuaHRtbApAQCAtMTA1LDYgKzEwNSw4IEBACiAgICAgICAgICAgICAgICAg
ICAgIGJyZWFrOwogICAgICAgICAgICAgICAgIGNhc2UgIiNzdGVwNiI6CiAgICAgICAgICAgICAg
ICAgICAgIGRvY3VtZW50LmxvY2F0aW9uLmhhc2ggPSAic3RlcDciOworICAgICAgICAgICAgICAg
ICAgICAvLyBTZXQgcGVyLWZyYW1lIGFjY2VzcyBzaW5jZSBvdGhlcndpc2UgdGhlIHNpYmxpbmcg
aWZyYW1lIHdpbGwgZ2V0IGFjY2Vzcy4KKyAgICAgICAgICAgICAgICAgICAgaW50ZXJuYWxzLnNl
dHRpbmdzLnNldFN0b3JhZ2VBY2Nlc3NBUElQZXJQYWdlU2NvcGVFbmFibGVkKGZhbHNlKTsKICAg
ICAgICAgICAgICAgICAgICAgbGV0IGlmcmFtZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVt
ZW50KCJpZnJhbWUiKTsKICAgICAgICAgICAgICAgICAgICAgaWZyYW1lRWxlbWVudC5zZXRBdHRy
aWJ1dGUoInNhbmRib3giLCAiYWxsb3ctc3RvcmFnZS1hY2Nlc3MtYnktdXNlci1hY3RpdmF0aW9u
IGFsbG93LXNjcmlwdHMgYWxsb3ctc2FtZS1vcmlnaW4gYWxsb3ctbW9kYWxzIik7CiAgICAgICAg
ICAgICAgICAgICAgIGlmcmFtZUVsZW1lbnQub25sb2FkID0gZnVuY3Rpb24oKSB7CkBAIC0xMjIs
NiArMTI0LDcgQEAKICAgICAgICAgICAgICAgICAgICAgb3BlbklmcmFtZSh0aGlyZFBhcnR5QmFz
ZVVybCArIHN1YlBhdGhUb0dldENvb2tpZXMgKyAiJm1lc3NhZ2U9U2hvdWxkIG5vdCByZWNlaXZl
IGNvb2tpZXMuIiwgcnVuVGVzdCk7CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAg
ICAgICAgICAgIGNhc2UgIiNzdGVwOCI6CisgICAgICAgICAgICAgICAgICAgIGludGVybmFscy5z
ZXR0aW5ncy5zZXRTdG9yYWdlQWNjZXNzQVBJUGVyUGFnZVNjb3BlRW5hYmxlZCh0cnVlKTsKICAg
ICAgICAgICAgICAgICAgICAgc2V0RW5hYmxlRmVhdHVyZShmYWxzZSwgZmluaXNoSlNUZXN0KTsK
ICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CmRpZmYgLS1naXQgYS9M
YXlvdXRUZXN0cy9odHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNj
ZXNzLXRoZW4tZGV0YWNoLXNob3VsZC1ub3QtaGF2ZS1hY2Nlc3MtZGF0YWJhc2UuaHRtbCBiL0xh
eW91dFRlc3RzL2h0dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nl
c3MtdGhlbi1kZXRhY2gtc2hvdWxkLW5vdC1oYXZlLWFjY2Vzcy1kYXRhYmFzZS5odG1sCmluZGV4
IDY1MGFlN2FiODc4NzRjMWE1OGM3ZGUyNjk1MWE0NGQxN2UwMDJhOTYuLmNmZDI2MDBmZDUyMWMy
YzI4YWFjMzNlMDU2MWRhYzk1ODExOGZiMDUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAv
dGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3MtdGhlbi1kZXRhY2gt
c2hvdWxkLW5vdC1oYXZlLWFjY2Vzcy1kYXRhYmFzZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0
dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3MtdGhlbi1kZXRh
Y2gtc2hvdWxkLW5vdC1oYXZlLWFjY2Vzcy1kYXRhYmFzZS5odG1sCkBAIC0xMSw2ICsxMSw4IEBA
CiAgICAgICAgIHdpbmRvdy5hZGRFdmVudExpc3RlbmVyKCJtZXNzYWdlIiwgcmVjZWl2ZU1lc3Nh
Z2UsIGZhbHNlKTsKIAogICAgICAgICBmdW5jdGlvbiBmaW5pc2hUZXN0KCkgeworICAgICAgICAg
ICAgLy8gUmVzZXQgYWNjZXNzIHNjb3BlLgorICAgICAgICAgICAgaW50ZXJuYWxzLnNldHRpbmdz
LnNldFN0b3JhZ2VBY2Nlc3NBUElQZXJQYWdlU2NvcGVFbmFibGVkKHRydWUpOwogICAgICAgICAg
ICAgc2V0RW5hYmxlRmVhdHVyZShmYWxzZSwgZmluaXNoSlNUZXN0KTsKICAgICAgICAgfQogCkBA
IC05NCw2ICs5Niw5IEBACiAgICAgICAgICAgICAgICAgZG9jdW1lbnQubG9jYXRpb24uaHJlZiA9
IHN0YXRpc3RpY3NVcmwgKyAiL3N0b3JhZ2VBY2Nlc3MvcmVzb3VyY2VzL3NldC1jb29raWUucGhw
P25hbWU9Zmlyc3RQYXJ0eUNvb2tpZSZ2YWx1ZT12YWx1ZSNodHRwOi8vMTI3LjAuMC4xOjgwMDAv
c3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3MtdGhlbi1kZXRhY2gtc2hvdWxk
LW5vdC1oYXZlLWFjY2Vzcy1kYXRhYmFzZS5odG1sI2ZpcnN0UGFydHlDb29raWVTZXQiOwogICAg
ICAgICAgICAgfSk7CiAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAvLyBTZXQgcGVyLWZy
YW1lIGFjY2VzcyBzaW5jZSBjbGVhcmluZyBhY2Nlc3Mgb24gZGV0YWNoaW5nIHRoZSBpZnJhbWUg
cmVxdWlyZXMgcGVyLWZyYW1lIGFjY2Vzcy4KKyAgICAgICAgICAgIGludGVybmFscy5zZXR0aW5n
cy5zZXRTdG9yYWdlQWNjZXNzQVBJUGVyUGFnZVNjb3BlRW5hYmxlZChmYWxzZSk7CisKICAgICAg
ICAgICAgIHRlc3RSdW5uZXIuc2V0U3RhdGlzdGljc1ByZXZhbGVudFJlc291cmNlKHN0YXRpc3Rp
Y3NVcmwsIHRydWUsIGZ1bmN0aW9uKCkgewogICAgICAgICAgICAgICAgIGlmICghdGVzdFJ1bm5l
ci5pc1N0YXRpc3RpY3NQcmV2YWxlbnRSZXNvdXJjZShzdGF0aXN0aWNzVXJsKSkKICAgICAgICAg
ICAgICAgICAgICAgdGVzdEZhaWxlZCgiSG9zdCBkaWQgbm90IGdldCBzZXQgYXMgcHJldmFsZW50
IHJlc291cmNlLiIpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zdG9yYWdl
QWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy10aGVuLWRldGFjaC1zaG91bGQtbm90LWhh
dmUtYWNjZXNzLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVx
dWVzdC1hbmQtZ3JhbnQtYWNjZXNzLXRoZW4tZGV0YWNoLXNob3VsZC1ub3QtaGF2ZS1hY2Nlc3Mu
aHRtbAppbmRleCA4NDU0ZmM0OGZlNWEzZWY4YzFhYjFjOGIzN2YzYzY5MDhjMDZiZjNhLi4yNjM3
ZTQ2YjZjODAyZTZkN2VhNWFmM2RjYTllNTIzZmQ0MjQ5OTZjIDEwMDY0NAotLS0gYS9MYXlvdXRU
ZXN0cy9odHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNzLXRo
ZW4tZGV0YWNoLXNob3VsZC1ub3QtaGF2ZS1hY2Nlc3MuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9o
dHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNzLXRoZW4tZGV0
YWNoLXNob3VsZC1ub3QtaGF2ZS1hY2Nlc3MuaHRtbApAQCAtMTEsNiArMTEsOCBAQAogICAgICAg
ICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcigibWVzc2FnZSIsIHJlY2VpdmVNZXNzYWdlLCBmYWxz
ZSk7CiAKICAgICAgICAgZnVuY3Rpb24gZmluaXNoVGVzdCgpIHsKKyAgICAgICAgICAgIC8vIFJl
c2V0IGFjY2VzcyBzY29wZS4KKyAgICAgICAgICAgIGludGVybmFscy5zZXR0aW5ncy5zZXRTdG9y
YWdlQWNjZXNzQVBJUGVyUGFnZVNjb3BlRW5hYmxlZCh0cnVlKTsKICAgICAgICAgICAgIHNldEVu
YWJsZUZlYXR1cmUoZmFsc2UsIGZpbmlzaEpTVGVzdCk7CiAgICAgICAgIH0KIApAQCAtOTMsNiAr
OTUsOSBAQAogICAgICAgICAgICAgICAgIGRvY3VtZW50LmxvY2F0aW9uLmhyZWYgPSBzdGF0aXN0
aWNzVXJsICsgIi9zdG9yYWdlQWNjZXNzL3Jlc291cmNlcy9zZXQtY29va2llLnBocD9uYW1lPWZp
cnN0UGFydHlDb29raWUmdmFsdWU9dmFsdWUjaHR0cDovLzEyNy4wLjAuMTo4MDAwL3N0b3JhZ2VB
Y2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNzLXRoZW4tZGV0YWNoLXNob3VsZC1ub3QtaGF2
ZS1hY2Nlc3MuaHRtbCNmaXJzdFBhcnR5Q29va2llU2V0IjsKICAgICAgICAgICAgIH0pOwogICAg
ICAgICB9IGVsc2UgeworICAgICAgICAgICAgLy8gU2V0IHBlci1mcmFtZSBhY2Nlc3Mgc2luY2Ug
Y2xlYXJpbmcgYWNjZXNzIG9uIGRldGFjaGluZyB0aGUgaWZyYW1lIHJlcXVpcmVzIHBlci1mcmFt
ZSBhY2Nlc3MuCisgICAgICAgICAgICBpbnRlcm5hbHMuc2V0dGluZ3Muc2V0U3RvcmFnZUFjY2Vz
c0FQSVBlclBhZ2VTY29wZUVuYWJsZWQoZmFsc2UpOworCiAgICAgICAgICAgICB0ZXN0UnVubmVy
LnNldFN0YXRpc3RpY3NQcmV2YWxlbnRSZXNvdXJjZShzdGF0aXN0aWNzVXJsLCB0cnVlLCBmdW5j
dGlvbigpIHsKICAgICAgICAgICAgICAgICBpZiAoIXRlc3RSdW5uZXIuaXNTdGF0aXN0aWNzUHJl
dmFsZW50UmVzb3VyY2Uoc3RhdGlzdGljc1VybCkpCiAgICAgICAgICAgICAgICAgICAgIHRlc3RG
YWlsZWQoIkhvc3QgZGlkIG5vdCBnZXQgc2V0IGFzIHByZXZhbGVudCByZXNvdXJjZS4iKTsKZGlm
ZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFu
ZC1ncmFudC1hY2Nlc3MtdGhlbi1uYXZpZ2F0ZS1jcm9zcy1zaXRlLXNob3VsZC1ub3QtaGF2ZS1h
Y2Nlc3MtZGF0YWJhc2UuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc3RvcmFnZUFjY2Vz
cy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3MtdGhlbi1uYXZpZ2F0ZS1jcm9zcy1zaXRlLXNob3Vs
ZC1ub3QtaGF2ZS1hY2Nlc3MtZGF0YWJhc2UuaHRtbAppbmRleCBkMTc5NjE1MzJjZDU5YTY4NzNi
ZjkxMjk2YmI1MzVjMDdlNjcyNDFkLi4wYWViNjNhMDFiMTM3YWU1YTEyNDJkN2IyMTg4NTY0MmRi
M2NjNzI5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3Mv
cmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNzLXRoZW4tbmF2aWdhdGUtY3Jvc3Mtc2l0ZS1zaG91bGQt
bm90LWhhdmUtYWNjZXNzLWRhdGFiYXNlLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0
cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy10aGVuLW5hdmlnYXRlLWNy
b3NzLXNpdGUtc2hvdWxkLW5vdC1oYXZlLWFjY2Vzcy1kYXRhYmFzZS5odG1sCkBAIC0xMSw2ICsx
MSw4IEBACiAgICAgICAgIHdpbmRvdy5hZGRFdmVudExpc3RlbmVyKCJtZXNzYWdlIiwgcmVjZWl2
ZU1lc3NhZ2UsIGZhbHNlKTsKIAogICAgICAgICBmdW5jdGlvbiBmaW5pc2hUZXN0KCkgeworICAg
ICAgICAgICAgLy8gUmVzZXQgYWNjZXNzIHNjb3BlLgorICAgICAgICAgICAgaW50ZXJuYWxzLnNl
dHRpbmdzLnNldFN0b3JhZ2VBY2Nlc3NBUElQZXJQYWdlU2NvcGVFbmFibGVkKHRydWUpOwogICAg
ICAgICAgICAgc2V0RW5hYmxlRmVhdHVyZShmYWxzZSwgZmluaXNoSlNUZXN0KTsKICAgICAgICAg
fQogCkBAIC02Nyw2ICs2OSw4IEBACiAgICAgICAgICAgICAgICAgZG9jdW1lbnQubG9jYXRpb24u
aHJlZiA9IHN0YXRpc3RpY3NVcmwgKyAiL3N0b3JhZ2VBY2Nlc3MvcmVzb3VyY2VzL3NldC1jb29r
aWUucGhwP25hbWU9Zmlyc3RQYXJ0eUNvb2tpZSZ2YWx1ZT12YWx1ZSNodHRwOi8vMTI3LjAuMC4x
OjgwMDAvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3MtdGhlbi1uYXZpZ2F0
ZS1jcm9zcy1zaXRlLXNob3VsZC1ub3QtaGF2ZS1hY2Nlc3MtZGF0YWJhc2UuaHRtbCNmaXJzdFBh
cnR5Q29va2llU2V0IjsKICAgICAgICAgICAgIH0pOwogICAgICAgICB9IGVsc2UgeworICAgICAg
ICAgICAgLy8gU2V0IHBlci1mcmFtZSBhY2Nlc3Mgc2luY2UgY2xlYXJpbmcgYWNjZXNzIG9uIGNy
b3NzLXNpdGUgbmF2aWdhdGlvbiBvZiB0aGUgaWZyYW1lIHJlcXVpcmVzIHBlci1mcmFtZSBhY2Nl
c3MuCisgICAgICAgICAgICBpbnRlcm5hbHMuc2V0dGluZ3Muc2V0U3RvcmFnZUFjY2Vzc0FQSVBl
clBhZ2VTY29wZUVuYWJsZWQoZmFsc2UpOwogICAgICAgICAgICAgdGVzdFJ1bm5lci5zZXRTdGF0
aXN0aWNzUHJldmFsZW50UmVzb3VyY2Uoc3RhdGlzdGljc1VybCwgdHJ1ZSwgZnVuY3Rpb24oKSB7
CiAgICAgICAgICAgICAgICAgaWYgKCF0ZXN0UnVubmVyLmlzU3RhdGlzdGljc1ByZXZhbGVudFJl
c291cmNlKHN0YXRpc3RpY3NVcmwpKQogICAgICAgICAgICAgICAgICAgICB0ZXN0RmFpbGVkKCJI
b3N0IGRpZCBub3QgZ2V0IHNldCBhcyBwcmV2YWxlbnQgcmVzb3VyY2UuIik7CmRpZmYgLS1naXQg
YS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQt
YWNjZXNzLXRoZW4tbmF2aWdhdGUtY3Jvc3Mtc2l0ZS1zaG91bGQtbm90LWhhdmUtYWNjZXNzLmh0
bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3Jh
bnQtYWNjZXNzLXRoZW4tbmF2aWdhdGUtY3Jvc3Mtc2l0ZS1zaG91bGQtbm90LWhhdmUtYWNjZXNz
Lmh0bWwKaW5kZXggNTU1ZDBlMzFjOWNhMGEzZDE3OGY0YTNmOTc2OGRjNDgxZTliMjE4Zi4uZDU2
NjU0MmM4MzRhZjI0ZTA2ZjhmNmJkMDNjZjcyZGQxZmJkYjY0ZiAxMDA2NDQKLS0tIGEvTGF5b3V0
VGVzdHMvaHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy10
aGVuLW5hdmlnYXRlLWNyb3NzLXNpdGUtc2hvdWxkLW5vdC1oYXZlLWFjY2Vzcy5odG1sCisrKyBi
L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1h
Y2Nlc3MtdGhlbi1uYXZpZ2F0ZS1jcm9zcy1zaXRlLXNob3VsZC1ub3QtaGF2ZS1hY2Nlc3MuaHRt
bApAQCAtMTMsNiArMTMsOCBAQAogICAgICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcigibWVz
c2FnZSIsIHJlY2VpdmVNZXNzYWdlLCBmYWxzZSk7CiAKICAgICAgICAgZnVuY3Rpb24gZmluaXNo
VGVzdCgpIHsKKyAgICAgICAgICAgIC8vIFJlc2V0IGFjY2VzcyBzY29wZS4KKyAgICAgICAgICAg
IGludGVybmFscy5zZXR0aW5ncy5zZXRTdG9yYWdlQWNjZXNzQVBJUGVyUGFnZVNjb3BlRW5hYmxl
ZCh0cnVlKTsKICAgICAgICAgICAgIHNldEVuYWJsZUZlYXR1cmUoZmFsc2UsIGZpbmlzaEpTVGVz
dCk7CiAgICAgICAgIH0KIApAQCAtNjgsNiArNzAsOCBAQAogICAgICAgICAgICAgICAgIGRvY3Vt
ZW50LmxvY2F0aW9uLmhyZWYgPSBzdGF0aXN0aWNzVXJsICsgIi9zdG9yYWdlQWNjZXNzL3Jlc291
cmNlcy9zZXQtY29va2llLnBocD9uYW1lPWZpcnN0UGFydHlDb29raWUmdmFsdWU9dmFsdWUjaHR0
cDovLzEyNy4wLjAuMTo4MDAwL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNz
LXRoZW4tbmF2aWdhdGUtY3Jvc3Mtc2l0ZS1zaG91bGQtbm90LWhhdmUtYWNjZXNzLmh0bWwjZmly
c3RQYXJ0eUNvb2tpZVNldCI7CiAgICAgICAgICAgICB9KTsKICAgICAgICAgfSBlbHNlIHsKKyAg
ICAgICAgICAgIC8vIFNldCBwZXItZnJhbWUgYWNjZXNzIHNpbmNlIGNsZWFyaW5nIGFjY2VzcyBv
biBjcm9zcy1zaXRlIG5hdmlnYXRpb24gb2YgdGhlIGlmcmFtZSByZXF1aXJlcyBwZXItZnJhbWUg
YWNjZXNzLgorICAgICAgICAgICAgaW50ZXJuYWxzLnNldHRpbmdzLnNldFN0b3JhZ2VBY2Nlc3NB
UElQZXJQYWdlU2NvcGVFbmFibGVkKGZhbHNlKTsKICAgICAgICAgICAgIHRlc3RSdW5uZXIuc2V0
U3RhdGlzdGljc1ByZXZhbGVudFJlc291cmNlKHN0YXRpc3RpY3NVcmwsIHRydWUsIGZ1bmN0aW9u
KCkgewogICAgICAgICAgICAgICAgIGlmICghdGVzdFJ1bm5lci5pc1N0YXRpc3RpY3NQcmV2YWxl
bnRSZXNvdXJjZShzdGF0aXN0aWNzVXJsKSkKICAgICAgICAgICAgICAgICAgICAgdGVzdEZhaWxl
ZCgiSG9zdCBkaWQgbm90IGdldCBzZXQgYXMgcHJldmFsZW50IHJlc291cmNlLiIpOwpkaWZmIC0t
Z2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdy
YW50LWFjY2Vzcy13aXRoLXBlci1wYWdlLXNjb3BlLWFjY2Vzcy1mcm9tLWFub3RoZXItZnJhbWUu
aHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1n
cmFudC1hY2Nlc3Mtd2l0aC1wZXItcGFnZS1zY29wZS1hY2Nlc3MtZnJvbS1hbm90aGVyLWZyYW1l
Lmh0bWwKaW5kZXggMmU4NTU3ZTViZGRhZGVkMGYyYjFjMmM0Y2E2NGY5MzIwZTRmODY3MC4uYjY5
ZDVkNzgwYTRkMTNkZGRjNDg2NGY4ZjAyZDhjOTk1MDVkNTRmNyAxMDA2NDQKLS0tIGEvTGF5b3V0
VGVzdHMvaHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy13
aXRoLXBlci1wYWdlLXNjb3BlLWFjY2Vzcy1mcm9tLWFub3RoZXItZnJhbWUuaHRtbAorKysgYi9M
YXlvdXRUZXN0cy9odHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNj
ZXNzLXdpdGgtcGVyLXBhZ2Utc2NvcGUtYWNjZXNzLWZyb20tYW5vdGhlci1mcmFtZS5odG1sCkBA
IC04Myw3ICs4Myw2IEBACiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAg
ICAgIGNhc2UgIiNzdGVwNCI6CiAgICAgICAgICAgICAgICAgICAgIGRvY3VtZW50LmxvY2F0aW9u
Lmhhc2ggPSAic3RlcDUiOwotICAgICAgICAgICAgICAgICAgICBpbnRlcm5hbHMuc2V0dGluZ3Mu
c2V0U3RvcmFnZUFjY2Vzc0FQSVBlclBhZ2VTY29wZUVuYWJsZWQodHJ1ZSk7CiAgICAgICAgICAg
ICAgICAgICAgIGxldCBpZnJhbWVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaWZy
YW1lIik7CiAgICAgICAgICAgICAgICAgICAgIGlmcmFtZUVsZW1lbnQub25sb2FkID0gZnVuY3Rp
b24oKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICBhY3RpdmF0ZUVsZW1lbnQoIlRoZUlmcmFt
ZVRoYXRSZXF1ZXN0c1N0b3JhZ2VBY2Nlc3MiKTsKQEAgLTk5LDcgKzk4LDYgQEAKICAgICAgICAg
ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgY2FzZSAiI3N0ZXA2IjoKICAgICAg
ICAgICAgICAgICAgICAgdGVzdFJ1bm5lci5zZXRTdGF0aXN0aWNzU2hvdWxkQmxvY2tUaGlyZFBh
cnR5Q29va2llcyhmYWxzZSwgZnVuY3Rpb24oKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBp
bnRlcm5hbHMuc2V0dGluZ3Muc2V0U3RvcmFnZUFjY2Vzc0FQSVBlclBhZ2VTY29wZUVuYWJsZWQo
ZmFsc2UpOwogICAgICAgICAgICAgICAgICAgICAgICAgc2V0RW5hYmxlRmVhdHVyZShmYWxzZSwg
ZmluaXNoSlNUZXN0KTsKICAgICAgICAgICAgICAgICAgICAgfSk7CiAgICAgICAgICAgICAgICAg
ICAgIGJyZWFrOwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>410184</attachid>
            <date>2020-09-30 17:59:38 -0700</date>
            <delta_ts>2020-09-30 18:01:14 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-217077-20200930175937.patch</filename>
            <type>text/plain</type>
            <size>16113</size>
            <attacher name="John Wilander">wilander</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3ODE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWI1OWRlYjlhYjVlZjhi
ZTYzMzZhOWMzYmIzOTYxZjdiYjNiOTRmYy4uMzBhNzJjMDUyM2QwZjllOGQyN2UzNmVkZTc4ZmIz
NDllNDNlZmRkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIwLTA5LTMwICBKb2hu
IFdpbGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIFN0b3JhZ2UgQWNjZXNz
IEFQSTogRW5hYmxlIHBlci1wYWdlIHN0b3JhZ2UgYWNjZXNzIHNjb3BlIGFuZCBhbGlnbiB0ZXN0
IGNhc2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y
MTcwNzcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY5MDE3ODc4PgorCisgICAgICAgIFJldmll
d2VkIGJ5IEJyZW50IEZ1bGdoYW0uCisKKyAgICAgICAgSXQgd2FzIGRlY2lkZWQgaW4gaHR0cHM6
Ly9naXRodWIuY29tL3ByaXZhY3ljZy9zdG9yYWdlLWFjY2Vzcy9pc3N1ZXMvMyB0aGF0CisgICAg
ICAgIGJyb3dzZXJzIHNob3VsZCBncmFudCBzdG9yYWdlIGFjY2VzcyBmb3IgYWxsIHNhbWUtc2l0
ZSByZXNvdXJjZXMgb24gdGhlIHdob2xlCisgICAgICAgIHBhZ2UsIG5vdCBqdXN0IHRoZSByZXF1
ZXN0aW5nIGlmcmFtZS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIEV4aXN0aW5nIHRlc3RzIGFs
aWduZWQsIGluY2x1ZGluZworICAgICAgICBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3N0b3JhZ2VB
Y2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNzLXdpdGgtcGVyLXBhZ2Utc2NvcGUtYWNjZXNz
LWZyb20tYW5vdGhlci1mcmFtZS5odG1sCisgICAgICAgIHdoaWNoIG5vIGxvbmdlciBjYWxscwor
ICAgICAgICBpbnRlcm5hbHMuc2V0dGluZ3Muc2V0U3RvcmFnZUFjY2Vzc0FQSVBlclBhZ2VTY29w
ZUVuYWJsZWQodHJ1ZSkKKyAgICAgICAgdG8gb3B0IGluIHRvIHRoZSBzZXR0aW5nIHRoYXQgaXMg
bm93IHRoZSBkZWZhdWx0LgorCisgICAgICAgICogZG9tL0RvY3VtZW50U3RvcmFnZUFjY2Vzcy5j
cHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudFN0b3JhZ2VBY2Nlc3M6OnJlcXVlc3RTdG9y
YWdlQWNjZXNzKToKKyAgICAgICAgICAgIENoYW5nZWQgdGhlIHNldHRpbmdzIGNoZWNrIHRvIGRv
IHRoZSByZXZlcnNlLCBpLmUuIGFzc3VtZQorICAgICAgICAgICAgcGVyLXBhZ2UgYWNjZXNzIGJ5
IGRlZmF1bHQgYW5kIHBlci1mcmFtZSBhY2Nlc3MgYXMgdGhlCisgICAgICAgICAgICBleGNlcHRp
b24uCisgICAgICAgICogZG9tL0RvY3VtZW50U3RvcmFnZUFjY2Vzcy5oOgorICAgICAgICAgICAg
Q2hhbmdlZCB0aGUgZGVmYXVsdCBzZXR0aW5nIGZvciBtX3N0b3JhZ2VBY2Nlc3NTY29wZS4KKyAg
ICAgICAgKiBwYWdlL1NldHRpbmdzLnlhbWw6CisgICAgICAgICAgICBDaGFuZ2VkIHRoZSBkZWZh
dWx0IHRvIHRydWUgZm9yCisgICAgICAgICAgICBzdG9yYWdlQWNjZXNzQVBJUGVyUGFnZVNjb3Bl
RW5hYmxlZC4KKwogMjAyMC0wOS0zMCAgU2FtIFdlaW5pZyAgPHdlaW5pZ0BhcHBsZS5jb20+CiAK
ICAgICAgICAgW1dlYklETF0gTWFrZSBFeHBvc2VkIG1hbmRhdG9yeSBmb3IgSURMIGludGVyZmFj
ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9D
aGFuZ2VMb2cKaW5kZXggZmUwMzc5ZjcyYTdjYTc4NGNkZDcwMjI1ZmNkN2JlMzJlYjQyMGQ4My4u
N2M2YWUwMjdmOTgzNjg1M2NiMzg0NTE3NWFhNTQxZjZmMTg4ZGI1NiAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwyMCBAQAorMjAyMC0wOS0zMCAgSm9obiBXaWxhbmRlciAgPHdpbGFuZGVyQGFwcGxlLmNv
bT4KKworICAgICAgICBTdG9yYWdlIEFjY2VzcyBBUEk6IEVuYWJsZSBwZXItcGFnZSBzdG9yYWdl
IGFjY2VzcyBzY29wZSBhbmQgYWxpZ24gdGVzdCBjYXNlcworICAgICAgICBodHRwczovL2J1Z3Mu
d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE3MDc3CisgICAgICAgIDxyZGFyOi8vcHJvYmxl
bS82OTAxNzg3OD4KKworICAgICAgICBSZXZpZXdlZCBieSBCcmVudCBGdWxnaGFtLgorCisgICAg
ICAgIEl0IHdhcyBkZWNpZGVkIGluIGh0dHBzOi8vZ2l0aHViLmNvbS9wcml2YWN5Y2cvc3RvcmFn
ZS1hY2Nlc3MvaXNzdWVzLzMgdGhhdAorICAgICAgICBicm93c2VycyBzaG91bGQgZ3JhbnQgc3Rv
cmFnZSBhY2Nlc3MgZm9yIGFsbCBzYW1lLXNpdGUgcmVzb3VyY2VzIG9uIHRoZSB3aG9sZQorICAg
ICAgICBwYWdlLCBub3QganVzdCB0aGUgcmVxdWVzdGluZyBpZnJhbWUuCisKKyAgICAgICAgKiBX
ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6
Omhhc1N0b3JhZ2VBY2Nlc3MpOgorICAgICAgICAgICAgQWRkZWQgYSBjYWxsIHRvIFdlYlBhZ2U6
Omhhc1BhZ2VMZXZlbFN0b3JhZ2VBY2Nlc3MoKQorICAgICAgICAgICAgYW5kIGFuIGVhcmx5IHJl
dHVybiBpZiBpdCByZXR1cm5zIHRydWUuCisKIDIwMjAtMDktMzAgIFdlbnNvbiBIc2llaCAgPHdl
bnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW0dQVSBQcm9jZXNzXSBDYW52YXMgbGF5
b3V0IHRlc3RzIG9jY2FzaW9uYWxseSBjcmFzaCB0aGUgd2ViIHByb2Nlc3MgdW5kZXIgUHV0SW1h
Z2VEYXRhOjphcHBseQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50U3Rv
cmFnZUFjY2Vzcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRTdG9yYWdlQWNjZXNz
LmNwcAppbmRleCAyMTkwZmI1MDQ3MDlmODAyNzFkM2NmZjIwN2M4YzA0NGJjY2QxM2U2Li44NzRl
NTYwOGNkY2MxY2VmYWNiNzg2ZmEwYjAzZDIwMDdiYzQ0OTZjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViQ29yZS9kb20vRG9jdW1lbnRTdG9yYWdlQWNjZXNzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y
ZS9kb20vRG9jdW1lbnRTdG9yYWdlQWNjZXNzLmNwcApAQCAtMTk3LDggKzE5Nyw4IEBAIHZvaWQg
RG9jdW1lbnRTdG9yYWdlQWNjZXNzOjpyZXF1ZXN0U3RvcmFnZUFjY2VzcyhSZWY8RGVmZXJyZWRQ
cm9taXNlPiYmIHByb21pc2UpCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAocGFn
ZS0+c2V0dGluZ3MoKS5zdG9yYWdlQWNjZXNzQVBJUGVyUGFnZVNjb3BlRW5hYmxlZCgpKQotICAg
ICAgICBtX3N0b3JhZ2VBY2Nlc3NTY29wZSA9IFN0b3JhZ2VBY2Nlc3NTY29wZTo6UGVyUGFnZTsK
KyAgICBpZiAoIXBhZ2UtPnNldHRpbmdzKCkuc3RvcmFnZUFjY2Vzc0FQSVBlclBhZ2VTY29wZUVu
YWJsZWQoKSkKKyAgICAgICAgbV9zdG9yYWdlQWNjZXNzU2NvcGUgPSBTdG9yYWdlQWNjZXNzU2Nv
cGU6OlBlckZyYW1lOwogCiAgICAgcGFnZS0+Y2hyb21lKCkuY2xpZW50KCkucmVxdWVzdFN0b3Jh
Z2VBY2Nlc3MoUmVnaXN0cmFibGVEb21haW46OnVuY2hlY2tlZENyZWF0ZUZyb21Ib3N0KG1fZG9j
dW1lbnQuc2VjdXJpdHlPcmlnaW4oKS5ob3N0KCkpLCBSZWdpc3RyYWJsZURvbWFpbjo6dW5jaGVj
a2VkQ3JlYXRlRnJvbUhvc3QobV9kb2N1bWVudC50b3BEb2N1bWVudCgpLnNlY3VyaXR5T3JpZ2lu
KCkuaG9zdCgpKSwgKmZyYW1lLCBtX3N0b3JhZ2VBY2Nlc3NTY29wZSwgW3RoaXMsIHdlYWtUaGlz
ID0gbWFrZVdlYWtQdHIoKnRoaXMpLCBwcm9taXNlID0gV1RGTW92ZShwcm9taXNlKV0gKFJlcXVl
c3RTdG9yYWdlQWNjZXNzUmVzdWx0IHJlc3VsdCkgbXV0YWJsZSB7CiAgICAgICAgIGlmICghd2Vh
a1RoaXMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRTdG9yYWdlQWNj
ZXNzLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRTdG9yYWdlQWNjZXNzLmgKaW5kZXgg
MDY2Y2VjN2RmYzU0ZDdmMjc5OWZkNzEwZWFiMTYwYTExYTAxMzI4Yi4uZWMxMDc5ZWRiMTI0NjZm
ZDk1NDVlNTI3NmUyZDJiNTVjNjM0Y2VmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9t
L0RvY3VtZW50U3RvcmFnZUFjY2Vzcy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVu
dFN0b3JhZ2VBY2Nlc3MuaApAQCAtMTA5LDcgKzEwOSw3IEBAIHByaXZhdGU6CiAKICAgICB1aW50
OF90IG1fbnVtYmVyT2ZUaW1lc0V4cGxpY2l0bHlEZW5pZWRGcmFtZVNwZWNpZmljU3RvcmFnZUFj
Y2VzcyA9IDA7CiAKLSAgICBTdG9yYWdlQWNjZXNzU2NvcGUgbV9zdG9yYWdlQWNjZXNzU2NvcGUg
PSBTdG9yYWdlQWNjZXNzU2NvcGU6OlBlckZyYW1lOworICAgIFN0b3JhZ2VBY2Nlc3NTY29wZSBt
X3N0b3JhZ2VBY2Nlc3NTY29wZSA9IFN0b3JhZ2VBY2Nlc3NTY29wZTo6UGVyUGFnZTsKIH07CiAK
IHRlbXBsYXRlPGNsYXNzIEVuY29kZXI+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl
L1NldHRpbmdzLnlhbWwgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLnlhbWwKaW5kZXgg
NzkwZGI0YjdlOTZmYTk2ZGY4OGZkNjc4Y2FlMGM3MmU1MjNhODE5OS4uMGUwOWU1YjE3MWU2N2Mw
ZDI1NDQ5Njc4ZmZhOTgwNDExM2Y2ZGE4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn
ZS9TZXR0aW5ncy55YW1sCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MueWFtbApA
QCAtNzA0LDcgKzcwNCw3IEBAIHN0b3JhZ2VBY2Nlc3NBUElFbmFibGVkOgogICBpbml0aWFsOiB0
cnVlCiAKIHN0b3JhZ2VBY2Nlc3NBUElQZXJQYWdlU2NvcGVFbmFibGVkOgotICBpbml0aWFsOiBm
YWxzZQorICBpbml0aWFsOiB0cnVlCiAKIHRpbWVXaXRob3V0TW91c2VNb3ZlbWVudEJlZm9yZUhp
ZGluZ0NvbnRyb2xzOgogICB0eXBlOiBTZWNvbmRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0
L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz
cy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IDEyOWNhNjZjZTRjZjcxNDg4MWYzMTYwNjI4ZWFk
OTZkNWFjZDlmY2MuLmUyMjJiMjQ4ZjQwZDMzNzI3ODc0NmM2YWNmZGEyZmY1ZGFjZDQ2ODEgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisr
KyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC02ODEx
LDYgKzY4MTEsMTEgQEAgdm9pZCBXZWJQYWdlOjpmcmFtZUJlY2FtZVJlbW90ZShGcmFtZUlkZW50
aWZpZXIgZnJhbWVJRCwgR2xvYmFsRnJhbWVJZGVudGlmaWVyJiYKICNpZiBFTkFCTEUoUkVTT1VS
Q0VfTE9BRF9TVEFUSVNUSUNTKQogdm9pZCBXZWJQYWdlOjpoYXNTdG9yYWdlQWNjZXNzKFJlZ2lz
dHJhYmxlRG9tYWluJiYgc3ViRnJhbWVEb21haW4sIFJlZ2lzdHJhYmxlRG9tYWluJiYgdG9wRnJh
bWVEb21haW4sIFdlYkZyYW1lJiBmcmFtZSwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sKT4m
JiBjb21wbGV0aW9uSGFuZGxlcikKIHsKKyAgICBpZiAoaGFzUGFnZUxldmVsU3RvcmFnZUFjY2Vz
cyh0b3BGcmFtZURvbWFpbiwgc3ViRnJhbWVEb21haW4pKSB7CisgICAgICAgIGNvbXBsZXRpb25I
YW5kbGVyKHRydWUpOworICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgV2ViUHJvY2Vzczo6
c2luZ2xldG9uKCkuZW5zdXJlTmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uKCkuY29ubmVjdGlvbigp
LnNlbmRXaXRoQXN5bmNSZXBseShNZXNzYWdlczo6TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nl
c3M6Okhhc1N0b3JhZ2VBY2Nlc3MoV1RGTW92ZShzdWJGcmFtZURvbWFpbiksIFdURk1vdmUodG9w
RnJhbWVEb21haW4pLCBmcmFtZS5mcmFtZUlEKCksIG1faWRlbnRpZmllciksIFdURk1vdmUoY29t
cGxldGlvbkhhbmRsZXIpKTsKIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n
IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDYzM2E4ZDYwY2FjNjAxM2E5OWQ2MzkxNzIy
MWY4YzcxY2ViYWZlZWYuLjIyY2I5OTcwMTQ4MjZlMmE1ZjcxNjVkNjZiMDIwMTNmNzk1N2JiMGEg
MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAyMC0wOS0zMCAgSm9obiBXaWxhbmRlciAgPHdpbGFu
ZGVyQGFwcGxlLmNvbT4KKworICAgICAgICBTdG9yYWdlIEFjY2VzcyBBUEk6IEVuYWJsZSBwZXIt
cGFnZSBzdG9yYWdlIGFjY2VzcyBzY29wZSBhbmQgYWxpZ24gdGVzdCBjYXNlcworICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE3MDc3CisgICAgICAgIDxy
ZGFyOi8vcHJvYmxlbS82OTAxNzg3OD4KKworICAgICAgICBSZXZpZXdlZCBieSBCcmVudCBGdWxn
aGFtLgorCisgICAgICAgIEl0IHdhcyBkZWNpZGVkIGluIGh0dHBzOi8vZ2l0aHViLmNvbS9wcml2
YWN5Y2cvc3RvcmFnZS1hY2Nlc3MvaXNzdWVzLzMgdGhhdAorICAgICAgICBicm93c2VycyBzaG91
bGQgZ3JhbnQgc3RvcmFnZSBhY2Nlc3MgZm9yIGFsbCBzYW1lLXNpdGUgcmVzb3VyY2VzIG9uIHRo
ZSB3aG9sZQorICAgICAgICBwYWdlLCBub3QganVzdCB0aGUgcmVxdWVzdGluZyBpZnJhbWUuCisK
KyAgICAgICAgKiBodHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNj
ZXNzLWNyb3NzLW9yaWdpbi1zYW5kYm94ZWQtaWZyYW1lLWZyb20tcHJldmFsZW50LWRvbWFpbi13
aXRoLXVzZXItaW50ZXJhY3Rpb24tYW5kLWFjY2Vzcy1mcm9tLXJpZ2h0LWZyYW1lLmh0bWw6Cisg
ICAgICAgICogaHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vz
cy1jcm9zcy1vcmlnaW4tc2FuZGJveGVkLWlmcmFtZS1mcm9tLXByZXZhbGVudC1kb21haW4td2l0
aC11c2VyLWludGVyYWN0aW9uLWJ1dC1hY2Nlc3MtZnJvbS13cm9uZy1mcmFtZS5odG1sOgorICAg
ICAgICAqIGh0dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3Mt
dGhlbi1kZXRhY2gtc2hvdWxkLW5vdC1oYXZlLWFjY2Vzcy5odG1sOgorICAgICAgICAqIGh0dHAv
dGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3MtdGhlbi1uYXZpZ2F0
ZS1jcm9zcy1zaXRlLXNob3VsZC1ub3QtaGF2ZS1hY2Nlc3MuaHRtbDoKKyAgICAgICAgICAgIEFs
bCBvZiB0aGUgYWJvdmUgbm93IGV4cGxpY2l0bHkgY2FsbAorICAgICAgICAgICAgaW50ZXJuYWxz
LnNldHRpbmdzLnNldFN0b3JhZ2VBY2Nlc3NBUElQZXJQYWdlU2NvcGVFbmFibGVkKGZhbHNlKQor
ICAgICAgICAgICAgdG8gb3B0IG91dCBvZiB0aGUgbmV3IGRlZmF1bHQgc2V0dGluZy4KKyAgICAg
ICAgKiBodHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNzLXdp
dGgtcGVyLXBhZ2Utc2NvcGUtYWNjZXNzLWZyb20tYW5vdGhlci1mcmFtZS5odG1sOgorICAgICAg
ICAgICAgQ2hhbmdlZCB0byBhc3N1bWUgcGVyLXBhZ2UgaXMgdGhlIGRlZmF1bHQuCisKIDIwMjAt
MDktMzAgIFJvc3MgS2lyc2xpbmcgIDxyb3NzLmtpcnNsaW5nQHNvbnkuY29tPgogCiAgICAgICAg
IFtKU0NdIEltcGxlbWVudCBpdGVtIG1ldGhvZCBwcm9wb3NhbApkaWZmIC0tZ2l0IGEvTGF5b3V0
VGVzdHMvaHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy1j
cm9zcy1vcmlnaW4tc2FuZGJveGVkLWlmcmFtZS1mcm9tLXByZXZhbGVudC1kb21haW4td2l0aC11
c2VyLWludGVyYWN0aW9uLWFuZC1hY2Nlc3MtZnJvbS1yaWdodC1mcmFtZS5odG1sIGIvTGF5b3V0
VGVzdHMvaHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy1j
cm9zcy1vcmlnaW4tc2FuZGJveGVkLWlmcmFtZS1mcm9tLXByZXZhbGVudC1kb21haW4td2l0aC11
c2VyLWludGVyYWN0aW9uLWFuZC1hY2Nlc3MtZnJvbS1yaWdodC1mcmFtZS5odG1sCmluZGV4IDdl
MmI0ZDQwMzJlMTAyYWM1OTY0MWEzYjdkMjFmYWIyNzk2MjU5MjcuLjE1MmM5M2VkY2U2M2U1ODJm
ZmQxOTgyYTM4NzZmZWMwNTE3MzVkYTEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVz
dHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3MtY3Jvc3Mtb3JpZ2luLXNh
bmRib3hlZC1pZnJhbWUtZnJvbS1wcmV2YWxlbnQtZG9tYWluLXdpdGgtdXNlci1pbnRlcmFjdGlv
bi1hbmQtYWNjZXNzLWZyb20tcmlnaHQtZnJhbWUuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9odHRw
L3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNzLWNyb3NzLW9yaWdp
bi1zYW5kYm94ZWQtaWZyYW1lLWZyb20tcHJldmFsZW50LWRvbWFpbi13aXRoLXVzZXItaW50ZXJh
Y3Rpb24tYW5kLWFjY2Vzcy1mcm9tLXJpZ2h0LWZyYW1lLmh0bWwKQEAgLTEwNSw2ICsxMDUsOCBA
QAogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICBjYXNlICIjc3Rl
cDYiOgogICAgICAgICAgICAgICAgICAgICBkb2N1bWVudC5sb2NhdGlvbi5oYXNoID0gInN0ZXA3
IjsKKyAgICAgICAgICAgICAgICAgICAgLy8gU2V0IHBlci1mcmFtZSBhY2Nlc3Mgc2luY2UgY2xl
YXJpbmcgYWNjZXNzIG9uIGNyb3NzLXNpdGUgbmF2aWdhdGlvbiBvZiB0aGUgaWZyYW1lIHJlcXVp
cmVzIHBlci1mcmFtZSBhY2Nlc3MuCisgICAgICAgICAgICAgICAgICAgIGludGVybmFscy5zZXR0
aW5ncy5zZXRTdG9yYWdlQWNjZXNzQVBJUGVyUGFnZVNjb3BlRW5hYmxlZChmYWxzZSk7CiAgICAg
ICAgICAgICAgICAgICAgIC8vIENyZWF0ZSBpZnJhbWUgdGhhdCB3aWxsIHJlcXVlc3Qgc3RvcmFn
ZSBhY2Nlc3MuCiAgICAgICAgICAgICAgICAgICAgIGxldCBpZnJhbWVFbGVtZW50ID0gZG9jdW1l
bnQuY3JlYXRlRWxlbWVudCgiaWZyYW1lIik7CiAgICAgICAgICAgICAgICAgICAgIGlmcmFtZUVs
ZW1lbnQuc2V0QXR0cmlidXRlKCJzYW5kYm94IiwgImFsbG93LXN0b3JhZ2UtYWNjZXNzLWJ5LXVz
ZXItYWN0aXZhdGlvbiBhbGxvdy1zY3JpcHRzIGFsbG93LXNhbWUtb3JpZ2luIGFsbG93LW1vZGFs
cyIpOwpAQCAtMTQzLDYgKzE0NSw4IEBACiAgICAgICAgICAgICAgICAgICAgIGV4aXN0aW5nSWZy
YW1lMy5zcmMgPSB0aGlyZFBhcnR5QmFzZVVybCArIHN1YlBhdGhUb0dldENvb2tpZXMgKyAiJm1l
c3NhZ2U9QWZ0ZXIgdGhlIHRvcCBmcmFtZSBuYXZpZ2F0ZXMgdGhlIHN1YiBmcmFtZSBjcm9zcy1z
aXRlIGFuZCBiYWNrLCB0aGUgc3ViIGZyYW1lIHNob3VsZCBubyBsb25nZXIgaGF2ZSBhY2Nlc3Mg
dG8gY29va2llcy4iOwogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAg
ICBjYXNlICIjc3RlcDEwIjoKKyAgICAgICAgICAgICAgICAgICAgLy8gUmVzZXQgYWNjZXNzIHNj
b3BlLgorICAgICAgICAgICAgICAgICAgICBpbnRlcm5hbHMuc2V0dGluZ3Muc2V0U3RvcmFnZUFj
Y2Vzc0FQSVBlclBhZ2VTY29wZUVuYWJsZWQodHJ1ZSk7CiAgICAgICAgICAgICAgICAgICAgIHNl
dEVuYWJsZUZlYXR1cmUoZmFsc2UsIGZpbmlzaEpTVGVzdCk7CiAgICAgICAgICAgICAgICAgICAg
IGJyZWFrOwogICAgICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0
cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy1jcm9zcy1vcmlnaW4tc2Fu
ZGJveGVkLWlmcmFtZS1mcm9tLXByZXZhbGVudC1kb21haW4td2l0aC11c2VyLWludGVyYWN0aW9u
LWJ1dC1hY2Nlc3MtZnJvbS13cm9uZy1mcmFtZS5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0
cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy1jcm9zcy1vcmlnaW4tc2Fu
ZGJveGVkLWlmcmFtZS1mcm9tLXByZXZhbGVudC1kb21haW4td2l0aC11c2VyLWludGVyYWN0aW9u
LWJ1dC1hY2Nlc3MtZnJvbS13cm9uZy1mcmFtZS5odG1sCmluZGV4IDM3OWQ5OGI1YmNlMjM5MzYw
OWJkZTg4YTYwYTQwNjg5N2ZlZTIxNTMuLjlkNjUyZjhjNzBjOTFlNDk0OGVlMTg5NjBjZjdiY2Vh
YWZmMDZhOTggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc3RvcmFnZUFjY2Vz
cy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3MtY3Jvc3Mtb3JpZ2luLXNhbmRib3hlZC1pZnJhbWUt
ZnJvbS1wcmV2YWxlbnQtZG9tYWluLXdpdGgtdXNlci1pbnRlcmFjdGlvbi1idXQtYWNjZXNzLWZy
b20td3JvbmctZnJhbWUuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3N0b3JhZ2VB
Y2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNzLWNyb3NzLW9yaWdpbi1zYW5kYm94ZWQtaWZy
YW1lLWZyb20tcHJldmFsZW50LWRvbWFpbi13aXRoLXVzZXItaW50ZXJhY3Rpb24tYnV0LWFjY2Vz
cy1mcm9tLXdyb25nLWZyYW1lLmh0bWwKQEAgLTEwNSw2ICsxMDUsOCBAQAogICAgICAgICAgICAg
ICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICBjYXNlICIjc3RlcDYiOgogICAgICAgICAg
ICAgICAgICAgICBkb2N1bWVudC5sb2NhdGlvbi5oYXNoID0gInN0ZXA3IjsKKyAgICAgICAgICAg
ICAgICAgICAgLy8gU2V0IHBlci1mcmFtZSBhY2Nlc3Mgc2luY2Ugb3RoZXJ3aXNlIHRoZSBzaWJs
aW5nIGlmcmFtZSB3aWxsIGdldCBhY2Nlc3MuCisgICAgICAgICAgICAgICAgICAgIGludGVybmFs
cy5zZXR0aW5ncy5zZXRTdG9yYWdlQWNjZXNzQVBJUGVyUGFnZVNjb3BlRW5hYmxlZChmYWxzZSk7
CiAgICAgICAgICAgICAgICAgICAgIGxldCBpZnJhbWVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRl
RWxlbWVudCgiaWZyYW1lIik7CiAgICAgICAgICAgICAgICAgICAgIGlmcmFtZUVsZW1lbnQuc2V0
QXR0cmlidXRlKCJzYW5kYm94IiwgImFsbG93LXN0b3JhZ2UtYWNjZXNzLWJ5LXVzZXItYWN0aXZh
dGlvbiBhbGxvdy1zY3JpcHRzIGFsbG93LXNhbWUtb3JpZ2luIGFsbG93LW1vZGFscyIpOwogICAg
ICAgICAgICAgICAgICAgICBpZnJhbWVFbGVtZW50Lm9ubG9hZCA9IGZ1bmN0aW9uKCkgewpAQCAt
MTIyLDYgKzEyNCw4IEBACiAgICAgICAgICAgICAgICAgICAgIG9wZW5JZnJhbWUodGhpcmRQYXJ0
eUJhc2VVcmwgKyBzdWJQYXRoVG9HZXRDb29raWVzICsgIiZtZXNzYWdlPVNob3VsZCBub3QgcmVj
ZWl2ZSBjb29raWVzLiIsIHJ1blRlc3QpOwogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAg
ICAgICAgICAgICAgICBjYXNlICIjc3RlcDgiOgorICAgICAgICAgICAgICAgICAgICAvLyBSZXNl
dCBhY2Nlc3Mgc2NvcGUuCisgICAgICAgICAgICAgICAgICAgIGludGVybmFscy5zZXR0aW5ncy5z
ZXRTdG9yYWdlQWNjZXNzQVBJUGVyUGFnZVNjb3BlRW5hYmxlZCh0cnVlKTsKICAgICAgICAgICAg
ICAgICAgICAgc2V0RW5hYmxlRmVhdHVyZShmYWxzZSwgZmluaXNoSlNUZXN0KTsKICAgICAgICAg
ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0
cy9odHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNzLXRoZW4t
ZGV0YWNoLXNob3VsZC1ub3QtaGF2ZS1hY2Nlc3MuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVz
dHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3MtdGhlbi1kZXRhY2gtc2hv
dWxkLW5vdC1oYXZlLWFjY2Vzcy5odG1sCmluZGV4IDg0NTRmYzQ4ZmU1YTNlZjhjMWFiMWM4YjM3
ZjNjNjkwOGMwNmJmM2EuLjI2MzdlNDZiNmM4MDJlNmQ3ZWE1YWYzZGNhOWU1MjNmZDQyNDk5NmMg
MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0
LWFuZC1ncmFudC1hY2Nlc3MtdGhlbi1kZXRhY2gtc2hvdWxkLW5vdC1oYXZlLWFjY2Vzcy5odG1s
CisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1n
cmFudC1hY2Nlc3MtdGhlbi1kZXRhY2gtc2hvdWxkLW5vdC1oYXZlLWFjY2Vzcy5odG1sCkBAIC0x
MSw2ICsxMSw4IEBACiAgICAgICAgIHdpbmRvdy5hZGRFdmVudExpc3RlbmVyKCJtZXNzYWdlIiwg
cmVjZWl2ZU1lc3NhZ2UsIGZhbHNlKTsKIAogICAgICAgICBmdW5jdGlvbiBmaW5pc2hUZXN0KCkg
eworICAgICAgICAgICAgLy8gUmVzZXQgYWNjZXNzIHNjb3BlLgorICAgICAgICAgICAgaW50ZXJu
YWxzLnNldHRpbmdzLnNldFN0b3JhZ2VBY2Nlc3NBUElQZXJQYWdlU2NvcGVFbmFibGVkKHRydWUp
OwogICAgICAgICAgICAgc2V0RW5hYmxlRmVhdHVyZShmYWxzZSwgZmluaXNoSlNUZXN0KTsKICAg
ICAgICAgfQogCkBAIC05Myw2ICs5NSw5IEBACiAgICAgICAgICAgICAgICAgZG9jdW1lbnQubG9j
YXRpb24uaHJlZiA9IHN0YXRpc3RpY3NVcmwgKyAiL3N0b3JhZ2VBY2Nlc3MvcmVzb3VyY2VzL3Nl
dC1jb29raWUucGhwP25hbWU9Zmlyc3RQYXJ0eUNvb2tpZSZ2YWx1ZT12YWx1ZSNodHRwOi8vMTI3
LjAuMC4xOjgwMDAvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3MtdGhlbi1k
ZXRhY2gtc2hvdWxkLW5vdC1oYXZlLWFjY2Vzcy5odG1sI2ZpcnN0UGFydHlDb29raWVTZXQiOwog
ICAgICAgICAgICAgfSk7CiAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAvLyBTZXQgcGVy
LWZyYW1lIGFjY2VzcyBzaW5jZSBjbGVhcmluZyBhY2Nlc3Mgb24gZGV0YWNoaW5nIHRoZSBpZnJh
bWUgcmVxdWlyZXMgcGVyLWZyYW1lIGFjY2Vzcy4KKyAgICAgICAgICAgIGludGVybmFscy5zZXR0
aW5ncy5zZXRTdG9yYWdlQWNjZXNzQVBJUGVyUGFnZVNjb3BlRW5hYmxlZChmYWxzZSk7CisKICAg
ICAgICAgICAgIHRlc3RSdW5uZXIuc2V0U3RhdGlzdGljc1ByZXZhbGVudFJlc291cmNlKHN0YXRp
c3RpY3NVcmwsIHRydWUsIGZ1bmN0aW9uKCkgewogICAgICAgICAgICAgICAgIGlmICghdGVzdFJ1
bm5lci5pc1N0YXRpc3RpY3NQcmV2YWxlbnRSZXNvdXJjZShzdGF0aXN0aWNzVXJsKSkKICAgICAg
ICAgICAgICAgICAgICAgdGVzdEZhaWxlZCgiSG9zdCBkaWQgbm90IGdldCBzZXQgYXMgcHJldmFs
ZW50IHJlc291cmNlLiIpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zdG9y
YWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy10aGVuLW5hdmlnYXRlLWNyb3NzLXNp
dGUtc2hvdWxkLW5vdC1oYXZlLWFjY2Vzcy5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9z
dG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy10aGVuLW5hdmlnYXRlLWNyb3Nz
LXNpdGUtc2hvdWxkLW5vdC1oYXZlLWFjY2Vzcy5odG1sCmluZGV4IDU1NWQwZTMxYzljYTBhM2Qx
NzhmNGEzZjk3NjhkYzQ4MWU5YjIxOGYuLmQ1NjY1NDJjODM0YWYyNGUwNmY4ZjZiZDAzY2Y3MmRk
MWZiZGI2NGYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc3RvcmFnZUFjY2Vz
cy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3MtdGhlbi1uYXZpZ2F0ZS1jcm9zcy1zaXRlLXNob3Vs
ZC1ub3QtaGF2ZS1hY2Nlc3MuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3N0b3Jh
Z2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNzLXRoZW4tbmF2aWdhdGUtY3Jvc3Mtc2l0
ZS1zaG91bGQtbm90LWhhdmUtYWNjZXNzLmh0bWwKQEAgLTEzLDYgKzEzLDggQEAKICAgICAgICAg
d2luZG93LmFkZEV2ZW50TGlzdGVuZXIoIm1lc3NhZ2UiLCByZWNlaXZlTWVzc2FnZSwgZmFsc2Up
OwogCiAgICAgICAgIGZ1bmN0aW9uIGZpbmlzaFRlc3QoKSB7CisgICAgICAgICAgICAvLyBSZXNl
dCBhY2Nlc3Mgc2NvcGUuCisgICAgICAgICAgICBpbnRlcm5hbHMuc2V0dGluZ3Muc2V0U3RvcmFn
ZUFjY2Vzc0FQSVBlclBhZ2VTY29wZUVuYWJsZWQodHJ1ZSk7CiAgICAgICAgICAgICBzZXRFbmFi
bGVGZWF0dXJlKGZhbHNlLCBmaW5pc2hKU1Rlc3QpOwogICAgICAgICB9CiAKQEAgLTY4LDYgKzcw
LDggQEAKICAgICAgICAgICAgICAgICBkb2N1bWVudC5sb2NhdGlvbi5ocmVmID0gc3RhdGlzdGlj
c1VybCArICIvc3RvcmFnZUFjY2Vzcy9yZXNvdXJjZXMvc2V0LWNvb2tpZS5waHA/bmFtZT1maXJz
dFBhcnR5Q29va2llJnZhbHVlPXZhbHVlI2h0dHA6Ly8xMjcuMC4wLjE6ODAwMC9zdG9yYWdlQWNj
ZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy10aGVuLW5hdmlnYXRlLWNyb3NzLXNpdGUtc2hv
dWxkLW5vdC1oYXZlLWFjY2Vzcy5odG1sI2ZpcnN0UGFydHlDb29raWVTZXQiOwogICAgICAgICAg
ICAgfSk7CiAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAvLyBTZXQgcGVyLWZyYW1lIGFj
Y2VzcyBzaW5jZSBjbGVhcmluZyBhY2Nlc3Mgb24gY3Jvc3Mtc2l0ZSBuYXZpZ2F0aW9uIG9mIHRo
ZSBpZnJhbWUgcmVxdWlyZXMgcGVyLWZyYW1lIGFjY2Vzcy4KKyAgICAgICAgICAgIGludGVybmFs
cy5zZXR0aW5ncy5zZXRTdG9yYWdlQWNjZXNzQVBJUGVyUGFnZVNjb3BlRW5hYmxlZChmYWxzZSk7
CiAgICAgICAgICAgICB0ZXN0UnVubmVyLnNldFN0YXRpc3RpY3NQcmV2YWxlbnRSZXNvdXJjZShz
dGF0aXN0aWNzVXJsLCB0cnVlLCBmdW5jdGlvbigpIHsKICAgICAgICAgICAgICAgICBpZiAoIXRl
c3RSdW5uZXIuaXNTdGF0aXN0aWNzUHJldmFsZW50UmVzb3VyY2Uoc3RhdGlzdGljc1VybCkpCiAg
ICAgICAgICAgICAgICAgICAgIHRlc3RGYWlsZWQoIkhvc3QgZGlkIG5vdCBnZXQgc2V0IGFzIHBy
ZXZhbGVudCByZXNvdXJjZS4iKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMv
c3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3Mtd2l0aC1wZXItcGFnZS1zY29w
ZS1hY2Nlc3MtZnJvbS1hbm90aGVyLWZyYW1lLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3Rz
L3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNzLXdpdGgtcGVyLXBhZ2Utc2Nv
cGUtYWNjZXNzLWZyb20tYW5vdGhlci1mcmFtZS5odG1sCmluZGV4IDJlODU1N2U1YmRkYWRlZDBm
MmIxYzJjNGNhNjRmOTMyMGU0Zjg2NzAuLmI2OWQ1ZDc4MGE0ZDEzZGRkYzQ4NjRmOGYwMmQ4Yzk5
NTA1ZDU0ZjcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc3RvcmFnZUFjY2Vz
cy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3Mtd2l0aC1wZXItcGFnZS1zY29wZS1hY2Nlc3MtZnJv
bS1hbm90aGVyLWZyYW1lLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zdG9yYWdl
QWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy13aXRoLXBlci1wYWdlLXNjb3BlLWFjY2Vz
cy1mcm9tLWFub3RoZXItZnJhbWUuaHRtbApAQCAtODMsNyArODMsNiBAQAogICAgICAgICAgICAg
ICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICBjYXNlICIjc3RlcDQiOgogICAgICAgICAg
ICAgICAgICAgICBkb2N1bWVudC5sb2NhdGlvbi5oYXNoID0gInN0ZXA1IjsKLSAgICAgICAgICAg
ICAgICAgICAgaW50ZXJuYWxzLnNldHRpbmdzLnNldFN0b3JhZ2VBY2Nlc3NBUElQZXJQYWdlU2Nv
cGVFbmFibGVkKHRydWUpOwogICAgICAgICAgICAgICAgICAgICBsZXQgaWZyYW1lRWxlbWVudCA9
IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImlmcmFtZSIpOwogICAgICAgICAgICAgICAgICAgICBp
ZnJhbWVFbGVtZW50Lm9ubG9hZCA9IGZ1bmN0aW9uKCkgewogICAgICAgICAgICAgICAgICAgICAg
ICAgYWN0aXZhdGVFbGVtZW50KCJUaGVJZnJhbWVUaGF0UmVxdWVzdHNTdG9yYWdlQWNjZXNzIik7
CkBAIC05OSw3ICs5OCw2IEBACiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAg
ICAgICAgIGNhc2UgIiNzdGVwNiI6CiAgICAgICAgICAgICAgICAgICAgIHRlc3RSdW5uZXIuc2V0
U3RhdGlzdGljc1Nob3VsZEJsb2NrVGhpcmRQYXJ0eUNvb2tpZXMoZmFsc2UsIGZ1bmN0aW9uKCkg
ewotICAgICAgICAgICAgICAgICAgICAgICAgaW50ZXJuYWxzLnNldHRpbmdzLnNldFN0b3JhZ2VB
Y2Nlc3NBUElQZXJQYWdlU2NvcGVFbmFibGVkKGZhbHNlKTsKICAgICAgICAgICAgICAgICAgICAg
ICAgIHNldEVuYWJsZUZlYXR1cmUoZmFsc2UsIGZpbmlzaEpTVGVzdCk7CiAgICAgICAgICAgICAg
ICAgICAgIH0pOwogICAgICAgICAgICAgICAgICAgICBicmVhazsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>410185</attachid>
            <date>2020-09-30 18:01:16 -0700</date>
            <delta_ts>2020-10-04 21:17:23 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-217077-20200930180115.patch</filename>
            <type>text/plain</type>
            <size>16125</size>
            <attacher name="John Wilander">wilander</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3ODE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWI1OWRlYjlhYjVlZjhi
ZTYzMzZhOWMzYmIzOTYxZjdiYjNiOTRmYy4uYjQxY2Y3ZjY0NWZmZGM2MzM0NmJmNTAzOWQwZGQ5
YjcxMGE5MDRjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIwLTA5LTMwICBKb2hu
IFdpbGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIFN0b3JhZ2UgQWNjZXNz
IEFQSTogRW5hYmxlIHBlci1wYWdlIHN0b3JhZ2UgYWNjZXNzIHNjb3BlIGFuZCBhbGlnbiB0ZXN0
IGNhc2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y
MTcwNzcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY5MDE3ODc4PgorCisgICAgICAgIFJldmll
d2VkIGJ5IEJyZW50IEZ1bGdoYW0uCisKKyAgICAgICAgSXQgd2FzIGRlY2lkZWQgaW4gaHR0cHM6
Ly9naXRodWIuY29tL3ByaXZhY3ljZy9zdG9yYWdlLWFjY2Vzcy9pc3N1ZXMvMyB0aGF0CisgICAg
ICAgIGJyb3dzZXJzIHNob3VsZCBncmFudCBzdG9yYWdlIGFjY2VzcyBmb3IgYWxsIHNhbWUtc2l0
ZSByZXNvdXJjZXMgb24gdGhlIHdob2xlCisgICAgICAgIHBhZ2UsIG5vdCBqdXN0IHRoZSByZXF1
ZXN0aW5nIGlmcmFtZS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIEV4aXN0aW5nIHRlc3RzIGFs
aWduZWQsIGluY2x1ZGluZworICAgICAgICBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3N0b3JhZ2VB
Y2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNzLXdpdGgtcGVyLXBhZ2Utc2NvcGUtYWNjZXNz
LWZyb20tYW5vdGhlci1mcmFtZS5odG1sCisgICAgICAgIHdoaWNoIG5vIGxvbmdlciBjYWxscwor
ICAgICAgICBpbnRlcm5hbHMuc2V0dGluZ3Muc2V0U3RvcmFnZUFjY2Vzc0FQSVBlclBhZ2VTY29w
ZUVuYWJsZWQodHJ1ZSkKKyAgICAgICAgdG8gb3B0IGluIHRvIHRoZSBzZXR0aW5nIHRoYXQgaXMg
bm93IHRoZSBkZWZhdWx0LgorCisgICAgICAgICogZG9tL0RvY3VtZW50U3RvcmFnZUFjY2Vzcy5j
cHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudFN0b3JhZ2VBY2Nlc3M6OnJlcXVlc3RTdG9y
YWdlQWNjZXNzKToKKyAgICAgICAgICAgIENoYW5nZWQgdGhlIHNldHRpbmdzIGNoZWNrIHRvIGRv
IHRoZSByZXZlcnNlLCBpLmUuIGFzc3VtZQorICAgICAgICAgICAgcGVyLXBhZ2UgYWNjZXNzIGJ5
IGRlZmF1bHQgYW5kIHBlci1mcmFtZSBhY2Nlc3MgYXMgdGhlCisgICAgICAgICAgICBleGNlcHRp
b24uCisgICAgICAgICogZG9tL0RvY3VtZW50U3RvcmFnZUFjY2Vzcy5oOgorICAgICAgICAgICAg
Q2hhbmdlZCB0aGUgZGVmYXVsdCBzZXR0aW5nIGZvciBtX3N0b3JhZ2VBY2Nlc3NTY29wZSB0byBw
ZXItcGFnZS4KKyAgICAgICAgKiBwYWdlL1NldHRpbmdzLnlhbWw6CisgICAgICAgICAgICBDaGFu
Z2VkIHRoZSBkZWZhdWx0IHRvIHRydWUgZm9yCisgICAgICAgICAgICBzdG9yYWdlQWNjZXNzQVBJ
UGVyUGFnZVNjb3BlRW5hYmxlZC4KKwogMjAyMC0wOS0zMCAgU2FtIFdlaW5pZyAgPHdlaW5pZ0Bh
cHBsZS5jb20+CiAKICAgICAgICAgW1dlYklETF0gTWFrZSBFeHBvc2VkIG1hbmRhdG9yeSBmb3Ig
SURMIGludGVyZmFjZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291
cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggZmUwMzc5ZjcyYTdjYTc4NGNkZDcwMjI1ZmNkN2Jl
MzJlYjQyMGQ4My4uN2M2YWUwMjdmOTgzNjg1M2NiMzg0NTE3NWFhNTQxZjZmMTg4ZGI1NiAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFu
Z2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAyMC0wOS0zMCAgSm9obiBXaWxhbmRlciAgPHdpbGFu
ZGVyQGFwcGxlLmNvbT4KKworICAgICAgICBTdG9yYWdlIEFjY2VzcyBBUEk6IEVuYWJsZSBwZXIt
cGFnZSBzdG9yYWdlIGFjY2VzcyBzY29wZSBhbmQgYWxpZ24gdGVzdCBjYXNlcworICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE3MDc3CisgICAgICAgIDxy
ZGFyOi8vcHJvYmxlbS82OTAxNzg3OD4KKworICAgICAgICBSZXZpZXdlZCBieSBCcmVudCBGdWxn
aGFtLgorCisgICAgICAgIEl0IHdhcyBkZWNpZGVkIGluIGh0dHBzOi8vZ2l0aHViLmNvbS9wcml2
YWN5Y2cvc3RvcmFnZS1hY2Nlc3MvaXNzdWVzLzMgdGhhdAorICAgICAgICBicm93c2VycyBzaG91
bGQgZ3JhbnQgc3RvcmFnZSBhY2Nlc3MgZm9yIGFsbCBzYW1lLXNpdGUgcmVzb3VyY2VzIG9uIHRo
ZSB3aG9sZQorICAgICAgICBwYWdlLCBub3QganVzdCB0aGUgcmVxdWVzdGluZyBpZnJhbWUuCisK
KyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJL
aXQ6OldlYlBhZ2U6Omhhc1N0b3JhZ2VBY2Nlc3MpOgorICAgICAgICAgICAgQWRkZWQgYSBjYWxs
IHRvIFdlYlBhZ2U6Omhhc1BhZ2VMZXZlbFN0b3JhZ2VBY2Nlc3MoKQorICAgICAgICAgICAgYW5k
IGFuIGVhcmx5IHJldHVybiBpZiBpdCByZXR1cm5zIHRydWUuCisKIDIwMjAtMDktMzAgIFdlbnNv
biBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW0dQVSBQcm9jZXNz
XSBDYW52YXMgbGF5b3V0IHRlc3RzIG9jY2FzaW9uYWxseSBjcmFzaCB0aGUgd2ViIHByb2Nlc3Mg
dW5kZXIgUHV0SW1hZ2VEYXRhOjphcHBseQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9t
L0RvY3VtZW50U3RvcmFnZUFjY2Vzcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRT
dG9yYWdlQWNjZXNzLmNwcAppbmRleCAyMTkwZmI1MDQ3MDlmODAyNzFkM2NmZjIwN2M4YzA0NGJj
Y2QxM2U2Li44NzRlNTYwOGNkY2MxY2VmYWNiNzg2ZmEwYjAzZDIwMDdiYzQ0OTZjIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRTdG9yYWdlQWNjZXNzLmNwcAorKysgYi9T
b3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRTdG9yYWdlQWNjZXNzLmNwcApAQCAtMTk3LDggKzE5
Nyw4IEBAIHZvaWQgRG9jdW1lbnRTdG9yYWdlQWNjZXNzOjpyZXF1ZXN0U3RvcmFnZUFjY2VzcyhS
ZWY8RGVmZXJyZWRQcm9taXNlPiYmIHByb21pc2UpCiAgICAgICAgIHJldHVybjsKICAgICB9CiAK
LSAgICBpZiAocGFnZS0+c2V0dGluZ3MoKS5zdG9yYWdlQWNjZXNzQVBJUGVyUGFnZVNjb3BlRW5h
YmxlZCgpKQotICAgICAgICBtX3N0b3JhZ2VBY2Nlc3NTY29wZSA9IFN0b3JhZ2VBY2Nlc3NTY29w
ZTo6UGVyUGFnZTsKKyAgICBpZiAoIXBhZ2UtPnNldHRpbmdzKCkuc3RvcmFnZUFjY2Vzc0FQSVBl
clBhZ2VTY29wZUVuYWJsZWQoKSkKKyAgICAgICAgbV9zdG9yYWdlQWNjZXNzU2NvcGUgPSBTdG9y
YWdlQWNjZXNzU2NvcGU6OlBlckZyYW1lOwogCiAgICAgcGFnZS0+Y2hyb21lKCkuY2xpZW50KCku
cmVxdWVzdFN0b3JhZ2VBY2Nlc3MoUmVnaXN0cmFibGVEb21haW46OnVuY2hlY2tlZENyZWF0ZUZy
b21Ib3N0KG1fZG9jdW1lbnQuc2VjdXJpdHlPcmlnaW4oKS5ob3N0KCkpLCBSZWdpc3RyYWJsZURv
bWFpbjo6dW5jaGVja2VkQ3JlYXRlRnJvbUhvc3QobV9kb2N1bWVudC50b3BEb2N1bWVudCgpLnNl
Y3VyaXR5T3JpZ2luKCkuaG9zdCgpKSwgKmZyYW1lLCBtX3N0b3JhZ2VBY2Nlc3NTY29wZSwgW3Ro
aXMsIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpLCBwcm9taXNlID0gV1RGTW92ZShwcm9t
aXNlKV0gKFJlcXVlc3RTdG9yYWdlQWNjZXNzUmVzdWx0IHJlc3VsdCkgbXV0YWJsZSB7CiAgICAg
ICAgIGlmICghd2Vha1RoaXMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1l
bnRTdG9yYWdlQWNjZXNzLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRTdG9yYWdlQWNj
ZXNzLmgKaW5kZXggMDY2Y2VjN2RmYzU0ZDdmMjc5OWZkNzEwZWFiMTYwYTExYTAxMzI4Yi4uZWMx
MDc5ZWRiMTI0NjZmZDk1NDVlNTI3NmUyZDJiNTVjNjM0Y2VmMiAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvZG9tL0RvY3VtZW50U3RvcmFnZUFjY2Vzcy5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl
L2RvbS9Eb2N1bWVudFN0b3JhZ2VBY2Nlc3MuaApAQCAtMTA5LDcgKzEwOSw3IEBAIHByaXZhdGU6
CiAKICAgICB1aW50OF90IG1fbnVtYmVyT2ZUaW1lc0V4cGxpY2l0bHlEZW5pZWRGcmFtZVNwZWNp
ZmljU3RvcmFnZUFjY2VzcyA9IDA7CiAKLSAgICBTdG9yYWdlQWNjZXNzU2NvcGUgbV9zdG9yYWdl
QWNjZXNzU2NvcGUgPSBTdG9yYWdlQWNjZXNzU2NvcGU6OlBlckZyYW1lOworICAgIFN0b3JhZ2VB
Y2Nlc3NTY29wZSBtX3N0b3JhZ2VBY2Nlc3NTY29wZSA9IFN0b3JhZ2VBY2Nlc3NTY29wZTo6UGVy
UGFnZTsKIH07CiAKIHRlbXBsYXRlPGNsYXNzIEVuY29kZXI+CmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViQ29yZS9wYWdlL1NldHRpbmdzLnlhbWwgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdz
LnlhbWwKaW5kZXggNzkwZGI0YjdlOTZmYTk2ZGY4OGZkNjc4Y2FlMGM3MmU1MjNhODE5OS4uMGUw
OWU1YjE3MWU2N2MwZDI1NDQ5Njc4ZmZhOTgwNDExM2Y2ZGE4YyAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvcGFnZS9TZXR0aW5ncy55YW1sCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0
dGluZ3MueWFtbApAQCAtNzA0LDcgKzcwNCw3IEBAIHN0b3JhZ2VBY2Nlc3NBUElFbmFibGVkOgog
ICBpbml0aWFsOiB0cnVlCiAKIHN0b3JhZ2VBY2Nlc3NBUElQZXJQYWdlU2NvcGVFbmFibGVkOgot
ICBpbml0aWFsOiBmYWxzZQorICBpbml0aWFsOiB0cnVlCiAKIHRpbWVXaXRob3V0TW91c2VNb3Zl
bWVudEJlZm9yZUhpZGluZ0NvbnRyb2xzOgogICB0eXBlOiBTZWNvbmRzCmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJL
aXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IDEyOWNhNjZjZTRjZjcxNDg4
MWYzMTYwNjI4ZWFkOTZkNWFjZDlmY2MuLmUyMjJiMjQ4ZjQwZDMzNzI3ODc0NmM2YWNmZGEyZmY1
ZGFjZDQ2ODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl
YlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu
Y3BwCkBAIC02ODExLDYgKzY4MTEsMTEgQEAgdm9pZCBXZWJQYWdlOjpmcmFtZUJlY2FtZVJlbW90
ZShGcmFtZUlkZW50aWZpZXIgZnJhbWVJRCwgR2xvYmFsRnJhbWVJZGVudGlmaWVyJiYKICNpZiBF
TkFCTEUoUkVTT1VSQ0VfTE9BRF9TVEFUSVNUSUNTKQogdm9pZCBXZWJQYWdlOjpoYXNTdG9yYWdl
QWNjZXNzKFJlZ2lzdHJhYmxlRG9tYWluJiYgc3ViRnJhbWVEb21haW4sIFJlZ2lzdHJhYmxlRG9t
YWluJiYgdG9wRnJhbWVEb21haW4sIFdlYkZyYW1lJiBmcmFtZSwgQ29tcGxldGlvbkhhbmRsZXI8
dm9pZChib29sKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKKyAgICBpZiAoaGFzUGFnZUxldmVs
U3RvcmFnZUFjY2Vzcyh0b3BGcmFtZURvbWFpbiwgc3ViRnJhbWVEb21haW4pKSB7CisgICAgICAg
IGNvbXBsZXRpb25IYW5kbGVyKHRydWUpOworICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAg
V2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuZW5zdXJlTmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uKCku
Y29ubmVjdGlvbigpLnNlbmRXaXRoQXN5bmNSZXBseShNZXNzYWdlczo6TmV0d29ya0Nvbm5lY3Rp
b25Ub1dlYlByb2Nlc3M6Okhhc1N0b3JhZ2VBY2Nlc3MoV1RGTW92ZShzdWJGcmFtZURvbWFpbiks
IFdURk1vdmUodG9wRnJhbWVEb21haW4pLCBmcmFtZS5mcmFtZUlEKCksIG1faWRlbnRpZmllciks
IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz
dHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDYzM2E4ZDYwY2FjNjAx
M2E5OWQ2MzkxNzIyMWY4YzcxY2ViYWZlZWYuLjIyY2I5OTcwMTQ4MjZlMmE1ZjcxNjVkNjZiMDIw
MTNmNzk1N2JiMGEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlv
dXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAyMC0wOS0zMCAgSm9obiBXaWxh
bmRlciAgPHdpbGFuZGVyQGFwcGxlLmNvbT4KKworICAgICAgICBTdG9yYWdlIEFjY2VzcyBBUEk6
IEVuYWJsZSBwZXItcGFnZSBzdG9yYWdlIGFjY2VzcyBzY29wZSBhbmQgYWxpZ24gdGVzdCBjYXNl
cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE3MDc3
CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82OTAxNzg3OD4KKworICAgICAgICBSZXZpZXdlZCBi
eSBCcmVudCBGdWxnaGFtLgorCisgICAgICAgIEl0IHdhcyBkZWNpZGVkIGluIGh0dHBzOi8vZ2l0
aHViLmNvbS9wcml2YWN5Y2cvc3RvcmFnZS1hY2Nlc3MvaXNzdWVzLzMgdGhhdAorICAgICAgICBi
cm93c2VycyBzaG91bGQgZ3JhbnQgc3RvcmFnZSBhY2Nlc3MgZm9yIGFsbCBzYW1lLXNpdGUgcmVz
b3VyY2VzIG9uIHRoZSB3aG9sZQorICAgICAgICBwYWdlLCBub3QganVzdCB0aGUgcmVxdWVzdGlu
ZyBpZnJhbWUuCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1h
bmQtZ3JhbnQtYWNjZXNzLWNyb3NzLW9yaWdpbi1zYW5kYm94ZWQtaWZyYW1lLWZyb20tcHJldmFs
ZW50LWRvbWFpbi13aXRoLXVzZXItaW50ZXJhY3Rpb24tYW5kLWFjY2Vzcy1mcm9tLXJpZ2h0LWZy
YW1lLmh0bWw6CisgICAgICAgICogaHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5k
LWdyYW50LWFjY2Vzcy1jcm9zcy1vcmlnaW4tc2FuZGJveGVkLWlmcmFtZS1mcm9tLXByZXZhbGVu
dC1kb21haW4td2l0aC11c2VyLWludGVyYWN0aW9uLWJ1dC1hY2Nlc3MtZnJvbS13cm9uZy1mcmFt
ZS5odG1sOgorICAgICAgICAqIGh0dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1n
cmFudC1hY2Nlc3MtdGhlbi1kZXRhY2gtc2hvdWxkLW5vdC1oYXZlLWFjY2Vzcy5odG1sOgorICAg
ICAgICAqIGh0dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3Mt
dGhlbi1uYXZpZ2F0ZS1jcm9zcy1zaXRlLXNob3VsZC1ub3QtaGF2ZS1hY2Nlc3MuaHRtbDoKKyAg
ICAgICAgICAgIEFsbCBvZiB0aGUgYWJvdmUgbm93IGV4cGxpY2l0bHkgY2FsbAorICAgICAgICAg
ICAgaW50ZXJuYWxzLnNldHRpbmdzLnNldFN0b3JhZ2VBY2Nlc3NBUElQZXJQYWdlU2NvcGVFbmFi
bGVkKGZhbHNlKQorICAgICAgICAgICAgdG8gb3B0IG91dCBvZiB0aGUgbmV3IGRlZmF1bHQgc2V0
dGluZy4KKyAgICAgICAgKiBodHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3Jh
bnQtYWNjZXNzLXdpdGgtcGVyLXBhZ2Utc2NvcGUtYWNjZXNzLWZyb20tYW5vdGhlci1mcmFtZS5o
dG1sOgorICAgICAgICAgICAgQ2hhbmdlZCB0byBhc3N1bWUgcGVyLXBhZ2UgaXMgdGhlIGRlZmF1
bHQuCisKIDIwMjAtMDktMzAgIFJvc3MgS2lyc2xpbmcgIDxyb3NzLmtpcnNsaW5nQHNvbnkuY29t
PgogCiAgICAgICAgIFtKU0NdIEltcGxlbWVudCBpdGVtIG1ldGhvZCBwcm9wb3NhbApkaWZmIC0t
Z2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdy
YW50LWFjY2Vzcy1jcm9zcy1vcmlnaW4tc2FuZGJveGVkLWlmcmFtZS1mcm9tLXByZXZhbGVudC1k
b21haW4td2l0aC11c2VyLWludGVyYWN0aW9uLWFuZC1hY2Nlc3MtZnJvbS1yaWdodC1mcmFtZS5o
dG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdy
YW50LWFjY2Vzcy1jcm9zcy1vcmlnaW4tc2FuZGJveGVkLWlmcmFtZS1mcm9tLXByZXZhbGVudC1k
b21haW4td2l0aC11c2VyLWludGVyYWN0aW9uLWFuZC1hY2Nlc3MtZnJvbS1yaWdodC1mcmFtZS5o
dG1sCmluZGV4IDdlMmI0ZDQwMzJlMTAyYWM1OTY0MWEzYjdkMjFmYWIyNzk2MjU5MjcuLjE1MmM5
M2VkY2U2M2U1ODJmZmQxOTgyYTM4NzZmZWMwNTE3MzVkYTEgMTAwNjQ0Ci0tLSBhL0xheW91dFRl
c3RzL2h0dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3MtY3Jv
c3Mtb3JpZ2luLXNhbmRib3hlZC1pZnJhbWUtZnJvbS1wcmV2YWxlbnQtZG9tYWluLXdpdGgtdXNl
ci1pbnRlcmFjdGlvbi1hbmQtYWNjZXNzLWZyb20tcmlnaHQtZnJhbWUuaHRtbAorKysgYi9MYXlv
dXRUZXN0cy9odHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNz
LWNyb3NzLW9yaWdpbi1zYW5kYm94ZWQtaWZyYW1lLWZyb20tcHJldmFsZW50LWRvbWFpbi13aXRo
LXVzZXItaW50ZXJhY3Rpb24tYW5kLWFjY2Vzcy1mcm9tLXJpZ2h0LWZyYW1lLmh0bWwKQEAgLTEw
NSw2ICsxMDUsOCBAQAogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAg
ICBjYXNlICIjc3RlcDYiOgogICAgICAgICAgICAgICAgICAgICBkb2N1bWVudC5sb2NhdGlvbi5o
YXNoID0gInN0ZXA3IjsKKyAgICAgICAgICAgICAgICAgICAgLy8gU2V0IHBlci1mcmFtZSBhY2Nl
c3Mgc2luY2UgY2xlYXJpbmcgYWNjZXNzIG9uIGNyb3NzLXNpdGUgbmF2aWdhdGlvbiBvZiB0aGUg
aWZyYW1lIHJlcXVpcmVzIHBlci1mcmFtZSBhY2Nlc3MuCisgICAgICAgICAgICAgICAgICAgIGlu
dGVybmFscy5zZXR0aW5ncy5zZXRTdG9yYWdlQWNjZXNzQVBJUGVyUGFnZVNjb3BlRW5hYmxlZChm
YWxzZSk7CiAgICAgICAgICAgICAgICAgICAgIC8vIENyZWF0ZSBpZnJhbWUgdGhhdCB3aWxsIHJl
cXVlc3Qgc3RvcmFnZSBhY2Nlc3MuCiAgICAgICAgICAgICAgICAgICAgIGxldCBpZnJhbWVFbGVt
ZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaWZyYW1lIik7CiAgICAgICAgICAgICAgICAg
ICAgIGlmcmFtZUVsZW1lbnQuc2V0QXR0cmlidXRlKCJzYW5kYm94IiwgImFsbG93LXN0b3JhZ2Ut
YWNjZXNzLWJ5LXVzZXItYWN0aXZhdGlvbiBhbGxvdy1zY3JpcHRzIGFsbG93LXNhbWUtb3JpZ2lu
IGFsbG93LW1vZGFscyIpOwpAQCAtMTQzLDYgKzE0NSw4IEBACiAgICAgICAgICAgICAgICAgICAg
IGV4aXN0aW5nSWZyYW1lMy5zcmMgPSB0aGlyZFBhcnR5QmFzZVVybCArIHN1YlBhdGhUb0dldENv
b2tpZXMgKyAiJm1lc3NhZ2U9QWZ0ZXIgdGhlIHRvcCBmcmFtZSBuYXZpZ2F0ZXMgdGhlIHN1YiBm
cmFtZSBjcm9zcy1zaXRlIGFuZCBiYWNrLCB0aGUgc3ViIGZyYW1lIHNob3VsZCBubyBsb25nZXIg
aGF2ZSBhY2Nlc3MgdG8gY29va2llcy4iOwogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAg
ICAgICAgICAgICAgICBjYXNlICIjc3RlcDEwIjoKKyAgICAgICAgICAgICAgICAgICAgLy8gUmVz
ZXQgYWNjZXNzIHNjb3BlLgorICAgICAgICAgICAgICAgICAgICBpbnRlcm5hbHMuc2V0dGluZ3Mu
c2V0U3RvcmFnZUFjY2Vzc0FQSVBlclBhZ2VTY29wZUVuYWJsZWQodHJ1ZSk7CiAgICAgICAgICAg
ICAgICAgICAgIHNldEVuYWJsZUZlYXR1cmUoZmFsc2UsIGZpbmlzaEpTVGVzdCk7CiAgICAgICAg
ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz
dHMvaHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy1jcm9z
cy1vcmlnaW4tc2FuZGJveGVkLWlmcmFtZS1mcm9tLXByZXZhbGVudC1kb21haW4td2l0aC11c2Vy
LWludGVyYWN0aW9uLWJ1dC1hY2Nlc3MtZnJvbS13cm9uZy1mcmFtZS5odG1sIGIvTGF5b3V0VGVz
dHMvaHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy1jcm9z
cy1vcmlnaW4tc2FuZGJveGVkLWlmcmFtZS1mcm9tLXByZXZhbGVudC1kb21haW4td2l0aC11c2Vy
LWludGVyYWN0aW9uLWJ1dC1hY2Nlc3MtZnJvbS13cm9uZy1mcmFtZS5odG1sCmluZGV4IDM3OWQ5
OGI1YmNlMjM5MzYwOWJkZTg4YTYwYTQwNjg5N2ZlZTIxNTMuLjlkNjUyZjhjNzBjOTFlNDk0OGVl
MTg5NjBjZjdiY2VhYWZmMDZhOTggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMv
c3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3MtY3Jvc3Mtb3JpZ2luLXNhbmRi
b3hlZC1pZnJhbWUtZnJvbS1wcmV2YWxlbnQtZG9tYWluLXdpdGgtdXNlci1pbnRlcmFjdGlvbi1i
dXQtYWNjZXNzLWZyb20td3JvbmctZnJhbWUuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rl
c3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNzLWNyb3NzLW9yaWdpbi1z
YW5kYm94ZWQtaWZyYW1lLWZyb20tcHJldmFsZW50LWRvbWFpbi13aXRoLXVzZXItaW50ZXJhY3Rp
b24tYnV0LWFjY2Vzcy1mcm9tLXdyb25nLWZyYW1lLmh0bWwKQEAgLTEwNSw2ICsxMDUsOCBAQAog
ICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICBjYXNlICIjc3RlcDYi
OgogICAgICAgICAgICAgICAgICAgICBkb2N1bWVudC5sb2NhdGlvbi5oYXNoID0gInN0ZXA3IjsK
KyAgICAgICAgICAgICAgICAgICAgLy8gU2V0IHBlci1mcmFtZSBhY2Nlc3Mgc2luY2Ugb3RoZXJ3
aXNlIHRoZSBzaWJsaW5nIGlmcmFtZSB3aWxsIGdldCBhY2Nlc3MuCisgICAgICAgICAgICAgICAg
ICAgIGludGVybmFscy5zZXR0aW5ncy5zZXRTdG9yYWdlQWNjZXNzQVBJUGVyUGFnZVNjb3BlRW5h
YmxlZChmYWxzZSk7CiAgICAgICAgICAgICAgICAgICAgIGxldCBpZnJhbWVFbGVtZW50ID0gZG9j
dW1lbnQuY3JlYXRlRWxlbWVudCgiaWZyYW1lIik7CiAgICAgICAgICAgICAgICAgICAgIGlmcmFt
ZUVsZW1lbnQuc2V0QXR0cmlidXRlKCJzYW5kYm94IiwgImFsbG93LXN0b3JhZ2UtYWNjZXNzLWJ5
LXVzZXItYWN0aXZhdGlvbiBhbGxvdy1zY3JpcHRzIGFsbG93LXNhbWUtb3JpZ2luIGFsbG93LW1v
ZGFscyIpOwogICAgICAgICAgICAgICAgICAgICBpZnJhbWVFbGVtZW50Lm9ubG9hZCA9IGZ1bmN0
aW9uKCkgewpAQCAtMTIyLDYgKzEyNCw4IEBACiAgICAgICAgICAgICAgICAgICAgIG9wZW5JZnJh
bWUodGhpcmRQYXJ0eUJhc2VVcmwgKyBzdWJQYXRoVG9HZXRDb29raWVzICsgIiZtZXNzYWdlPVNo
b3VsZCBub3QgcmVjZWl2ZSBjb29raWVzLiIsIHJ1blRlc3QpOwogICAgICAgICAgICAgICAgICAg
ICBicmVhazsKICAgICAgICAgICAgICAgICBjYXNlICIjc3RlcDgiOgorICAgICAgICAgICAgICAg
ICAgICAvLyBSZXNldCBhY2Nlc3Mgc2NvcGUuCisgICAgICAgICAgICAgICAgICAgIGludGVybmFs
cy5zZXR0aW5ncy5zZXRTdG9yYWdlQWNjZXNzQVBJUGVyUGFnZVNjb3BlRW5hYmxlZCh0cnVlKTsK
ICAgICAgICAgICAgICAgICAgICAgc2V0RW5hYmxlRmVhdHVyZShmYWxzZSwgZmluaXNoSlNUZXN0
KTsKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CmRpZmYgLS1naXQg
YS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQt
YWNjZXNzLXRoZW4tZGV0YWNoLXNob3VsZC1ub3QtaGF2ZS1hY2Nlc3MuaHRtbCBiL0xheW91dFRl
c3RzL2h0dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3MtdGhl
bi1kZXRhY2gtc2hvdWxkLW5vdC1oYXZlLWFjY2Vzcy5odG1sCmluZGV4IDg0NTRmYzQ4ZmU1YTNl
ZjhjMWFiMWM4YjM3ZjNjNjkwOGMwNmJmM2EuLjI2MzdlNDZiNmM4MDJlNmQ3ZWE1YWYzZGNhOWU1
MjNmZDQyNDk5NmMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc3RvcmFnZUFj
Y2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3MtdGhlbi1kZXRhY2gtc2hvdWxkLW5vdC1oYXZl
LWFjY2Vzcy5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9y
ZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3MtdGhlbi1kZXRhY2gtc2hvdWxkLW5vdC1oYXZlLWFjY2Vz
cy5odG1sCkBAIC0xMSw2ICsxMSw4IEBACiAgICAgICAgIHdpbmRvdy5hZGRFdmVudExpc3RlbmVy
KCJtZXNzYWdlIiwgcmVjZWl2ZU1lc3NhZ2UsIGZhbHNlKTsKIAogICAgICAgICBmdW5jdGlvbiBm
aW5pc2hUZXN0KCkgeworICAgICAgICAgICAgLy8gUmVzZXQgYWNjZXNzIHNjb3BlLgorICAgICAg
ICAgICAgaW50ZXJuYWxzLnNldHRpbmdzLnNldFN0b3JhZ2VBY2Nlc3NBUElQZXJQYWdlU2NvcGVF
bmFibGVkKHRydWUpOwogICAgICAgICAgICAgc2V0RW5hYmxlRmVhdHVyZShmYWxzZSwgZmluaXNo
SlNUZXN0KTsKICAgICAgICAgfQogCkBAIC05Myw2ICs5NSw5IEBACiAgICAgICAgICAgICAgICAg
ZG9jdW1lbnQubG9jYXRpb24uaHJlZiA9IHN0YXRpc3RpY3NVcmwgKyAiL3N0b3JhZ2VBY2Nlc3Mv
cmVzb3VyY2VzL3NldC1jb29raWUucGhwP25hbWU9Zmlyc3RQYXJ0eUNvb2tpZSZ2YWx1ZT12YWx1
ZSNodHRwOi8vMTI3LjAuMC4xOjgwMDAvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1h
Y2Nlc3MtdGhlbi1kZXRhY2gtc2hvdWxkLW5vdC1oYXZlLWFjY2Vzcy5odG1sI2ZpcnN0UGFydHlD
b29raWVTZXQiOwogICAgICAgICAgICAgfSk7CiAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAg
ICAvLyBTZXQgcGVyLWZyYW1lIGFjY2VzcyBzaW5jZSBjbGVhcmluZyBhY2Nlc3Mgb24gZGV0YWNo
aW5nIHRoZSBpZnJhbWUgcmVxdWlyZXMgcGVyLWZyYW1lIGFjY2Vzcy4KKyAgICAgICAgICAgIGlu
dGVybmFscy5zZXR0aW5ncy5zZXRTdG9yYWdlQWNjZXNzQVBJUGVyUGFnZVNjb3BlRW5hYmxlZChm
YWxzZSk7CisKICAgICAgICAgICAgIHRlc3RSdW5uZXIuc2V0U3RhdGlzdGljc1ByZXZhbGVudFJl
c291cmNlKHN0YXRpc3RpY3NVcmwsIHRydWUsIGZ1bmN0aW9uKCkgewogICAgICAgICAgICAgICAg
IGlmICghdGVzdFJ1bm5lci5pc1N0YXRpc3RpY3NQcmV2YWxlbnRSZXNvdXJjZShzdGF0aXN0aWNz
VXJsKSkKICAgICAgICAgICAgICAgICAgICAgdGVzdEZhaWxlZCgiSG9zdCBkaWQgbm90IGdldCBz
ZXQgYXMgcHJldmFsZW50IHJlc291cmNlLiIpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0
cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy10aGVuLW5hdmln
YXRlLWNyb3NzLXNpdGUtc2hvdWxkLW5vdC1oYXZlLWFjY2Vzcy5odG1sIGIvTGF5b3V0VGVzdHMv
aHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy10aGVuLW5h
dmlnYXRlLWNyb3NzLXNpdGUtc2hvdWxkLW5vdC1oYXZlLWFjY2Vzcy5odG1sCmluZGV4IDU1NWQw
ZTMxYzljYTBhM2QxNzhmNGEzZjk3NjhkYzQ4MWU5YjIxOGYuLmQ1NjY1NDJjODM0YWYyNGUwNmY4
ZjZiZDAzY2Y3MmRkMWZiZGI2NGYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMv
c3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3MtdGhlbi1uYXZpZ2F0ZS1jcm9z
cy1zaXRlLXNob3VsZC1ub3QtaGF2ZS1hY2Nlc3MuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9odHRw
L3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNzLXRoZW4tbmF2aWdh
dGUtY3Jvc3Mtc2l0ZS1zaG91bGQtbm90LWhhdmUtYWNjZXNzLmh0bWwKQEAgLTEzLDYgKzEzLDgg
QEAKICAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoIm1lc3NhZ2UiLCByZWNlaXZlTWVz
c2FnZSwgZmFsc2UpOwogCiAgICAgICAgIGZ1bmN0aW9uIGZpbmlzaFRlc3QoKSB7CisgICAgICAg
ICAgICAvLyBSZXNldCBhY2Nlc3Mgc2NvcGUuCisgICAgICAgICAgICBpbnRlcm5hbHMuc2V0dGlu
Z3Muc2V0U3RvcmFnZUFjY2Vzc0FQSVBlclBhZ2VTY29wZUVuYWJsZWQodHJ1ZSk7CiAgICAgICAg
ICAgICBzZXRFbmFibGVGZWF0dXJlKGZhbHNlLCBmaW5pc2hKU1Rlc3QpOwogICAgICAgICB9CiAK
QEAgLTY4LDYgKzcwLDggQEAKICAgICAgICAgICAgICAgICBkb2N1bWVudC5sb2NhdGlvbi5ocmVm
ID0gc3RhdGlzdGljc1VybCArICIvc3RvcmFnZUFjY2Vzcy9yZXNvdXJjZXMvc2V0LWNvb2tpZS5w
aHA/bmFtZT1maXJzdFBhcnR5Q29va2llJnZhbHVlPXZhbHVlI2h0dHA6Ly8xMjcuMC4wLjE6ODAw
MC9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy10aGVuLW5hdmlnYXRlLWNy
b3NzLXNpdGUtc2hvdWxkLW5vdC1oYXZlLWFjY2Vzcy5odG1sI2ZpcnN0UGFydHlDb29raWVTZXQi
OwogICAgICAgICAgICAgfSk7CiAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAvLyBTZXQg
cGVyLWZyYW1lIGFjY2VzcyBzaW5jZSBjbGVhcmluZyBhY2Nlc3Mgb24gY3Jvc3Mtc2l0ZSBuYXZp
Z2F0aW9uIG9mIHRoZSBpZnJhbWUgcmVxdWlyZXMgcGVyLWZyYW1lIGFjY2Vzcy4KKyAgICAgICAg
ICAgIGludGVybmFscy5zZXR0aW5ncy5zZXRTdG9yYWdlQWNjZXNzQVBJUGVyUGFnZVNjb3BlRW5h
YmxlZChmYWxzZSk7CiAgICAgICAgICAgICB0ZXN0UnVubmVyLnNldFN0YXRpc3RpY3NQcmV2YWxl
bnRSZXNvdXJjZShzdGF0aXN0aWNzVXJsLCB0cnVlLCBmdW5jdGlvbigpIHsKICAgICAgICAgICAg
ICAgICBpZiAoIXRlc3RSdW5uZXIuaXNTdGF0aXN0aWNzUHJldmFsZW50UmVzb3VyY2Uoc3RhdGlz
dGljc1VybCkpCiAgICAgICAgICAgICAgICAgICAgIHRlc3RGYWlsZWQoIkhvc3QgZGlkIG5vdCBn
ZXQgc2V0IGFzIHByZXZhbGVudCByZXNvdXJjZS4iKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz
L2h0dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3Mtd2l0aC1w
ZXItcGFnZS1zY29wZS1hY2Nlc3MtZnJvbS1hbm90aGVyLWZyYW1lLmh0bWwgYi9MYXlvdXRUZXN0
cy9odHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNzLXdpdGgt
cGVyLXBhZ2Utc2NvcGUtYWNjZXNzLWZyb20tYW5vdGhlci1mcmFtZS5odG1sCmluZGV4IDJlODU1
N2U1YmRkYWRlZDBmMmIxYzJjNGNhNjRmOTMyMGU0Zjg2NzAuLmI2OWQ1ZDc4MGE0ZDEzZGRkYzQ4
NjRmOGYwMmQ4Yzk5NTA1ZDU0ZjcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMv
c3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3Mtd2l0aC1wZXItcGFnZS1zY29w
ZS1hY2Nlc3MtZnJvbS1hbm90aGVyLWZyYW1lLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90
ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy13aXRoLXBlci1wYWdl
LXNjb3BlLWFjY2Vzcy1mcm9tLWFub3RoZXItZnJhbWUuaHRtbApAQCAtODMsNyArODMsNiBAQAog
ICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICBjYXNlICIjc3RlcDQi
OgogICAgICAgICAgICAgICAgICAgICBkb2N1bWVudC5sb2NhdGlvbi5oYXNoID0gInN0ZXA1IjsK
LSAgICAgICAgICAgICAgICAgICAgaW50ZXJuYWxzLnNldHRpbmdzLnNldFN0b3JhZ2VBY2Nlc3NB
UElQZXJQYWdlU2NvcGVFbmFibGVkKHRydWUpOwogICAgICAgICAgICAgICAgICAgICBsZXQgaWZy
YW1lRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImlmcmFtZSIpOwogICAgICAgICAg
ICAgICAgICAgICBpZnJhbWVFbGVtZW50Lm9ubG9hZCA9IGZ1bmN0aW9uKCkgewogICAgICAgICAg
ICAgICAgICAgICAgICAgYWN0aXZhdGVFbGVtZW50KCJUaGVJZnJhbWVUaGF0UmVxdWVzdHNTdG9y
YWdlQWNjZXNzIik7CkBAIC05OSw3ICs5OCw2IEBACiAgICAgICAgICAgICAgICAgICAgIGJyZWFr
OwogICAgICAgICAgICAgICAgIGNhc2UgIiNzdGVwNiI6CiAgICAgICAgICAgICAgICAgICAgIHRl
c3RSdW5uZXIuc2V0U3RhdGlzdGljc1Nob3VsZEJsb2NrVGhpcmRQYXJ0eUNvb2tpZXMoZmFsc2Us
IGZ1bmN0aW9uKCkgewotICAgICAgICAgICAgICAgICAgICAgICAgaW50ZXJuYWxzLnNldHRpbmdz
LnNldFN0b3JhZ2VBY2Nlc3NBUElQZXJQYWdlU2NvcGVFbmFibGVkKGZhbHNlKTsKICAgICAgICAg
ICAgICAgICAgICAgICAgIHNldEVuYWJsZUZlYXR1cmUoZmFsc2UsIGZpbmlzaEpTVGVzdCk7CiAg
ICAgICAgICAgICAgICAgICAgIH0pOwogICAgICAgICAgICAgICAgICAgICBicmVhazsK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>410500</attachid>
            <date>2020-10-04 21:17:25 -0700</date>
            <delta_ts>2020-10-05 09:42:13 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-217077-20201004211724.patch</filename>
            <type>text/plain</type>
            <size>18569</size>
            <attacher name="John Wilander">wilander</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3OTUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmMzYmZiNzJmOTQ5NmQ1
OWFjNzc2N2M5NTE2Y2JmM2E0ZjZhZTgzMC4uNmM4Njc2NzMxN2EzOGE0ZDAwYzE3OWVjNjRjZjZk
YzQxYjZmMWYyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIwLTEwLTA0ICBKb2hu
IFdpbGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIFN0b3JhZ2UgQWNjZXNz
IEFQSTogRW5hYmxlIHBlci1wYWdlIHN0b3JhZ2UgYWNjZXNzIHNjb3BlIGFuZCBhbGlnbiB0ZXN0
IGNhc2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y
MTcwNzcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY5MDE3ODc4PgorCisgICAgICAgIFJldmll
d2VkIGJ5IEJyZW50IEZ1bGdoYW0uCisKKyAgICAgICAgSXQgd2FzIGRlY2lkZWQgaW4gaHR0cHM6
Ly9naXRodWIuY29tL3ByaXZhY3ljZy9zdG9yYWdlLWFjY2Vzcy9pc3N1ZXMvMyB0aGF0CisgICAg
ICAgIGJyb3dzZXJzIHNob3VsZCBncmFudCBzdG9yYWdlIGFjY2VzcyBmb3IgYWxsIHNhbWUtc2l0
ZSByZXNvdXJjZXMgb24gdGhlIHdob2xlCisgICAgICAgIHBhZ2UsIG5vdCBqdXN0IHRoZSByZXF1
ZXN0aW5nIGlmcmFtZS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIEV4aXN0aW5nIHRlc3RzIGFs
aWduZWQsIGluY2x1ZGluZworICAgICAgICBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3N0b3JhZ2VB
Y2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNzLXdpdGgtcGVyLXBhZ2Utc2NvcGUtYWNjZXNz
LWZyb20tYW5vdGhlci1mcmFtZS5odG1sCisgICAgICAgIHdoaWNoIG5vIGxvbmdlciBjYWxscwor
ICAgICAgICBpbnRlcm5hbHMuc2V0dGluZ3Muc2V0U3RvcmFnZUFjY2Vzc0FQSVBlclBhZ2VTY29w
ZUVuYWJsZWQodHJ1ZSkKKyAgICAgICAgdG8gb3B0IGluIHRvIHRoZSBzZXR0aW5nIHRoYXQgaXMg
bm93IHRoZSBkZWZhdWx0LgorCisgICAgICAgICogZG9tL0RvY3VtZW50U3RvcmFnZUFjY2Vzcy5j
cHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudFN0b3JhZ2VBY2Nlc3M6OnJlcXVlc3RTdG9y
YWdlQWNjZXNzKToKKyAgICAgICAgICAgIENoYW5nZWQgdGhlIHNldHRpbmdzIGNoZWNrIHRvIGRv
IHRoZSByZXZlcnNlLCBpLmUuIGFzc3VtZQorICAgICAgICAgICAgcGVyLXBhZ2UgYWNjZXNzIGJ5
IGRlZmF1bHQgYW5kIHBlci1mcmFtZSBhY2Nlc3MgYXMgdGhlCisgICAgICAgICAgICBleGNlcHRp
b24uCisgICAgICAgICogZG9tL0RvY3VtZW50U3RvcmFnZUFjY2Vzcy5oOgorICAgICAgICAgICAg
Q2hhbmdlZCB0aGUgZGVmYXVsdCBzZXR0aW5nIGZvciBtX3N0b3JhZ2VBY2Nlc3NTY29wZSB0byBw
ZXItcGFnZS4KKyAgICAgICAgKiBwYWdlL1NldHRpbmdzLnlhbWw6CisgICAgICAgICAgICBDaGFu
Z2VkIHRoZSBkZWZhdWx0IHRvIHRydWUgZm9yCisgICAgICAgICAgICBzdG9yYWdlQWNjZXNzQVBJ
UGVyUGFnZVNjb3BlRW5hYmxlZC4KKwogMjAyMC0xMC0wNCAgU2FtIFdlaW5pZyAgPHdlaW5pZ0Bh
cHBsZS5jb20+CiAKICAgICAgICAgW1dlYklETF0gQWRkcmVzcyBjb25zaXN0ZW5jeSBhcm91bmQg
W1NhbWVPYmplY3RdIGV4dGVuZGVkIGF0dHJpYnV0ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggZDNkZTc0Njc0M2Vi
MzUyZWVmM2VjNWMyMGE1MTk0MDk2NzNhZTM2Ny4uNTgwNTRkMWVmOTE1NTk2YmUwYmM3NGNhZjNm
YmVhNjhhZmQwNzc2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIv
U291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAyMC0xMC0wNCAgSm9o
biBXaWxhbmRlciAgPHdpbGFuZGVyQGFwcGxlLmNvbT4KKworICAgICAgICBTdG9yYWdlIEFjY2Vz
cyBBUEk6IEVuYWJsZSBwZXItcGFnZSBzdG9yYWdlIGFjY2VzcyBzY29wZSBhbmQgYWxpZ24gdGVz
dCBjYXNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
MjE3MDc3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82OTAxNzg3OD4KKworICAgICAgICBSZXZp
ZXdlZCBieSBCcmVudCBGdWxnaGFtLgorCisgICAgICAgIEl0IHdhcyBkZWNpZGVkIGluIGh0dHBz
Oi8vZ2l0aHViLmNvbS9wcml2YWN5Y2cvc3RvcmFnZS1hY2Nlc3MvaXNzdWVzLzMgdGhhdAorICAg
ICAgICBicm93c2VycyBzaG91bGQgZ3JhbnQgc3RvcmFnZSBhY2Nlc3MgZm9yIGFsbCBzYW1lLXNp
dGUgcmVzb3VyY2VzIG9uIHRoZSB3aG9sZQorICAgICAgICBwYWdlLCBub3QganVzdCB0aGUgcmVx
dWVzdGluZyBpZnJhbWUuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5j
cHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6Omhhc1N0b3JhZ2VBY2Nlc3MpOgorICAgICAg
ICAgICAgQWRkZWQgYSBjYWxsIHRvIFdlYlBhZ2U6Omhhc1BhZ2VMZXZlbFN0b3JhZ2VBY2Nlc3Mo
KQorICAgICAgICAgICAgYW5kIGFuIGVhcmx5IHJldHVybiBpZiBpdCByZXR1cm5zIHRydWUuCisg
ICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmNsZWFyUGFnZUxldmVsU3RvcmFnZUFjY2Vzcyk6Cisg
ICAgICAgICAgICBOZXcgZnVuY3Rpb24gdG8gY2xlYXIgdGhlIHdlYnBhZ2UncyBtX2RvbWFpbnNX
aXRoUGFnZUxldmVsU3RvcmFnZUFjY2VzcworICAgICAgICAgICAgbWFwLgorICAgICAgICAqIFdl
YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQcm9j
ZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6Y2xlYXJSZXNvdXJjZUxvYWRT
dGF0aXN0aWNzKToKKyAgICAgICAgICAgIE5vdyBjbGVhcnMgYWxsIHdlYnBhZ2VzJyBwYWdlIGxl
dmVsIHN0b3JhZ2UgYWNjZXNzIG1hcHMuCisKIDIwMjAtMTAtMDQgIExhdXJvIE1vdXJhICA8bG1v
dXJhQGlnYWxpYS5jb20+CiAKICAgICAgICAgd2Via2l0cHk6IFVwZGF0ZSBtZXNzYWdlcyByZWZl
cmVuY2UgZmlsZXMgYWZ0ZXIgcjI2NzkxNgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9t
L0RvY3VtZW50U3RvcmFnZUFjY2Vzcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRT
dG9yYWdlQWNjZXNzLmNwcAppbmRleCAyMTkwZmI1MDQ3MDlmODAyNzFkM2NmZjIwN2M4YzA0NGJj
Y2QxM2U2Li44NzRlNTYwOGNkY2MxY2VmYWNiNzg2ZmEwYjAzZDIwMDdiYzQ0OTZjIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRTdG9yYWdlQWNjZXNzLmNwcAorKysgYi9T
b3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRTdG9yYWdlQWNjZXNzLmNwcApAQCAtMTk3LDggKzE5
Nyw4IEBAIHZvaWQgRG9jdW1lbnRTdG9yYWdlQWNjZXNzOjpyZXF1ZXN0U3RvcmFnZUFjY2VzcyhS
ZWY8RGVmZXJyZWRQcm9taXNlPiYmIHByb21pc2UpCiAgICAgICAgIHJldHVybjsKICAgICB9CiAK
LSAgICBpZiAocGFnZS0+c2V0dGluZ3MoKS5zdG9yYWdlQWNjZXNzQVBJUGVyUGFnZVNjb3BlRW5h
YmxlZCgpKQotICAgICAgICBtX3N0b3JhZ2VBY2Nlc3NTY29wZSA9IFN0b3JhZ2VBY2Nlc3NTY29w
ZTo6UGVyUGFnZTsKKyAgICBpZiAoIXBhZ2UtPnNldHRpbmdzKCkuc3RvcmFnZUFjY2Vzc0FQSVBl
clBhZ2VTY29wZUVuYWJsZWQoKSkKKyAgICAgICAgbV9zdG9yYWdlQWNjZXNzU2NvcGUgPSBTdG9y
YWdlQWNjZXNzU2NvcGU6OlBlckZyYW1lOwogCiAgICAgcGFnZS0+Y2hyb21lKCkuY2xpZW50KCku
cmVxdWVzdFN0b3JhZ2VBY2Nlc3MoUmVnaXN0cmFibGVEb21haW46OnVuY2hlY2tlZENyZWF0ZUZy
b21Ib3N0KG1fZG9jdW1lbnQuc2VjdXJpdHlPcmlnaW4oKS5ob3N0KCkpLCBSZWdpc3RyYWJsZURv
bWFpbjo6dW5jaGVja2VkQ3JlYXRlRnJvbUhvc3QobV9kb2N1bWVudC50b3BEb2N1bWVudCgpLnNl
Y3VyaXR5T3JpZ2luKCkuaG9zdCgpKSwgKmZyYW1lLCBtX3N0b3JhZ2VBY2Nlc3NTY29wZSwgW3Ro
aXMsIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpLCBwcm9taXNlID0gV1RGTW92ZShwcm9t
aXNlKV0gKFJlcXVlc3RTdG9yYWdlQWNjZXNzUmVzdWx0IHJlc3VsdCkgbXV0YWJsZSB7CiAgICAg
ICAgIGlmICghd2Vha1RoaXMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1l
bnRTdG9yYWdlQWNjZXNzLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRTdG9yYWdlQWNj
ZXNzLmgKaW5kZXggMDY2Y2VjN2RmYzU0ZDdmMjc5OWZkNzEwZWFiMTYwYTExYTAxMzI4Yi4uZWMx
MDc5ZWRiMTI0NjZmZDk1NDVlNTI3NmUyZDJiNTVjNjM0Y2VmMiAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvZG9tL0RvY3VtZW50U3RvcmFnZUFjY2Vzcy5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl
L2RvbS9Eb2N1bWVudFN0b3JhZ2VBY2Nlc3MuaApAQCAtMTA5LDcgKzEwOSw3IEBAIHByaXZhdGU6
CiAKICAgICB1aW50OF90IG1fbnVtYmVyT2ZUaW1lc0V4cGxpY2l0bHlEZW5pZWRGcmFtZVNwZWNp
ZmljU3RvcmFnZUFjY2VzcyA9IDA7CiAKLSAgICBTdG9yYWdlQWNjZXNzU2NvcGUgbV9zdG9yYWdl
QWNjZXNzU2NvcGUgPSBTdG9yYWdlQWNjZXNzU2NvcGU6OlBlckZyYW1lOworICAgIFN0b3JhZ2VB
Y2Nlc3NTY29wZSBtX3N0b3JhZ2VBY2Nlc3NTY29wZSA9IFN0b3JhZ2VBY2Nlc3NTY29wZTo6UGVy
UGFnZTsKIH07CiAKIHRlbXBsYXRlPGNsYXNzIEVuY29kZXI+CmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViQ29yZS9wYWdlL1NldHRpbmdzLnlhbWwgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdz
LnlhbWwKaW5kZXggNzkwZGI0YjdlOTZmYTk2ZGY4OGZkNjc4Y2FlMGM3MmU1MjNhODE5OS4uMGUw
OWU1YjE3MWU2N2MwZDI1NDQ5Njc4ZmZhOTgwNDExM2Y2ZGE4YyAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvcGFnZS9TZXR0aW5ncy55YW1sCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0
dGluZ3MueWFtbApAQCAtNzA0LDcgKzcwNCw3IEBAIHN0b3JhZ2VBY2Nlc3NBUElFbmFibGVkOgog
ICBpbml0aWFsOiB0cnVlCiAKIHN0b3JhZ2VBY2Nlc3NBUElQZXJQYWdlU2NvcGVFbmFibGVkOgot
ICBpbml0aWFsOiBmYWxzZQorICBpbml0aWFsOiB0cnVlCiAKIHRpbWVXaXRob3V0TW91c2VNb3Zl
bWVudEJlZm9yZUhpZGluZ0NvbnRyb2xzOgogICB0eXBlOiBTZWNvbmRzCmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJL
aXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IGQ5OTQ2MzQ4NGQ0ODdkZjE5
NTA1MTFjM2IxNmM5NDZkODY3MGE3NDMuLjhiMmM3ZmE4ZmYzMWUxYzRjMWNkMDdiY2RiNjI2ZjE3
YzI4ZWE0MGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl
YlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu
Y3BwCkBAIC02ODEzLDYgKzY4MTMsMTEgQEAgdm9pZCBXZWJQYWdlOjpmcmFtZUJlY2FtZVJlbW90
ZShGcmFtZUlkZW50aWZpZXIgZnJhbWVJRCwgR2xvYmFsRnJhbWVJZGVudGlmaWVyJiYKICNpZiBF
TkFCTEUoUkVTT1VSQ0VfTE9BRF9TVEFUSVNUSUNTKQogdm9pZCBXZWJQYWdlOjpoYXNTdG9yYWdl
QWNjZXNzKFJlZ2lzdHJhYmxlRG9tYWluJiYgc3ViRnJhbWVEb21haW4sIFJlZ2lzdHJhYmxlRG9t
YWluJiYgdG9wRnJhbWVEb21haW4sIFdlYkZyYW1lJiBmcmFtZSwgQ29tcGxldGlvbkhhbmRsZXI8
dm9pZChib29sKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKKyAgICBpZiAoaGFzUGFnZUxldmVs
U3RvcmFnZUFjY2Vzcyh0b3BGcmFtZURvbWFpbiwgc3ViRnJhbWVEb21haW4pKSB7CisgICAgICAg
IGNvbXBsZXRpb25IYW5kbGVyKHRydWUpOworICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAg
V2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuZW5zdXJlTmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uKCku
Y29ubmVjdGlvbigpLnNlbmRXaXRoQXN5bmNSZXBseShNZXNzYWdlczo6TmV0d29ya0Nvbm5lY3Rp
b25Ub1dlYlByb2Nlc3M6Okhhc1N0b3JhZ2VBY2Nlc3MoV1RGTW92ZShzdWJGcmFtZURvbWFpbiks
IFdURk1vdmUodG9wRnJhbWVEb21haW4pLCBmcmFtZS5mcmFtZUlEKCksIG1faWRlbnRpZmllciks
IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKIH0KIApAQCAtNjg0NCw2ICs2ODQ5LDExIEBA
IGJvb2wgV2ViUGFnZTo6aGFzUGFnZUxldmVsU3RvcmFnZUFjY2Vzcyhjb25zdCBSZWdpc3RyYWJs
ZURvbWFpbiYgdG9wTGV2ZWxEb21haW4sCiAgICAgcmV0dXJuIGl0ICE9IG1fZG9tYWluc1dpdGhQ
YWdlTGV2ZWxTdG9yYWdlQWNjZXNzLmVuZCgpICYmIGl0LT52YWx1ZSA9PSByZXNvdXJjZURvbWFp
bjsKIH0KIAordm9pZCBXZWJQYWdlOjpjbGVhclBhZ2VMZXZlbFN0b3JhZ2VBY2Nlc3MoKQorewor
ICAgIG1fZG9tYWluc1dpdGhQYWdlTGV2ZWxTdG9yYWdlQWNjZXNzLmNsZWFyKCk7Cit9CisKIHZv
aWQgV2ViUGFnZTo6d2FzTG9hZGVkV2l0aERhdGFUcmFuc2ZlckZyb21QcmV2YWxlbnRSZXNvdXJj
ZSgpCiB7CiAgICAgYXV0byogZnJhbWUgPSBtYWluRnJhbWUoKTsKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQvV2Vi
UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCBmOTEwNjZkN2JiYThhODZhNDAxZTQ5MjAx
YzljM2UzZWI1NzRmMTMxLi4yYTQ2Mzc0ZjY3NzY0MGUwZWU0NzI0ZDZlNzNhOTUwNzMzMDhiOWUw
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgK
KysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCkBAIC0xMjIx
LDYgKzEyMjEsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCByZXF1ZXN0U3RvcmFnZUFjY2VzcyhXZWJD
b3JlOjpSZWdpc3RyYWJsZURvbWFpbiYmIHN1YkZyYW1lRG9tYWluLCBXZWJDb3JlOjpSZWdpc3Ry
YWJsZURvbWFpbiYmIHRvcEZyYW1lRG9tYWluLCBXZWJGcmFtZSYsIFdlYkNvcmU6OlN0b3JhZ2VB
Y2Nlc3NTY29wZSwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChXZWJDb3JlOjpSZXF1ZXN0U3RvcmFn
ZUFjY2Vzc1Jlc3VsdCk+JiYpOwogICAgIGJvb2wgaGFzUGFnZUxldmVsU3RvcmFnZUFjY2Vzcyhj
b25zdCBXZWJDb3JlOjpSZWdpc3RyYWJsZURvbWFpbiYgdG9wTGV2ZWxEb21haW4sIGNvbnN0IFdl
YkNvcmU6OlJlZ2lzdHJhYmxlRG9tYWluJiByZXNvdXJjZURvbWFpbikgY29uc3Q7CiAgICAgdm9p
ZCBhZGREb21haW5XaXRoUGFnZUxldmVsU3RvcmFnZUFjY2Vzcyhjb25zdCBXZWJDb3JlOjpSZWdp
c3RyYWJsZURvbWFpbiYgdG9wTGV2ZWxEb21haW4sIGNvbnN0IFdlYkNvcmU6OlJlZ2lzdHJhYmxl
RG9tYWluJiByZXNvdXJjZURvbWFpbik7CisgICAgdm9pZCBjbGVhclBhZ2VMZXZlbFN0b3JhZ2VB
Y2Nlc3MoKTsKICAgICB2b2lkIHdhc0xvYWRlZFdpdGhEYXRhVHJhbnNmZXJGcm9tUHJldmFsZW50
UmVzb3VyY2UoKTsKICAgICB2b2lkIGRpZExvYWRGcm9tUmVnaXN0cmFibGVEb21haW4oV2ViQ29y
ZTo6UmVnaXN0cmFibGVEb21haW4mJik7CiAgICAgdm9pZCBjbGVhckxvYWRlZFN1YnJlc291cmNl
RG9tYWlucygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nl
c3MuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCmluZGV4IDc3
ZThmYjZkMmZjZTJlZjViYTg0ZjY2ZjkyNmNjNTNiNWUwMjljYzcuLjYxMGQzNzc5MDhjYjUwYTBh
MjI5NDExNWRmMDM5ZTBiZTk2NGEzOWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv
Y2Vzcy9XZWJQcm9jZXNzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJv
Y2Vzcy5jcHAKQEAgLTE1OTYsNiArMTU5Niw4IEBAIHZvaWQgV2ViUHJvY2Vzczo6Y2xlYXJSZXNv
dXJjZUxvYWRTdGF0aXN0aWNzKCkKICNpZiBFTkFCTEUoUkVTT1VSQ0VfTE9BRF9TVEFUSVNUSUNT
KQogICAgIGlmIChhdXRvKiBvYnNlcnZlciA9IFJlc291cmNlTG9hZE9ic2VydmVyOjpzaGFyZWRJ
ZkV4aXN0cygpKQogICAgICAgICBvYnNlcnZlci0+Y2xlYXJTdGF0ZSgpOworICAgIGZvciAoYXV0
byYgcGFnZSA6IG1fcGFnZU1hcC52YWx1ZXMoKSkKKyAgICAgICAgcGFnZS0+Y2xlYXJQYWdlTGV2
ZWxTdG9yYWdlQWNjZXNzKCk7CiAjZW5kaWYKIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv
Q2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDMwMzRkNzBiMDk3ZThhMWQ5
NTdiMWMwMDY3YWQwN2IzMDNkNjAwOWEuLjk2M2I2MmNhMGVjYTZiM2U3NzU5M2YzYmZhZDBlM2Uz
MTZlMjQ2MGQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRU
ZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAyMC0xMC0wNCAgSm9obiBXaWxhbmRl
ciAgPHdpbGFuZGVyQGFwcGxlLmNvbT4KKworICAgICAgICBTdG9yYWdlIEFjY2VzcyBBUEk6IEVu
YWJsZSBwZXItcGFnZSBzdG9yYWdlIGFjY2VzcyBzY29wZSBhbmQgYWxpZ24gdGVzdCBjYXNlcwor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE3MDc3Cisg
ICAgICAgIDxyZGFyOi8vcHJvYmxlbS82OTAxNzg3OD4KKworICAgICAgICBSZXZpZXdlZCBieSBC
cmVudCBGdWxnaGFtLgorCisgICAgICAgIEl0IHdhcyBkZWNpZGVkIGluIGh0dHBzOi8vZ2l0aHVi
LmNvbS9wcml2YWN5Y2cvc3RvcmFnZS1hY2Nlc3MvaXNzdWVzLzMgdGhhdAorICAgICAgICBicm93
c2VycyBzaG91bGQgZ3JhbnQgc3RvcmFnZSBhY2Nlc3MgZm9yIGFsbCBzYW1lLXNpdGUgcmVzb3Vy
Y2VzIG9uIHRoZSB3aG9sZQorICAgICAgICBwYWdlLCBub3QganVzdCB0aGUgcmVxdWVzdGluZyBp
ZnJhbWUuCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQt
Z3JhbnQtYWNjZXNzLWNyb3NzLW9yaWdpbi1zYW5kYm94ZWQtaWZyYW1lLWZyb20tcHJldmFsZW50
LWRvbWFpbi13aXRoLXVzZXItaW50ZXJhY3Rpb24tYW5kLWFjY2Vzcy1mcm9tLXJpZ2h0LWZyYW1l
Lmh0bWw6CisgICAgICAgICogaHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdy
YW50LWFjY2Vzcy1jcm9zcy1vcmlnaW4tc2FuZGJveGVkLWlmcmFtZS1mcm9tLXByZXZhbGVudC1k
b21haW4td2l0aC11c2VyLWludGVyYWN0aW9uLWJ1dC1hY2Nlc3MtZnJvbS13cm9uZy1mcmFtZS5o
dG1sOgorICAgICAgICAqIGh0dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFu
dC1hY2Nlc3MtdGhlbi1kZXRhY2gtc2hvdWxkLW5vdC1oYXZlLWFjY2Vzcy5odG1sOgorICAgICAg
ICAqIGh0dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3MtdGhl
bi1uYXZpZ2F0ZS1jcm9zcy1zaXRlLXNob3VsZC1ub3QtaGF2ZS1hY2Nlc3MuaHRtbDoKKyAgICAg
ICAgICAgIEFsbCBvZiB0aGUgYWJvdmUgbm93IGV4cGxpY2l0bHkgY2FsbAorICAgICAgICAgICAg
aW50ZXJuYWxzLnNldHRpbmdzLnNldFN0b3JhZ2VBY2Nlc3NBUElQZXJQYWdlU2NvcGVFbmFibGVk
KGZhbHNlKQorICAgICAgICAgICAgdG8gb3B0IG91dCBvZiB0aGUgbmV3IGRlZmF1bHQgc2V0dGlu
Zy4KKyAgICAgICAgKiBodHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQt
YWNjZXNzLXdpdGgtcGVyLXBhZ2Utc2NvcGUtYWNjZXNzLWZyb20tYW5vdGhlci1mcmFtZS5odG1s
OgorICAgICAgICAgICAgQ2hhbmdlZCB0byBhc3N1bWUgcGVyLXBhZ2UgaXMgdGhlIGRlZmF1bHQu
CisKIDIwMjAtMTAtMDQgIFR5bGVyIFdpbGNvY2sgIDx0d2lsY28ub0Bwcm90b25tYWlsLmNvbT4K
IAogICAgICAgICBQcmVzZW5jZSBvZiBDU1MgdmFyaWFibGUgY2F1c2VzIGEgYmFja2dyb3VuZCB1
cmwoKSB0byBnZXQgcmVzb2x2ZWQgd2l0aCBhIGRpZmZlcmVudCBiYXNlCmRpZmYgLS1naXQgYS9M
YXlvdXRUZXN0cy9odHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNj
ZXNzLWNyb3NzLW9yaWdpbi1zYW5kYm94ZWQtaWZyYW1lLWZyb20tcHJldmFsZW50LWRvbWFpbi13
aXRoLXVzZXItaW50ZXJhY3Rpb24tYW5kLWFjY2Vzcy1mcm9tLXJpZ2h0LWZyYW1lLmh0bWwgYi9M
YXlvdXRUZXN0cy9odHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNj
ZXNzLWNyb3NzLW9yaWdpbi1zYW5kYm94ZWQtaWZyYW1lLWZyb20tcHJldmFsZW50LWRvbWFpbi13
aXRoLXVzZXItaW50ZXJhY3Rpb24tYW5kLWFjY2Vzcy1mcm9tLXJpZ2h0LWZyYW1lLmh0bWwKaW5k
ZXggN2UyYjRkNDAzMmUxMDJhYzU5NjQxYTNiN2QyMWZhYjI3OTYyNTkyNy4uMTUyYzkzZWRjZTYz
ZTU4MmZmZDE5ODJhMzg3NmZlYzA1MTczNWRhMSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0
cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy1jcm9zcy1vcmln
aW4tc2FuZGJveGVkLWlmcmFtZS1mcm9tLXByZXZhbGVudC1kb21haW4td2l0aC11c2VyLWludGVy
YWN0aW9uLWFuZC1hY2Nlc3MtZnJvbS1yaWdodC1mcmFtZS5odG1sCisrKyBiL0xheW91dFRlc3Rz
L2h0dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3MtY3Jvc3Mt
b3JpZ2luLXNhbmRib3hlZC1pZnJhbWUtZnJvbS1wcmV2YWxlbnQtZG9tYWluLXdpdGgtdXNlci1p
bnRlcmFjdGlvbi1hbmQtYWNjZXNzLWZyb20tcmlnaHQtZnJhbWUuaHRtbApAQCAtMTA1LDYgKzEw
NSw4IEBACiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgIGNhc2Ug
IiNzdGVwNiI6CiAgICAgICAgICAgICAgICAgICAgIGRvY3VtZW50LmxvY2F0aW9uLmhhc2ggPSAi
c3RlcDciOworICAgICAgICAgICAgICAgICAgICAvLyBTZXQgcGVyLWZyYW1lIGFjY2VzcyBzaW5j
ZSBjbGVhcmluZyBhY2Nlc3Mgb24gY3Jvc3Mtc2l0ZSBuYXZpZ2F0aW9uIG9mIHRoZSBpZnJhbWUg
cmVxdWlyZXMgcGVyLWZyYW1lIGFjY2Vzcy4KKyAgICAgICAgICAgICAgICAgICAgaW50ZXJuYWxz
LnNldHRpbmdzLnNldFN0b3JhZ2VBY2Nlc3NBUElQZXJQYWdlU2NvcGVFbmFibGVkKGZhbHNlKTsK
ICAgICAgICAgICAgICAgICAgICAgLy8gQ3JlYXRlIGlmcmFtZSB0aGF0IHdpbGwgcmVxdWVzdCBz
dG9yYWdlIGFjY2Vzcy4KICAgICAgICAgICAgICAgICAgICAgbGV0IGlmcmFtZUVsZW1lbnQgPSBk
b2N1bWVudC5jcmVhdGVFbGVtZW50KCJpZnJhbWUiKTsKICAgICAgICAgICAgICAgICAgICAgaWZy
YW1lRWxlbWVudC5zZXRBdHRyaWJ1dGUoInNhbmRib3giLCAiYWxsb3ctc3RvcmFnZS1hY2Nlc3Mt
YnktdXNlci1hY3RpdmF0aW9uIGFsbG93LXNjcmlwdHMgYWxsb3ctc2FtZS1vcmlnaW4gYWxsb3ct
bW9kYWxzIik7CkBAIC0xNDMsNiArMTQ1LDggQEAKICAgICAgICAgICAgICAgICAgICAgZXhpc3Rp
bmdJZnJhbWUzLnNyYyA9IHRoaXJkUGFydHlCYXNlVXJsICsgc3ViUGF0aFRvR2V0Q29va2llcyAr
ICImbWVzc2FnZT1BZnRlciB0aGUgdG9wIGZyYW1lIG5hdmlnYXRlcyB0aGUgc3ViIGZyYW1lIGNy
b3NzLXNpdGUgYW5kIGJhY2ssIHRoZSBzdWIgZnJhbWUgc2hvdWxkIG5vIGxvbmdlciBoYXZlIGFj
Y2VzcyB0byBjb29raWVzLiI7CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAg
ICAgICAgIGNhc2UgIiNzdGVwMTAiOgorICAgICAgICAgICAgICAgICAgICAvLyBSZXNldCBhY2Nl
c3Mgc2NvcGUuCisgICAgICAgICAgICAgICAgICAgIGludGVybmFscy5zZXR0aW5ncy5zZXRTdG9y
YWdlQWNjZXNzQVBJUGVyUGFnZVNjb3BlRW5hYmxlZCh0cnVlKTsKICAgICAgICAgICAgICAgICAg
ICAgc2V0RW5hYmxlRmVhdHVyZShmYWxzZSwgZmluaXNoSlNUZXN0KTsKICAgICAgICAgICAgICAg
ICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRw
L3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNzLWNyb3NzLW9yaWdp
bi1zYW5kYm94ZWQtaWZyYW1lLWZyb20tcHJldmFsZW50LWRvbWFpbi13aXRoLXVzZXItaW50ZXJh
Y3Rpb24tYnV0LWFjY2Vzcy1mcm9tLXdyb25nLWZyYW1lLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRw
L3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNzLWNyb3NzLW9yaWdp
bi1zYW5kYm94ZWQtaWZyYW1lLWZyb20tcHJldmFsZW50LWRvbWFpbi13aXRoLXVzZXItaW50ZXJh
Y3Rpb24tYnV0LWFjY2Vzcy1mcm9tLXdyb25nLWZyYW1lLmh0bWwKaW5kZXggMzc5ZDk4YjViY2Uy
MzkzNjA5YmRlODhhNjBhNDA2ODk3ZmVlMjE1My4uOWQ2NTJmOGM3MGM5MWU0OTQ4ZWUxODk2MGNm
N2JjZWFhZmYwNmE5OCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zdG9yYWdl
QWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy1jcm9zcy1vcmlnaW4tc2FuZGJveGVkLWlm
cmFtZS1mcm9tLXByZXZhbGVudC1kb21haW4td2l0aC11c2VyLWludGVyYWN0aW9uLWJ1dC1hY2Nl
c3MtZnJvbS13cm9uZy1mcmFtZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc3Rv
cmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3MtY3Jvc3Mtb3JpZ2luLXNhbmRib3hl
ZC1pZnJhbWUtZnJvbS1wcmV2YWxlbnQtZG9tYWluLXdpdGgtdXNlci1pbnRlcmFjdGlvbi1idXQt
YWNjZXNzLWZyb20td3JvbmctZnJhbWUuaHRtbApAQCAtMTA1LDYgKzEwNSw4IEBACiAgICAgICAg
ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgIGNhc2UgIiNzdGVwNiI6CiAgICAg
ICAgICAgICAgICAgICAgIGRvY3VtZW50LmxvY2F0aW9uLmhhc2ggPSAic3RlcDciOworICAgICAg
ICAgICAgICAgICAgICAvLyBTZXQgcGVyLWZyYW1lIGFjY2VzcyBzaW5jZSBvdGhlcndpc2UgdGhl
IHNpYmxpbmcgaWZyYW1lIHdpbGwgZ2V0IGFjY2Vzcy4KKyAgICAgICAgICAgICAgICAgICAgaW50
ZXJuYWxzLnNldHRpbmdzLnNldFN0b3JhZ2VBY2Nlc3NBUElQZXJQYWdlU2NvcGVFbmFibGVkKGZh
bHNlKTsKICAgICAgICAgICAgICAgICAgICAgbGV0IGlmcmFtZUVsZW1lbnQgPSBkb2N1bWVudC5j
cmVhdGVFbGVtZW50KCJpZnJhbWUiKTsKICAgICAgICAgICAgICAgICAgICAgaWZyYW1lRWxlbWVu
dC5zZXRBdHRyaWJ1dGUoInNhbmRib3giLCAiYWxsb3ctc3RvcmFnZS1hY2Nlc3MtYnktdXNlci1h
Y3RpdmF0aW9uIGFsbG93LXNjcmlwdHMgYWxsb3ctc2FtZS1vcmlnaW4gYWxsb3ctbW9kYWxzIik7
CiAgICAgICAgICAgICAgICAgICAgIGlmcmFtZUVsZW1lbnQub25sb2FkID0gZnVuY3Rpb24oKSB7
CkBAIC0xMjIsNiArMTI0LDggQEAKICAgICAgICAgICAgICAgICAgICAgb3BlbklmcmFtZSh0aGly
ZFBhcnR5QmFzZVVybCArIHN1YlBhdGhUb0dldENvb2tpZXMgKyAiJm1lc3NhZ2U9U2hvdWxkIG5v
dCByZWNlaXZlIGNvb2tpZXMuIiwgcnVuVGVzdCk7CiAgICAgICAgICAgICAgICAgICAgIGJyZWFr
OwogICAgICAgICAgICAgICAgIGNhc2UgIiNzdGVwOCI6CisgICAgICAgICAgICAgICAgICAgIC8v
IFJlc2V0IGFjY2VzcyBzY29wZS4KKyAgICAgICAgICAgICAgICAgICAgaW50ZXJuYWxzLnNldHRp
bmdzLnNldFN0b3JhZ2VBY2Nlc3NBUElQZXJQYWdlU2NvcGVFbmFibGVkKHRydWUpOwogICAgICAg
ICAgICAgICAgICAgICBzZXRFbmFibGVGZWF0dXJlKGZhbHNlLCBmaW5pc2hKU1Rlc3QpOwogICAg
ICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL0xheW91
dFRlc3RzL2h0dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3Mt
dGhlbi1kZXRhY2gtc2hvdWxkLW5vdC1oYXZlLWFjY2Vzcy5odG1sIGIvTGF5b3V0VGVzdHMvaHR0
cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy10aGVuLWRldGFj
aC1zaG91bGQtbm90LWhhdmUtYWNjZXNzLmh0bWwKaW5kZXggODQ1NGZjNDhmZTVhM2VmOGMxYWIx
YzhiMzdmM2M2OTA4YzA2YmYzYS4uMjYzN2U0NmI2YzgwMmU2ZDdlYTVhZjNkY2E5ZTUyM2ZkNDI0
OTk2YyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3Jl
cXVlc3QtYW5kLWdyYW50LWFjY2Vzcy10aGVuLWRldGFjaC1zaG91bGQtbm90LWhhdmUtYWNjZXNz
Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3Qt
YW5kLWdyYW50LWFjY2Vzcy10aGVuLWRldGFjaC1zaG91bGQtbm90LWhhdmUtYWNjZXNzLmh0bWwK
QEAgLTExLDYgKzExLDggQEAKICAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoIm1lc3Nh
Z2UiLCByZWNlaXZlTWVzc2FnZSwgZmFsc2UpOwogCiAgICAgICAgIGZ1bmN0aW9uIGZpbmlzaFRl
c3QoKSB7CisgICAgICAgICAgICAvLyBSZXNldCBhY2Nlc3Mgc2NvcGUuCisgICAgICAgICAgICBp
bnRlcm5hbHMuc2V0dGluZ3Muc2V0U3RvcmFnZUFjY2Vzc0FQSVBlclBhZ2VTY29wZUVuYWJsZWQo
dHJ1ZSk7CiAgICAgICAgICAgICBzZXRFbmFibGVGZWF0dXJlKGZhbHNlLCBmaW5pc2hKU1Rlc3Qp
OwogICAgICAgICB9CiAKQEAgLTkzLDYgKzk1LDkgQEAKICAgICAgICAgICAgICAgICBkb2N1bWVu
dC5sb2NhdGlvbi5ocmVmID0gc3RhdGlzdGljc1VybCArICIvc3RvcmFnZUFjY2Vzcy9yZXNvdXJj
ZXMvc2V0LWNvb2tpZS5waHA/bmFtZT1maXJzdFBhcnR5Q29va2llJnZhbHVlPXZhbHVlI2h0dHA6
Ly8xMjcuMC4wLjE6ODAwMC9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy10
aGVuLWRldGFjaC1zaG91bGQtbm90LWhhdmUtYWNjZXNzLmh0bWwjZmlyc3RQYXJ0eUNvb2tpZVNl
dCI7CiAgICAgICAgICAgICB9KTsKICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIC8vIFNl
dCBwZXItZnJhbWUgYWNjZXNzIHNpbmNlIGNsZWFyaW5nIGFjY2VzcyBvbiBkZXRhY2hpbmcgdGhl
IGlmcmFtZSByZXF1aXJlcyBwZXItZnJhbWUgYWNjZXNzLgorICAgICAgICAgICAgaW50ZXJuYWxz
LnNldHRpbmdzLnNldFN0b3JhZ2VBY2Nlc3NBUElQZXJQYWdlU2NvcGVFbmFibGVkKGZhbHNlKTsK
KwogICAgICAgICAgICAgdGVzdFJ1bm5lci5zZXRTdGF0aXN0aWNzUHJldmFsZW50UmVzb3VyY2Uo
c3RhdGlzdGljc1VybCwgdHJ1ZSwgZnVuY3Rpb24oKSB7CiAgICAgICAgICAgICAgICAgaWYgKCF0
ZXN0UnVubmVyLmlzU3RhdGlzdGljc1ByZXZhbGVudFJlc291cmNlKHN0YXRpc3RpY3NVcmwpKQog
ICAgICAgICAgICAgICAgICAgICB0ZXN0RmFpbGVkKCJIb3N0IGRpZCBub3QgZ2V0IHNldCBhcyBw
cmV2YWxlbnQgcmVzb3VyY2UuIik7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3Rz
L3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNzLXRoZW4tbmF2aWdhdGUtY3Jv
c3Mtc2l0ZS1zaG91bGQtbm90LWhhdmUtYWNjZXNzLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rl
c3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNzLXRoZW4tbmF2aWdhdGUt
Y3Jvc3Mtc2l0ZS1zaG91bGQtbm90LWhhdmUtYWNjZXNzLmh0bWwKaW5kZXggNTU1ZDBlMzFjOWNh
MGEzZDE3OGY0YTNmOTc2OGRjNDgxZTliMjE4Zi4uZDU2NjU0MmM4MzRhZjI0ZTA2ZjhmNmJkMDNj
ZjcyZGQxZmJkYjY0ZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zdG9yYWdl
QWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy10aGVuLW5hdmlnYXRlLWNyb3NzLXNpdGUt
c2hvdWxkLW5vdC1oYXZlLWFjY2Vzcy5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMv
c3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3MtdGhlbi1uYXZpZ2F0ZS1jcm9z
cy1zaXRlLXNob3VsZC1ub3QtaGF2ZS1hY2Nlc3MuaHRtbApAQCAtMTMsNiArMTMsOCBAQAogICAg
ICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcigibWVzc2FnZSIsIHJlY2VpdmVNZXNzYWdlLCBm
YWxzZSk7CiAKICAgICAgICAgZnVuY3Rpb24gZmluaXNoVGVzdCgpIHsKKyAgICAgICAgICAgIC8v
IFJlc2V0IGFjY2VzcyBzY29wZS4KKyAgICAgICAgICAgIGludGVybmFscy5zZXR0aW5ncy5zZXRT
dG9yYWdlQWNjZXNzQVBJUGVyUGFnZVNjb3BlRW5hYmxlZCh0cnVlKTsKICAgICAgICAgICAgIHNl
dEVuYWJsZUZlYXR1cmUoZmFsc2UsIGZpbmlzaEpTVGVzdCk7CiAgICAgICAgIH0KIApAQCAtNjgs
NiArNzAsOCBAQAogICAgICAgICAgICAgICAgIGRvY3VtZW50LmxvY2F0aW9uLmhyZWYgPSBzdGF0
aXN0aWNzVXJsICsgIi9zdG9yYWdlQWNjZXNzL3Jlc291cmNlcy9zZXQtY29va2llLnBocD9uYW1l
PWZpcnN0UGFydHlDb29raWUmdmFsdWU9dmFsdWUjaHR0cDovLzEyNy4wLjAuMTo4MDAwL3N0b3Jh
Z2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNzLXRoZW4tbmF2aWdhdGUtY3Jvc3Mtc2l0
ZS1zaG91bGQtbm90LWhhdmUtYWNjZXNzLmh0bWwjZmlyc3RQYXJ0eUNvb2tpZVNldCI7CiAgICAg
ICAgICAgICB9KTsKICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIC8vIFNldCBwZXItZnJh
bWUgYWNjZXNzIHNpbmNlIGNsZWFyaW5nIGFjY2VzcyBvbiBjcm9zcy1zaXRlIG5hdmlnYXRpb24g
b2YgdGhlIGlmcmFtZSByZXF1aXJlcyBwZXItZnJhbWUgYWNjZXNzLgorICAgICAgICAgICAgaW50
ZXJuYWxzLnNldHRpbmdzLnNldFN0b3JhZ2VBY2Nlc3NBUElQZXJQYWdlU2NvcGVFbmFibGVkKGZh
bHNlKTsKICAgICAgICAgICAgIHRlc3RSdW5uZXIuc2V0U3RhdGlzdGljc1ByZXZhbGVudFJlc291
cmNlKHN0YXRpc3RpY3NVcmwsIHRydWUsIGZ1bmN0aW9uKCkgewogICAgICAgICAgICAgICAgIGlm
ICghdGVzdFJ1bm5lci5pc1N0YXRpc3RpY3NQcmV2YWxlbnRSZXNvdXJjZShzdGF0aXN0aWNzVXJs
KSkKICAgICAgICAgICAgICAgICAgICAgdGVzdEZhaWxlZCgiSG9zdCBkaWQgbm90IGdldCBzZXQg
YXMgcHJldmFsZW50IHJlc291cmNlLiIpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90
ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy13aXRoLXBlci1wYWdl
LXNjb3BlLWFjY2Vzcy1mcm9tLWFub3RoZXItZnJhbWUuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAv
dGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFuZC1ncmFudC1hY2Nlc3Mtd2l0aC1wZXItcGFn
ZS1zY29wZS1hY2Nlc3MtZnJvbS1hbm90aGVyLWZyYW1lLmh0bWwKaW5kZXggMmU4NTU3ZTViZGRh
ZGVkMGYyYjFjMmM0Y2E2NGY5MzIwZTRmODY3MC4uYjY5ZDVkNzgwYTRkMTNkZGRjNDg2NGY4ZjAy
ZDhjOTk1MDVkNTRmNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zdG9yYWdl
QWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy13aXRoLXBlci1wYWdlLXNjb3BlLWFjY2Vz
cy1mcm9tLWFub3RoZXItZnJhbWUuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3N0
b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNzLXdpdGgtcGVyLXBhZ2Utc2NvcGUt
YWNjZXNzLWZyb20tYW5vdGhlci1mcmFtZS5odG1sCkBAIC04Myw3ICs4Myw2IEBACiAgICAgICAg
ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgIGNhc2UgIiNzdGVwNCI6CiAgICAg
ICAgICAgICAgICAgICAgIGRvY3VtZW50LmxvY2F0aW9uLmhhc2ggPSAic3RlcDUiOwotICAgICAg
ICAgICAgICAgICAgICBpbnRlcm5hbHMuc2V0dGluZ3Muc2V0U3RvcmFnZUFjY2Vzc0FQSVBlclBh
Z2VTY29wZUVuYWJsZWQodHJ1ZSk7CiAgICAgICAgICAgICAgICAgICAgIGxldCBpZnJhbWVFbGVt
ZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaWZyYW1lIik7CiAgICAgICAgICAgICAgICAg
ICAgIGlmcmFtZUVsZW1lbnQub25sb2FkID0gZnVuY3Rpb24oKSB7CiAgICAgICAgICAgICAgICAg
ICAgICAgICBhY3RpdmF0ZUVsZW1lbnQoIlRoZUlmcmFtZVRoYXRSZXF1ZXN0c1N0b3JhZ2VBY2Nl
c3MiKTsKQEAgLTk5LDcgKzk4LDYgQEAKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAg
ICAgICAgICAgICAgY2FzZSAiI3N0ZXA2IjoKICAgICAgICAgICAgICAgICAgICAgdGVzdFJ1bm5l
ci5zZXRTdGF0aXN0aWNzU2hvdWxkQmxvY2tUaGlyZFBhcnR5Q29va2llcyhmYWxzZSwgZnVuY3Rp
b24oKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBpbnRlcm5hbHMuc2V0dGluZ3Muc2V0U3Rv
cmFnZUFjY2Vzc0FQSVBlclBhZ2VTY29wZUVuYWJsZWQoZmFsc2UpOwogICAgICAgICAgICAgICAg
ICAgICAgICAgc2V0RW5hYmxlRmVhdHVyZShmYWxzZSwgZmluaXNoSlNUZXN0KTsKICAgICAgICAg
ICAgICAgICAgICAgfSk7CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwo=
</data>

          </attachment>
      

    </bug>

</bugzilla>