<?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>222357</bug_id>
          
          <creation_ts>2021-02-24 07:31:45 -0800</creation_ts>
          <short_desc>Fix flex-aspect-ratio-025+26.html</short_desc>
          <delta_ts>2022-08-26 07:06:27 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>CSS</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>CONFIGURATION CHANGED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          <blocked>47738</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Rob Buis">rbuis</reporter>
          <assigned_to name="Rob Buis">rbuis</assigned_to>
          <cc>changseok</cc>
    
    <cc>clopez</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>glenn</cc>
    
    <cc>kondapallykalyan</cc>
    
    <cc>pdr</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>youennf</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1732866</commentid>
    <comment_count>0</comment_count>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-24 07:31:45 -0800</bug_when>
    <thetext>Fix flex-aspect-ratio-025.html</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1732867</commentid>
    <comment_count>1</comment_count>
      <attachid>421407</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-24 07:34:58 -0800</bug_when>
    <thetext>Created attachment 421407
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1733766</commentid>
    <comment_count>2</comment_count>
      <attachid>421649</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-26 08:11:56 -0800</bug_when>
    <thetext>Created attachment 421649
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1734277</commentid>
    <comment_count>3</comment_count>
      <attachid>421775</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-28 02:40:42 -0800</bug_when>
    <thetext>Created attachment 421775
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1734282</commentid>
    <comment_count>4</comment_count>
      <attachid>421776</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-28 07:30:20 -0800</bug_when>
    <thetext>Created attachment 421776
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1734283</commentid>
    <comment_count>5</comment_count>
    <who name="EWS Watchlist">ews-watchlist</who>
    <bug_when>2021-02-28 07:31:16 -0800</bug_when>
    <thetext>This patch modifies the imported WPT tests. Please ensure that any changes on the tests (not coming from a WPT import) are exported to WPT. Please see https://trac.webkit.org/wiki/WPTExportProcess</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1734784</commentid>
    <comment_count>6</comment_count>
      <attachid>421915</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-02 01:43:42 -0800</bug_when>
    <thetext>Created attachment 421915
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1735225</commentid>
    <comment_count>7</comment_count>
      <attachid>422056</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-03 03:35:59 -0800</bug_when>
    <thetext>Created attachment 422056
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1735252</commentid>
    <comment_count>8</comment_count>
      <attachid>422071</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-03 05:40:30 -0800</bug_when>
    <thetext>Created attachment 422071
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1735265</commentid>
    <comment_count>9</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-03-03 07:32:13 -0800</bug_when>
    <thetext>&lt;rdar://problem/74983822&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1735281</commentid>
    <comment_count>10</comment_count>
      <attachid>422085</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-03 08:05:05 -0800</bug_when>
    <thetext>Created attachment 422085
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1735755</commentid>
    <comment_count>11</comment_count>
      <attachid>422206</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-04 02:01:52 -0800</bug_when>
    <thetext>Created attachment 422206
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1736377</commentid>
    <comment_count>12</comment_count>
      <attachid>422374</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-05 09:28:51 -0800</bug_when>
    <thetext>Created attachment 422374
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1736773</commentid>
    <comment_count>13</comment_count>
      <attachid>422484</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-06 03:41:35 -0800</bug_when>
    <thetext>Created attachment 422484
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1736778</commentid>
    <comment_count>14</comment_count>
      <attachid>422485</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-06 05:15:48 -0800</bug_when>
    <thetext>Created attachment 422485
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1736797</commentid>
    <comment_count>15</comment_count>
      <attachid>422492</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-06 06:52:06 -0800</bug_when>
    <thetext>Created attachment 422492
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1736806</commentid>
    <comment_count>16</comment_count>
      <attachid>422494</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-06 08:33:17 -0800</bug_when>
    <thetext>Created attachment 422494
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1736824</commentid>
    <comment_count>17</comment_count>
      <attachid>422500</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-06 11:24:49 -0800</bug_when>
    <thetext>Created attachment 422500
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1736912</commentid>
    <comment_count>18</comment_count>
      <attachid>422522</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-07 01:12:30 -0800</bug_when>
    <thetext>Created attachment 422522
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1736913</commentid>
    <comment_count>19</comment_count>
      <attachid>422523</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-07 02:38:37 -0800</bug_when>
    <thetext>Created attachment 422523
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1736918</commentid>
    <comment_count>20</comment_count>
      <attachid>422525</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-07 05:16:08 -0800</bug_when>
    <thetext>Created attachment 422525
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1737050</commentid>
    <comment_count>21</comment_count>
      <attachid>422560</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-08 06:34:44 -0800</bug_when>
    <thetext>Created attachment 422560
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1737984</commentid>
    <comment_count>22</comment_count>
      <attachid>422809</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-10 01:38:55 -0800</bug_when>
    <thetext>Created attachment 422809
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1737992</commentid>
    <comment_count>23</comment_count>
      <attachid>422811</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-10 03:00:09 -0800</bug_when>
    <thetext>Created attachment 422811
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1762336</commentid>
    <comment_count>24</comment_count>
      <attachid>429277</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-05-21 02:27:42 -0700</bug_when>
    <thetext>Created attachment 429277
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1762362</commentid>
    <comment_count>25</comment_count>
      <attachid>429282</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-05-21 04:13:11 -0700</bug_when>
    <thetext>Created attachment 429282
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1762477</commentid>
    <comment_count>26</comment_count>
      <attachid>429309</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-05-21 10:40:50 -0700</bug_when>
    <thetext>Created attachment 429309
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1764319</commentid>
    <comment_count>27</comment_count>
      <attachid>429875</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-05-27 07:01:05 -0700</bug_when>
    <thetext>Created attachment 429875
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1766377</commentid>
    <comment_count>28</comment_count>
      <attachid>430467</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-06-03 07:08:58 -0700</bug_when>
    <thetext>Created attachment 430467
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1770186</commentid>
    <comment_count>29</comment_count>
      <attachid>431546</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-06-16 08:03:14 -0700</bug_when>
    <thetext>Created attachment 431546
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1772707</commentid>
    <comment_count>30</comment_count>
      <attachid>432280</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-06-25 09:22:09 -0700</bug_when>
    <thetext>Created attachment 432280
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1773405</commentid>
    <comment_count>31</comment_count>
      <attachid>432480</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-06-29 07:30:01 -0700</bug_when>
    <thetext>Created attachment 432480
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1773695</commentid>
    <comment_count>32</comment_count>
      <attachid>432574</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-06-30 01:36:41 -0700</bug_when>
    <thetext>Created attachment 432574
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1773758</commentid>
    <comment_count>33</comment_count>
      <attachid>432596</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-06-30 08:31:34 -0700</bug_when>
    <thetext>Created attachment 432596
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1777855</commentid>
    <comment_count>34</comment_count>
      <attachid>433785</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-07-19 06:04:39 -0700</bug_when>
    <thetext>Created attachment 433785
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1790873</commentid>
    <comment_count>35</comment_count>
      <attachid>437454</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-09-06 23:37:05 -0700</bug_when>
    <thetext>Created attachment 437454
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1791451</commentid>
    <comment_count>36</comment_count>
      <attachid>437625</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-09-08 07:09:22 -0700</bug_when>
    <thetext>Created attachment 437625
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1893961</commentid>
    <comment_count>37</comment_count>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-08-26 07:06:27 -0700</bug_when>
    <thetext>This is being fixed in other bugs such as bug 243887.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>421407</attachid>
            <date>2021-02-24 07:34:58 -0800</date>
            <delta_ts>2021-02-26 08:11:52 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210224163457.patch</filename>
            <type>text/plain</type>
            <size>4474</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczMzczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjFhZWE2NTNlMTk5ZGEx
ZGFlZTE2ZDFkMDEzZWY3ZDQ3NmNiZWU1My4uMGVmOTBjNDZmYTUxNTQ4MjI3N2JhNmZjN2ZmYTZm
ZDczZTU5ZjZjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTAyLTI0ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNS5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p
ZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg
ICBXSVAuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAg
ICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3Bl
Y3RSYXRpb1VzaW5nIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94
OjphZGp1c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgpOgorCiAyMDIxLTAyLTIzICBGcmVkZXJpYyBX
YW5nICA8ZndhbmdAaWdhbGlhLmNvbT4KIAogICAgICAgICBOdWxscHRyIGNyYXNoIGluIFJlcGxh
Y2VTZWxlY3Rpb25Db21tYW5kOjpyZW1vdmVSZWR1bmRhbnRTdHlsZXNBbmRLZWVwU3R5bGVTcGFu
SW5saW5lCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGli
bGVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNw
cAppbmRleCBkM2NkMjI4YzU2YjkzMzkyY2RmMGRjNDc0MzZhMDkwMjNjMWY3YzI0Li5iYzM4ZTFm
MjBmMTliNWQyOGVjOGQ2NTcxZmMyYmZjZGQ5OGEyZTk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKQEAgLTc5Myw3ICs3OTMsMTIgQEAgTGF5
b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlv
VXNpbmcoY29uc3QgUmVuZGVyQm8KICAgICAgICAgLy8gV2UgbmVlZCB0byBzdWJzdHJhY3QgdGhl
IGJvcmRlciBhbmQgcGFkZGluZyBleHRlbnQgZnJvbSB0aGUgY3Jvc3MgYXhpcy4KICAgICAgICAg
Ly8gRnVydGhlcm1vcmUsIHRoZSBzaXppbmcgY2FsY3VsYXRpb25zIHRoYXQgZmxvb3IgdGhlIGNv
bnRlbnQgYm94IHNpemUgYXQgemVybyB3aGVuIGFwcGx5aW5nIGJveC1zaXppbmcgYXJlIGFsc28g
aWdub3JlZC4KICAgICAgICAgLy8gaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1mbGV4Ym94
LyNhbGdvLW1haW4taXRlbS4KLSAgICAgICAgaWYgKGJveC5zdHlsZSgpLmJveFNpemluZygpID09
IEJveFNpemluZzo6Qm9yZGVyQm94KQorICAgICAgICBib29sIHN1YnRyYWN0Qm9yZGVyUGFkZGlu
ZyA9IGZhbHNlOworICAgICAgICBpZiAoYm94LnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSkKKyAg
ICAgICAgICAgIHN1YnRyYWN0Qm9yZGVyUGFkZGluZyA9IGJveC5zdHlsZSgpLmJveFNpemluZ0Zv
ckFzcGVjdFJhdGlvKCkgPT0gQm94U2l6aW5nOjpDb250ZW50Qm94OworICAgICAgICBlbHNlIGlm
IChib3guc3R5bGUoKS5ib3hTaXppbmcoKSA9PSBCb3hTaXppbmc6OkJvcmRlckJveCkKKyAgICAg
ICAgICAgIHN1YnRyYWN0Qm9yZGVyUGFkZGluZyA9IHRydWU7CisgICAgICAgIGlmIChzdWJ0cmFj
dEJvcmRlclBhZGRpbmcpCiAgICAgICAgICAgICB2YWx1ZSAtPSBpc0hvcml6b250YWxGbG93KCkg
PyBib3gudmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCkgOiBib3guaG9yaXpvbnRhbEJv
cmRlckFuZFBhZGRpbmdFeHRlbnQoKTsKICAgICAgICAgcmV0dXJuIHZhbHVlOwogICAgIH07CkBA
IC0xMjA1LDcgKzEyMTAsNyBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjphZGp1c3RD
aGlsZFNpemVGb3JNaW5BbmRNYXgoY29uc3QgUmVuZGVyQm94JiBjaGlsZAogICAgICAgICAgICAg
Y29udGVudFNpemUgPSBjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjaGlsZCwg
Y2hpbGRDcm9zc1NpemVMZW5ndGgpOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICBjb250ZW50
U2l6ZSA9IGNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNoaWxkLCBNaW5TaXplLCBMZW5n
dGgoTGVuZ3RoVHlwZTo6TWluQ29udGVudCkpLnZhbHVlT3IoMCk7Ci0gICAgICAgIGlmIChjaGls
ZC5oYXNBc3BlY3RSYXRpbygpICYmIGNoaWxkLmludHJpbnNpY1NpemUoKS5oZWlnaHQoKSkKKyAg
ICAgICAgaWYgKChjaGlsZC5oYXNBc3BlY3RSYXRpbygpICYmIGNoaWxkLmludHJpbnNpY1NpemUo
KS5oZWlnaHQoKSkgfHwgY2hpbGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKQogICAgICAgICAg
ICAgY29udGVudFNpemUgPSBhZGp1c3RDaGlsZFNpemVGb3JBc3BlY3RSYXRpb0Nyb3NzQXhpc01p
bkFuZE1heChjaGlsZCwgY29udGVudFNpemUpOwogICAgICAgICBBU1NFUlQoY29udGVudFNpemUg
Pj0gMCk7CiAgICAgICAgIGNvbnRlbnRTaXplID0gc3RkOjptaW4oY29udGVudFNpemUsIG1heEV4
dGVudC52YWx1ZU9yKGNvbnRlbnRTaXplKSk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNmU4OTkwMmM4NTYyZGQzNDQ3ZTBh
YzBmNmJhODcxOGE5ZjllYTU2OS4uN2RiYjBhMDVhNmZiMTU4ZDJmMGI1MDRjNzczZTdhNzIzYzc3
OTUxZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz
L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAyLTI0ICBSb2IgQnVpcyAgPHJidWlz
QGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1sCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjIzNTcKKwor
ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGFwdCBwbGF0
Zm9ybSB0ZXN0IGV4cGVjdGF0aW9ucy4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisK
IDIwMjEtMDItMjQgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBOdWxs
IGNoZWNrIEFycmF5QnVmZmVyVmlldyBSZWZQdHIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rl
c3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGI3NjA0
ODE0MzZjNjEwNDFlYjk3NWFkN2Y1ZmIyMTY4ZWUxYTVlNmUuLjk0ZjBjZjlhMTExMzY2NWMyNmFj
OTc0YzI3NzBkODIzY2E4MjAxZjMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3Rh
dGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDU1Myw3ICs0NTUz
LDYgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby8KICMgZmxleC1iYXNpczpjb250ZW50CiB3ZWJr
aXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z
aXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMS5odG1sIFsgSW1hZ2VPbmx5
RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMi5o
dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNw
ZWN0LXJhdGlvLTAyNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0
NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0
LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3
ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxNS5odG1sIFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAx
Ni5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>421649</attachid>
            <date>2021-02-26 08:11:56 -0800</date>
            <delta_ts>2021-02-28 02:40:38 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210226171155.patch</filename>
            <type>text/plain</type>
            <size>6346</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNTU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmQ0MmJkMGVkYjU5NzJh
ZWJiOGU3OWJkMTM4NTkyOGM5NzU4OTc3ZS4uNzBlZTZiZjU4ZjNjNjE2NjZlZDg3MTg3NjFiZjAy
NzUxNDUwN2JmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTAyLTI2ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNS5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p
ZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg
ICBXSVAuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAg
ICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3Bl
Y3RSYXRpb1VzaW5nIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94
OjphZGp1c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgpOgorCiAyMDIxLTAyLTI2ICBaYWxhbiBCdWp0
YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBJbmxpbmUgYm94ZXMg
c2hvdWxkIG5vdCBiZSByZWZlcnJlZCBhcyBpbmxpbmUgY29udGFpbmVycwpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9X
ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKaW5kZXggZDNjZDIyOGM1NmI5
MzM5MmNkZjBkYzQ3NDM2YTA5MDIzYzFmN2MyNC4uN2Y0YmJlNDU2MTNkMjhiNjUzZWYyODQ3MjZj
NGU5MGU2OWYyODg2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl
ckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxl
eGlibGVCb3guY3BwCkBAIC03OTMsNyArNzkzLDEyIEBAIExheW91dFVuaXQgUmVuZGVyRmxleGli
bGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJv
CiAgICAgICAgIC8vIFdlIG5lZWQgdG8gc3Vic3RyYWN0IHRoZSBib3JkZXIgYW5kIHBhZGRpbmcg
ZXh0ZW50IGZyb20gdGhlIGNyb3NzIGF4aXMuCiAgICAgICAgIC8vIEZ1cnRoZXJtb3JlLCB0aGUg
c2l6aW5nIGNhbGN1bGF0aW9ucyB0aGF0IGZsb29yIHRoZSBjb250ZW50IGJveCBzaXplIGF0IHpl
cm8gd2hlbiBhcHBseWluZyBib3gtc2l6aW5nIGFyZSBhbHNvIGlnbm9yZWQuCiAgICAgICAgIC8v
IGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZmxleGJveC8jYWxnby1tYWluLWl0ZW0uCi0g
ICAgICAgIGlmIChib3guc3R5bGUoKS5ib3hTaXppbmcoKSA9PSBCb3hTaXppbmc6OkJvcmRlckJv
eCkKKyAgICAgICAgYm9vbCBzdWJ0cmFjdEJvcmRlclBhZGRpbmcgPSBmYWxzZTsKKyAgICAgICAg
aWYgKGJveC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpCisgICAgICAgICAgICBzdWJ0cmFjdEJv
cmRlclBhZGRpbmcgPSBib3guc3R5bGUoKS5ib3hTaXppbmdGb3JBc3BlY3RSYXRpbygpID09IEJv
eFNpemluZzo6Q29udGVudEJveDsKKyAgICAgICAgZWxzZSBpZiAoYm94LnN0eWxlKCkuYm94U2l6
aW5nKCkgPT0gQm94U2l6aW5nOjpCb3JkZXJCb3gpCisgICAgICAgICAgICBzdWJ0cmFjdEJvcmRl
clBhZGRpbmcgPSB0cnVlOworICAgICAgICBpZiAoc3VidHJhY3RCb3JkZXJQYWRkaW5nKQogICAg
ICAgICAgICAgdmFsdWUgLT0gaXNIb3Jpem9udGFsRmxvdygpID8gYm94LnZlcnRpY2FsQm9yZGVy
QW5kUGFkZGluZ0V4dGVudCgpIDogYm94Lmhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50
KCk7CiAgICAgICAgIHJldHVybiB2YWx1ZTsKICAgICB9OwpAQCAtMTE4NiwxNSArMTE5MSwyNyBA
QCB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpwcmVwYXJlT3JkZXJJdGVyYXRvckFuZE1hcmdpbnMo
KQogTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6YWRqdXN0Q2hpbGRTaXplRm9yTWluQW5k
TWF4KGNvbnN0IFJlbmRlckJveCYgY2hpbGQsIExheW91dFVuaXQgY2hpbGRTaXplKQogewogICAg
IExlbmd0aCBtYXggPSBtYWluU2l6ZUxlbmd0aEZvckNoaWxkKE1heFNpemUsIGNoaWxkKTsKKyAg
ICBMZW5ndGggY3Jvc3NNYXggPSBjcm9zc1NpemVMZW5ndGhGb3JDaGlsZChNYXhTaXplLCBjaGls
ZCk7CiAgICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gbWF4RXh0ZW50ID0gV1RGOjpudWxsb3B0Owog
ICAgIGlmIChtYXguaXNTcGVjaWZpZWRPckludHJpbnNpYygpKSB7CiAgICAgICAgIG1heEV4dGVu
dCA9IGNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNoaWxkLCBNYXhTaXplLCBtYXgpOwog
ICAgICAgICBjaGlsZFNpemUgPSBzdGQ6Om1pbihjaGlsZFNpemUsIG1heEV4dGVudC52YWx1ZU9y
KGNoaWxkU2l6ZSkpOworICAgIH0gZWxzZSBpZiAoY2hpbGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRp
bygpICYmIGNoaWxkQ3Jvc3NTaXplSXNEZWZpbml0ZShjaGlsZCwgY3Jvc3NNYXgpKSB7CisgICAg
ICAgIG1heEV4dGVudCA9IGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNoaWxk
LCBjcm9zc01heCk7CisgICAgICAgIC8vIFRPRE8gYWxzbyBpbXBsZW1lbnQgImNhcHBlZCBieSBh
bnkgZGVmaW5pdGUgcHJlZmVycmVkIG9yIG1heGltdW0gc2l6ZSBpbgorICAgICAgICAvLyB0aGUg
ZGVzdGluYXRpb24gYXhpcyIKKyAgICAgICAgY2hpbGRTaXplID0gc3RkOjptaW4oY2hpbGRTaXpl
LCBtYXhFeHRlbnQudmFsdWVPcihjaGlsZFNpemUpKTsKICAgICB9CiAKICAgICBMZW5ndGggbWlu
ID0gbWFpblNpemVMZW5ndGhGb3JDaGlsZChNaW5TaXplLCBjaGlsZCk7CisgICAgTGVuZ3RoIGNy
b3NzTWluID0gY3Jvc3NTaXplTGVuZ3RoRm9yQ2hpbGQoTWluU2l6ZSwgY2hpbGQpOwogICAgIGlm
IChtaW4uaXNTcGVjaWZpZWRPckludHJpbnNpYygpKQogICAgICAgICByZXR1cm4gc3RkOjptYXgo
Y2hpbGRTaXplLCBzdGQ6Om1heCgwX2x1LCBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChj
aGlsZCwgTWluU2l6ZSwgbWluKS52YWx1ZU9yKGNoaWxkU2l6ZSkpKTsKKyAgICBlbHNlIGlmIChj
aGlsZC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkgJiYgY2hpbGRDcm9zc1NpemVJc0RlZmluaXRl
KGNoaWxkLCBjcm9zc01pbikpIHsKKyAgICAgICAgLy8gVE9ETyBhbHNvIGltcGxlbWVudCAiY2Fw
cGVkIGJ5IGFueSBkZWZpbml0ZSBwcmVmZXJyZWQgb3IgbWF4aW11bSBzaXplIGluCisgICAgICAg
IC8vIHRoZSBkZXN0aW5hdGlvbiBheGlzIgorICAgICAgICByZXR1cm4gc3RkOjptYXgoY2hpbGRT
aXplLCBjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjaGlsZCwgY3Jvc3NNaW4p
KTsKKyAgICB9CiAgICAgCiAgICAgaWYgKHNob3VsZEFwcGx5TWluU2l6ZUF1dG9Gb3JDaGlsZChj
aGlsZCkpIHsKICAgICAgICAgLy8gRklYTUU6IElmIHRoZSBtaW4gdmFsdWUgaXMgZXhwZWN0ZWQg
dG8gYmUgdmFsaWQgaGVyZSwgd2UgbmVlZCB0byBjb21lIHVwIHdpdGggYSBub24gb3B0aW9uYWwg
dmVyc2lvbiBvZiBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZCBhbmQKQEAgLTEyMDUsNyAr
MTIyMiw3IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmFkanVzdENoaWxkU2l6ZUZv
ck1pbkFuZE1heChjb25zdCBSZW5kZXJCb3gmIGNoaWxkCiAgICAgICAgICAgICBjb250ZW50U2l6
ZSA9IGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNoaWxkLCBjaGlsZENyb3Nz
U2l6ZUxlbmd0aCk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIGNvbnRlbnRTaXplID0gY29t
cHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQoY2hpbGQsIE1pblNpemUsIExlbmd0aChMZW5ndGhU
eXBlOjpNaW5Db250ZW50KSkudmFsdWVPcigwKTsKLSAgICAgICAgaWYgKGNoaWxkLmhhc0FzcGVj
dFJhdGlvKCkgJiYgY2hpbGQuaW50cmluc2ljU2l6ZSgpLmhlaWdodCgpKQorICAgICAgICBpZiAo
KGNoaWxkLmhhc0FzcGVjdFJhdGlvKCkgJiYgY2hpbGQuaW50cmluc2ljU2l6ZSgpLmhlaWdodCgp
KSB8fCBjaGlsZC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpCiAgICAgICAgICAgICBjb250ZW50
U2l6ZSA9IGFkanVzdENoaWxkU2l6ZUZvckFzcGVjdFJhdGlvQ3Jvc3NBeGlzTWluQW5kTWF4KGNo
aWxkLCBjb250ZW50U2l6ZSk7CiAgICAgICAgIEFTU0VSVChjb250ZW50U2l6ZSA+PSAwKTsKICAg
ICAgICAgY29udGVudFNpemUgPSBzdGQ6Om1pbihjb250ZW50U2l6ZSwgbWF4RXh0ZW50LnZhbHVl
T3IoY29udGVudFNpemUpKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xh
eW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA5ZjEyMDMyNGVjYzYwNzYwYTVmMTg0OGI4YzMzNzA0
YzI3MzVkOTkxLi45ZDQ4ZTUxNjYwZmM5OWExNzVmNGQ1NGY0ZDY0NzgzZWI0NDExNmQyIDEwMDY0
NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n
CkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDItMjYgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNv
bT4KKworICAgICAgICBGaXggZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWwKKyAgICAgICAgaHR0
cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjM1NworCisgICAgICAgIFJl
dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkYXB0IHBsYXRmb3JtIHRlc3Qg
ZXhwZWN0YXRpb25zLgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0wMi0y
NiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSB1bm5l
Y2Vzc2FyeSB3aGl0ZXNwYWNlIChjc3MxL3RleHRfcHJvcGVydGllcy90ZXh0X2RlY29yYXRpb24u
aHRtbCkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRU
ZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGQ5NWQ0MGY2MTNjZjc3ODFlNDFjZWYwM2RmNzll
N2I2MzY0Njk0ZjMuLjhkYzE4OTI1N2JjN2IxY2Q4NjE4Yzk2Y2RiYTM4MDQ1ZjIzODYzZTkgMTAw
NjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMv
VGVzdEV4cGVjdGF0aW9ucwpAQCAtNDU1NCw4ICs0NTU0LDYgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2
MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y
YXRpby8KICMgZmxleC1iYXNpczpjb250ZW50CiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgt
YXNwZWN0LXJhdGlvLTAyMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2Iv
MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw
ZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd
Ci13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlv
LTAyNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dy
aWQtYXNwZWN0LXJhdGlvLTAxNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3Jn
L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv
YXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxNy5odG1sIFsg
SW1hZ2VPbmx5RmFpbHVyZSBdCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>421775</attachid>
            <date>2021-02-28 02:40:42 -0800</date>
            <delta_ts>2021-02-28 07:30:16 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210228114041.patch</filename>
            <type>text/plain</type>
            <size>6024</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNjI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGI2YjIzMDMwNTk0ZmUx
YzRmYmYzOGMzNTcwYzRiOGM0YzA5MDdmMi4uM2U2YTdmZGYzOTU2ZmY4OTc4OWI5NTYyMzljMjBl
MDZhZGJhMmJmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTAyLTI4ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNS5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p
ZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg
ICBXSVAuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAg
ICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3Bl
Y3RSYXRpb1VzaW5nIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94
OjphZGp1c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgpOgorCiAyMDIxLTAyLTI3ICBTYW0gV2Vpbmln
ICA8d2VpbmlnQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgc3VwcG9ydCBmb3IgJ3BpeGVs
JyBhbmQgJ3BvcycgQ1NTT00gcHJlZml4ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl
bmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv
UmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4IGQzY2QyMjhjNTZiOTMzOTJjZGYwZGM0NzQzNmEw
OTAyM2MxZjdjMjQuLjRiMzk0ZWViN2NmZjlhMmY2NDBiOGJkMjE0YTliMzNmZDNkN2U1MGMgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAK
KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAt
NzkzLDcgKzc5MywxMiBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFp
blNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjb25zdCBSZW5kZXJCbwogICAgICAgICAvLyBXZSBu
ZWVkIHRvIHN1YnN0cmFjdCB0aGUgYm9yZGVyIGFuZCBwYWRkaW5nIGV4dGVudCBmcm9tIHRoZSBj
cm9zcyBheGlzLgogICAgICAgICAvLyBGdXJ0aGVybW9yZSwgdGhlIHNpemluZyBjYWxjdWxhdGlv
bnMgdGhhdCBmbG9vciB0aGUgY29udGVudCBib3ggc2l6ZSBhdCB6ZXJvIHdoZW4gYXBwbHlpbmcg
Ym94LXNpemluZyBhcmUgYWxzbyBpZ25vcmVkLgogICAgICAgICAvLyBodHRwczovL2RyYWZ0cy5j
c3N3Zy5vcmcvY3NzLWZsZXhib3gvI2FsZ28tbWFpbi1pdGVtLgotICAgICAgICBpZiAoYm94LnN0
eWxlKCkuYm94U2l6aW5nKCkgPT0gQm94U2l6aW5nOjpCb3JkZXJCb3gpCisgICAgICAgIGJvb2wg
c3VidHJhY3RCb3JkZXJQYWRkaW5nID0gZmFsc2U7CisgICAgICAgIGlmIChib3guc3R5bGUoKS5o
YXNBc3BlY3RSYXRpbygpKQorICAgICAgICAgICAgc3VidHJhY3RCb3JkZXJQYWRkaW5nID0gYm94
LnN0eWxlKCkuYm94U2l6aW5nRm9yQXNwZWN0UmF0aW8oKSA9PSBCb3hTaXppbmc6OkNvbnRlbnRC
b3g7CisgICAgICAgIGVsc2UgaWYgKGJveC5zdHlsZSgpLmJveFNpemluZygpID09IEJveFNpemlu
Zzo6Qm9yZGVyQm94KQorICAgICAgICAgICAgc3VidHJhY3RCb3JkZXJQYWRkaW5nID0gdHJ1ZTsK
KyAgICAgICAgaWYgKHN1YnRyYWN0Qm9yZGVyUGFkZGluZykKICAgICAgICAgICAgIHZhbHVlIC09
IGlzSG9yaXpvbnRhbEZsb3coKSA/IGJveC52ZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQo
KSA6IGJveC5ob3Jpem9udGFsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpOwogICAgICAgICByZXR1
cm4gdmFsdWU7CiAgICAgfTsKQEAgLTExODYsMTUgKzExOTEsMjIgQEAgdm9pZCBSZW5kZXJGbGV4
aWJsZUJveDo6cHJlcGFyZU9yZGVySXRlcmF0b3JBbmRNYXJnaW5zKCkKIExheW91dFVuaXQgUmVu
ZGVyRmxleGlibGVCb3g6OmFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heChjb25zdCBSZW5kZXJC
b3gmIGNoaWxkLCBMYXlvdXRVbml0IGNoaWxkU2l6ZSkKIHsKICAgICBMZW5ndGggbWF4ID0gbWFp
blNpemVMZW5ndGhGb3JDaGlsZChNYXhTaXplLCBjaGlsZCk7CisgICAgTGVuZ3RoIGNyb3NzTWF4
ID0gY3Jvc3NTaXplTGVuZ3RoRm9yQ2hpbGQoTWF4U2l6ZSwgY2hpbGQpOwogICAgIE9wdGlvbmFs
PExheW91dFVuaXQ+IG1heEV4dGVudCA9IFdURjo6bnVsbG9wdDsKICAgICBpZiAobWF4LmlzU3Bl
Y2lmaWVkT3JJbnRyaW5zaWMoKSkgewogICAgICAgICBtYXhFeHRlbnQgPSBjb21wdXRlTWFpbkF4
aXNFeHRlbnRGb3JDaGlsZChjaGlsZCwgTWF4U2l6ZSwgbWF4KTsKICAgICAgICAgY2hpbGRTaXpl
ID0gc3RkOjptaW4oY2hpbGRTaXplLCBtYXhFeHRlbnQudmFsdWVPcihjaGlsZFNpemUpKTsKKyAg
ICB9IGVsc2UgaWYgKGNoaWxkLnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSAmJiBjaGlsZENyb3Nz
U2l6ZUlzRGVmaW5pdGUoY2hpbGQsIGNyb3NzTWF4KSkgeworICAgICAgICBtYXhFeHRlbnQgPSBj
b21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjaGlsZCwgY3Jvc3NNYXgpOworICAg
ICAgICBjaGlsZFNpemUgPSBzdGQ6Om1pbihjaGlsZFNpemUsIG1heEV4dGVudC52YWx1ZU9yKGNo
aWxkU2l6ZSkpOwogICAgIH0KIAogICAgIExlbmd0aCBtaW4gPSBtYWluU2l6ZUxlbmd0aEZvckNo
aWxkKE1pblNpemUsIGNoaWxkKTsKKyAgICBMZW5ndGggY3Jvc3NNaW4gPSBjcm9zc1NpemVMZW5n
dGhGb3JDaGlsZChNaW5TaXplLCBjaGlsZCk7CiAgICAgaWYgKG1pbi5pc1NwZWNpZmllZE9ySW50
cmluc2ljKCkpCiAgICAgICAgIHJldHVybiBzdGQ6Om1heChjaGlsZFNpemUsIHN0ZDo6bWF4KDBf
bHUsIGNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNoaWxkLCBNaW5TaXplLCBtaW4pLnZh
bHVlT3IoY2hpbGRTaXplKSkpOworICAgIGVsc2UgaWYgKGNoaWxkLnN0eWxlKCkuaGFzQXNwZWN0
UmF0aW8oKSAmJiBjaGlsZENyb3NzU2l6ZUlzRGVmaW5pdGUoY2hpbGQsIGNyb3NzTWluKSkKKyAg
ICAgICAgcmV0dXJuIHN0ZDo6bWF4KGNoaWxkU2l6ZSwgY29tcHV0ZU1haW5TaXplRnJvbUFzcGVj
dFJhdGlvVXNpbmcoY2hpbGQsIGNyb3NzTWluKSk7CiAgICAgCiAgICAgaWYgKHNob3VsZEFwcGx5
TWluU2l6ZUF1dG9Gb3JDaGlsZChjaGlsZCkpIHsKICAgICAgICAgLy8gRklYTUU6IElmIHRoZSBt
aW4gdmFsdWUgaXMgZXhwZWN0ZWQgdG8gYmUgdmFsaWQgaGVyZSwgd2UgbmVlZCB0byBjb21lIHVw
IHdpdGggYSBub24gb3B0aW9uYWwgdmVyc2lvbiBvZiBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JD
aGlsZCBhbmQKQEAgLTEyMDUsNyArMTIxNyw3IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVC
b3g6OmFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heChjb25zdCBSZW5kZXJCb3gmIGNoaWxkCiAg
ICAgICAgICAgICBjb250ZW50U2l6ZSA9IGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1Vz
aW5nKGNoaWxkLCBjaGlsZENyb3NzU2l6ZUxlbmd0aCk7CiAgICAgICAgIGVsc2UKICAgICAgICAg
ICAgIGNvbnRlbnRTaXplID0gY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQoY2hpbGQsIE1p
blNpemUsIExlbmd0aChMZW5ndGhUeXBlOjpNaW5Db250ZW50KSkudmFsdWVPcigwKTsKLSAgICAg
ICAgaWYgKGNoaWxkLmhhc0FzcGVjdFJhdGlvKCkgJiYgY2hpbGQuaW50cmluc2ljU2l6ZSgpLmhl
aWdodCgpKQorICAgICAgICBpZiAoKGNoaWxkLmhhc0FzcGVjdFJhdGlvKCkgJiYgY2hpbGQuaW50
cmluc2ljU2l6ZSgpLmhlaWdodCgpKSkKICAgICAgICAgICAgIGNvbnRlbnRTaXplID0gYWRqdXN0
Q2hpbGRTaXplRm9yQXNwZWN0UmF0aW9Dcm9zc0F4aXNNaW5BbmRNYXgoY2hpbGQsIGNvbnRlbnRT
aXplKTsKICAgICAgICAgQVNTRVJUKGNvbnRlbnRTaXplID49IDApOwogICAgICAgICBjb250ZW50
U2l6ZSA9IHN0ZDo6bWluKGNvbnRlbnRTaXplLCBtYXhFeHRlbnQudmFsdWVPcihjb250ZW50U2l6
ZSkpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh
bmdlTG9nCmluZGV4IDQ2MDk0MDdkYmYzY2NkZjZmYWNiMGQ4MTYxNzQ1MmNjY2EwY2FkMmIuLmQw
ODRlZWE5ODc2OTFkYmIyNDEwMTcwZGJiNGI5MmYyMjVmODQyYTEgMTAwNjQ0Ci0tLSBhL0xheW91
dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx
NCBAQAorMjAyMS0wMi0yOCAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAg
IEZpeCBmbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyMzU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C
T0RZIChPT1BTISkuCisKKyAgICAgICAgQWRhcHQgcGxhdGZvcm0gdGVzdCBleHBlY3RhdGlvbnMu
CisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTAyLTI3ICBTYW0gV2Vpbmln
ICA8d2VpbmlnQGFwcGxlLmNvbT4KIAogICAgICAgIFJlbW92ZSBzdXBwb3J0IGZvciAncGl4ZWwn
IGFuZCAncG9zJyBDU1NPTSBwcmVmaXhlcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4
cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggZDk1ZDQwZjYx
M2NmNzc4MWU0MWNlZjAzZGY3OWU3YjYzNjQ2OTRmMy4uOGRjMTg5MjU3YmM3YjFjZDg2MThjOTZj
ZGJhMzgwNDVmMjM4NjNlOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9u
cworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NTU0LDggKzQ1NTQsNiBA
QCB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvLwogIyBmbGV4LWJhc2lzOmNvbnRlbnQKIHdlYmtpdC5v
cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu
Zy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDIxLmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDIyLmh0bWwg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3Qt
cmF0aW8tMDI1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMg
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0
aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtp
dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp
emluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE1Lmh0bWwgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE2Lmh0
bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3Bl
Y3QtcmF0aW8tMDE3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>421776</attachid>
            <date>2021-02-28 07:30:20 -0800</date>
            <delta_ts>2021-03-02 01:43:36 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210228163018.patch</filename>
            <type>text/plain</type>
            <size>13180</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNjM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDNlOTJkNjBhNjIzZWIz
ODMwMjdiZDI1MThlNTVkNzY3YTg5NzU1ZC4uZWQ2YTUzZjk1Y2VhMzJlNGRmMTBkM2QxN2ZlYmQw
OGQ1N2E1Y2ZjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTAyLTI4ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNS5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p
ZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg
ICBXSVAuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAg
ICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3Bl
Y3RSYXRpb1VzaW5nIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94
OjphZGp1c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgpOgorCiAyMDIxLTAyLTI4ICBBbnRvaW5lIFF1
aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgogCiAgICAgICAgIEJsZW5kaW5nIG9mIGJvcmRlci1p
bWFnZS13aWR0aCBzaG91bGQgYmUgZGlzY3JldGUgYmV0d2VlbiAiYXV0byIgdmFsdWVzIGFuZCBv
dGhlciB0eXBlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZs
ZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJv
eC5jcHAKaW5kZXggZDNjZDIyOGM1NmI5MzM5MmNkZjBkYzQ3NDM2YTA5MDIzYzFmN2MyNC4uZTJl
NDQ4MWU1MDk0NWNiNmM4YWVjNjQxNDRiMDQwN2ZkZmYwZTBiNyAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2Vi
Q29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC03OTMsNyArNzkzLDEyIEBA
IExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RS
YXRpb1VzaW5nKGNvbnN0IFJlbmRlckJvCiAgICAgICAgIC8vIFdlIG5lZWQgdG8gc3Vic3RyYWN0
IHRoZSBib3JkZXIgYW5kIHBhZGRpbmcgZXh0ZW50IGZyb20gdGhlIGNyb3NzIGF4aXMuCiAgICAg
ICAgIC8vIEZ1cnRoZXJtb3JlLCB0aGUgc2l6aW5nIGNhbGN1bGF0aW9ucyB0aGF0IGZsb29yIHRo
ZSBjb250ZW50IGJveCBzaXplIGF0IHplcm8gd2hlbiBhcHBseWluZyBib3gtc2l6aW5nIGFyZSBh
bHNvIGlnbm9yZWQuCiAgICAgICAgIC8vIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZmxl
eGJveC8jYWxnby1tYWluLWl0ZW0uCi0gICAgICAgIGlmIChib3guc3R5bGUoKS5ib3hTaXppbmco
KSA9PSBCb3hTaXppbmc6OkJvcmRlckJveCkKKyAgICAgICAgYm9vbCBzdWJ0cmFjdEJvcmRlclBh
ZGRpbmcgPSBmYWxzZTsKKyAgICAgICAgaWYgKGJveC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkp
CisgICAgICAgICAgICBzdWJ0cmFjdEJvcmRlclBhZGRpbmcgPSBib3guc3R5bGUoKS5ib3hTaXpp
bmdGb3JBc3BlY3RSYXRpbygpID09IEJveFNpemluZzo6Q29udGVudEJveDsKKyAgICAgICAgZWxz
ZSBpZiAoYm94LnN0eWxlKCkuYm94U2l6aW5nKCkgPT0gQm94U2l6aW5nOjpCb3JkZXJCb3gpCisg
ICAgICAgICAgICBzdWJ0cmFjdEJvcmRlclBhZGRpbmcgPSB0cnVlOworICAgICAgICBpZiAoc3Vi
dHJhY3RCb3JkZXJQYWRkaW5nKQogICAgICAgICAgICAgdmFsdWUgLT0gaXNIb3Jpem9udGFsRmxv
dygpID8gYm94LnZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpIDogYm94Lmhvcml6b250
YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCk7CiAgICAgICAgIHJldHVybiB2YWx1ZTsKICAgICB9
OwpAQCAtODE2LDE1ICs4MjEsMTggQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29t
cHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoY29uc3QgUmVuZGVyQm8KIAogICAgIGNv
bnN0IExheW91dFNpemUmIGNoaWxkSW50cmluc2ljU2l6ZSA9IGNoaWxkLmludHJpbnNpY1NpemUo
KTsKICAgICBkb3VibGUgcmF0aW87Ci0gICAgaWYgKGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9U
eXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpSYXRpbyB8fCAoY2hpbGQuc3R5bGUoKS5hc3BlY3RS
YXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OkF1dG9BbmRSYXRpbyAmJiBjaGlsZEludHJp
bnNpY1NpemUuaXNFbXB0eSgpKSkKKyAgICBMYXlvdXRVbml0IGJvcmRlclBhZGRpbmc7CisgICAg
aWYgKGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpS
YXRpbyB8fCAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5
cGU6OkF1dG9BbmRSYXRpbyAmJiBjaGlsZEludHJpbnNpY1NpemUuaXNFbXB0eSgpKSkgewogICAg
ICAgICByYXRpbyA9IGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9XaWR0aCgpIC8gY2hpbGQuc3R5
bGUoKS5hc3BlY3RSYXRpb0hlaWdodCgpOwotICAgIGVsc2UgeworICAgICAgICBpZiAoY2hpbGQu
c3R5bGUoKS5ib3hTaXppbmdGb3JBc3BlY3RSYXRpbygpID09IEJveFNpemluZzo6Qm9yZGVyQm94
KQorICAgICAgICAgICAgYm9yZGVyUGFkZGluZyA9IGlzSG9yaXpvbnRhbEZsb3coKSA/IGNoaWxk
Lmhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCkgOiBjaGlsZC52ZXJ0aWNhbEJvcmRl
ckFuZFBhZGRpbmdFeHRlbnQoKTsKKyAgICB9IGVsc2UgewogICAgICAgICBBU1NFUlQoY2hpbGRJ
bnRyaW5zaWNTaXplLmhlaWdodCgpKTsKICAgICAgICAgcmF0aW8gPSBjaGlsZEludHJpbnNpY1Np
emUud2lkdGgoKS50b0Zsb2F0KCkgLyBjaGlsZEludHJpbnNpY1NpemUuaGVpZ2h0KCkudG9GbG9h
dCgpOwogICAgIH0KICAgICBpZiAoaXNIb3Jpem9udGFsRmxvdygpKQotICAgICAgICByZXR1cm4g
TGF5b3V0VW5pdChjcm9zc1NpemUudmFsdWUoKSAqIHJhdGlvKTsKLSAgICByZXR1cm4gTGF5b3V0
VW5pdChjcm9zc1NpemUudmFsdWUoKSAvIHJhdGlvKTsKKyAgICAgICAgcmV0dXJuIExheW91dFVu
aXQoY3Jvc3NTaXplLnZhbHVlKCkgKiByYXRpbykgLSBib3JkZXJQYWRkaW5nOworICAgIHJldHVy
biBMYXlvdXRVbml0KGNyb3NzU2l6ZS52YWx1ZSgpIC8gcmF0aW8pIC0gYm9yZGVyUGFkZGluZzsK
IH0KIAogdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6c2V0Rmxvd0F3YXJlTG9jYXRpb25Gb3JDaGls
ZChSZW5kZXJCb3gmIGNoaWxkLCBjb25zdCBMYXlvdXRQb2ludCYgbG9jYXRpb24pCkBAIC0xMTg2
LDE1ICsxMTk0LDIyIEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OnByZXBhcmVPcmRlckl0ZXJh
dG9yQW5kTWFyZ2lucygpCiBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjphZGp1c3RDaGls
ZFNpemVGb3JNaW5BbmRNYXgoY29uc3QgUmVuZGVyQm94JiBjaGlsZCwgTGF5b3V0VW5pdCBjaGls
ZFNpemUpCiB7CiAgICAgTGVuZ3RoIG1heCA9IG1haW5TaXplTGVuZ3RoRm9yQ2hpbGQoTWF4U2l6
ZSwgY2hpbGQpOworICAgIExlbmd0aCBjcm9zc01heCA9IGNyb3NzU2l6ZUxlbmd0aEZvckNoaWxk
KE1heFNpemUsIGNoaWxkKTsKICAgICBPcHRpb25hbDxMYXlvdXRVbml0PiBtYXhFeHRlbnQgPSBX
VEY6Om51bGxvcHQ7CiAgICAgaWYgKG1heC5pc1NwZWNpZmllZE9ySW50cmluc2ljKCkpIHsKICAg
ICAgICAgbWF4RXh0ZW50ID0gY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQoY2hpbGQsIE1h
eFNpemUsIG1heCk7CiAgICAgICAgIGNoaWxkU2l6ZSA9IHN0ZDo6bWluKGNoaWxkU2l6ZSwgbWF4
RXh0ZW50LnZhbHVlT3IoY2hpbGRTaXplKSk7CisgICAgfSBlbHNlIGlmIChjaGlsZC5zdHlsZSgp
Lmhhc0FzcGVjdFJhdGlvKCkgJiYgY2hpbGRDcm9zc1NpemVJc0RlZmluaXRlKGNoaWxkLCBjcm9z
c01heCkpIHsKKyAgICAgICAgbWF4RXh0ZW50ID0gY29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJh
dGlvVXNpbmcoY2hpbGQsIGNyb3NzTWF4KTsKKyAgICAgICAgY2hpbGRTaXplID0gc3RkOjptaW4o
Y2hpbGRTaXplLCBtYXhFeHRlbnQudmFsdWVPcihjaGlsZFNpemUpKTsKICAgICB9CiAKICAgICBM
ZW5ndGggbWluID0gbWFpblNpemVMZW5ndGhGb3JDaGlsZChNaW5TaXplLCBjaGlsZCk7CisgICAg
TGVuZ3RoIGNyb3NzTWluID0gY3Jvc3NTaXplTGVuZ3RoRm9yQ2hpbGQoTWluU2l6ZSwgY2hpbGQp
OwogICAgIGlmIChtaW4uaXNTcGVjaWZpZWRPckludHJpbnNpYygpKQogICAgICAgICByZXR1cm4g
c3RkOjptYXgoY2hpbGRTaXplLCBzdGQ6Om1heCgwX2x1LCBjb21wdXRlTWFpbkF4aXNFeHRlbnRG
b3JDaGlsZChjaGlsZCwgTWluU2l6ZSwgbWluKS52YWx1ZU9yKGNoaWxkU2l6ZSkpKTsKKyAgICBl
bHNlIGlmIChjaGlsZC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkgJiYgY2hpbGRDcm9zc1NpemVJ
c0RlZmluaXRlKGNoaWxkLCBjcm9zc01pbikpCisgICAgICAgIHJldHVybiBzdGQ6Om1heChjaGls
ZFNpemUsIGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNoaWxkLCBjcm9zc01p
bikpOwogICAgIAogICAgIGlmIChzaG91bGRBcHBseU1pblNpemVBdXRvRm9yQ2hpbGQoY2hpbGQp
KSB7CiAgICAgICAgIC8vIEZJWE1FOiBJZiB0aGUgbWluIHZhbHVlIGlzIGV4cGVjdGVkIHRvIGJl
IHZhbGlkIGhlcmUsIHdlIG5lZWQgdG8gY29tZSB1cCB3aXRoIGEgbm9uIG9wdGlvbmFsIHZlcnNp
b24gb2YgY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQgYW5kCkBAIC0xMjA1LDcgKzEyMjAs
NyBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjphZGp1c3RDaGlsZFNpemVGb3JNaW5B
bmRNYXgoY29uc3QgUmVuZGVyQm94JiBjaGlsZAogICAgICAgICAgICAgY29udGVudFNpemUgPSBj
b21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjaGlsZCwgY2hpbGRDcm9zc1NpemVM
ZW5ndGgpOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICBjb250ZW50U2l6ZSA9IGNvbXB1dGVN
YWluQXhpc0V4dGVudEZvckNoaWxkKGNoaWxkLCBNaW5TaXplLCBMZW5ndGgoTGVuZ3RoVHlwZTo6
TWluQ29udGVudCkpLnZhbHVlT3IoMCk7Ci0gICAgICAgIGlmIChjaGlsZC5oYXNBc3BlY3RSYXRp
bygpICYmIGNoaWxkLmludHJpbnNpY1NpemUoKS5oZWlnaHQoKSkKKyAgICAgICAgaWYgKChjaGls
ZC5oYXNBc3BlY3RSYXRpbygpICYmIGNoaWxkLmludHJpbnNpY1NpemUoKS5oZWlnaHQoKSkpCiAg
ICAgICAgICAgICBjb250ZW50U2l6ZSA9IGFkanVzdENoaWxkU2l6ZUZvckFzcGVjdFJhdGlvQ3Jv
c3NBeGlzTWluQW5kTWF4KGNoaWxkLCBjb250ZW50U2l6ZSk7CiAgICAgICAgIEFTU0VSVChjb250
ZW50U2l6ZSA+PSAwKTsKICAgICAgICAgY29udGVudFNpemUgPSBzdGQ6Om1pbihjb250ZW50U2l6
ZSwgbWF4RXh0ZW50LnZhbHVlT3IoY29udGVudFNpemUpKTsKZGlmZiAtLWdpdCBhL0xheW91dFRl
c3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA0NjA5NDA3ZGJmM2Nj
ZGY2ZmFjYjBkODE2MTc0NTJjY2NhMGNhZDJiLi5kMDg0ZWVhOTg3NjkxZGJiMjQxMDE3MGRiYjRi
OTJmMjI1Zjg0MmExIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5
b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDItMjggIFJvYiBCdWlz
ICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBGaXggZmxleC1hc3BlY3QtcmF0aW8tMDI1
Lmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy
MjM1NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFk
YXB0IHBsYXRmb3JtIHRlc3QgZXhwZWN0YXRpb25zLgorCisgICAgICAgICogVGVzdEV4cGVjdGF0
aW9uczoKKwogMjAyMS0wMi0yNyAgU2FtIFdlaW5pZyAgPHdlaW5pZ0BhcHBsZS5jb20+CiAKICAg
ICAgICBSZW1vdmUgc3VwcG9ydCBmb3IgJ3BpeGVsJyBhbmQgJ3BvcycgQ1NTT00gcHJlZml4ZXMK
ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRU
ZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IDIwZTY1YzBlYmJhY2VhOTAzZTk1NTBl
Njc2Mjc5ZWE0NzVlZWEyMGEuLjY4MjBkODVkZWYzN2ZhZTRmM2Q1YTM5NGEwYTU0M2Y4YjY2NzFk
OTkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKKysrIGIv
TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIx
LTAyLTI4ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgt
YXNwZWN0LXJhdGlvLTAyNS5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No
b3dfYnVnLmNnaT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh
KS4KKworICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt
cmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWw6CisgICAgICAgICogd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjYu
aHRtbDoKKwogMjAyMS0wMi0yOCAgQW50b2luZSBRdWludCAgPGdyYW91dHNAd2Via2l0Lm9yZz4K
IAogICAgICAgICBCbGVuZGluZyBvZiBib3JkZXItaW1hZ2Utd2lkdGggc2hvdWxkIGJlIGRpc2Ny
ZXRlIGJldHdlZW4gImF1dG8iIHZhbHVlcyBhbmQgb3RoZXIgdHlwZXMKZGlmZiAtLWdpdCBhL0xh
eW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25z
CmluZGV4IGQ5NWQ0MGY2MTNjZjc3ODFlNDFjZWYwM2RmNzllN2I2MzY0Njk0ZjMuLjhkYzE4OTI1
N2JjN2IxY2Q4NjE4Yzk2Y2RiYTM4MDQ1ZjIzODYzZTkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz
L1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAt
NDU1NCw4ICs0NTU0LDYgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby8KICMgZmxleC1iYXNpczpj
b250ZW50CiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMS5odG1s
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0
LXJhdGlvLTAyMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYz
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh
dGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJr
aXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z
aXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sIFsgSW1hZ2VPbmx5
RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxNS5o
dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNw
ZWN0LXJhdGlvLTAxNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0
NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0
LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxNy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCmRp
ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbCBiL0xh
eW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv
YXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1sCmluZGV4IGZhOWNlOGViY2U2
OWYwMmU2YjEzZDlkMjIzM2QxZTNiNDZjN2YxYWIuLmM0ZmY4MTEwZDdiZWQ3MDc5Yzg2NGRkZjE5
MmY4MjQyOTMyZTU4OGQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJh
dGlvLTAyNS5odG1sCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNS5o
dG1sCkBAIC0xNCw2ICsxNCw3IEBACiAgIC5pdGVtIHsKICAgICBiYWNrZ3JvdW5kOiBncmVlbjsK
ICAgICBwYWRkaW5nLXRvcDogMTVweDsKKyAgICBwYWRkaW5nLWxlZnQ6IDEwcHg7CiAgICAgYm94
LXNpemluZzogYm9yZGVyLWJveDsKICAgfQogICA8L3N0eWxlPgpAQCAtNDksMjUgKzUwLDI1IEBA
CiAgICAgICAgYmVjYXVzZSBpdHMgdmFsdWUgY29udGFpbnMgJ2F1dG8nLiAtLT4KICAgPGRpdiBj
bGFzcz0iZmxleENvbnRhaW5lciIgc3R5bGU9IndpZHRoOiBhdXRvOyI+CiAgICAgPCEtLSBUaGUg
Y29udGVudC1ib3ggaGVpZ2h0IDEwcHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywK
LSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgZmxleCBiYXNlIHNpemUgb2YgMjAwcHguIC0t
PgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4td2lkdGg6MDsgaGVpZ2h0OiAyNXB4
OyBhc3BlY3QtcmF0aW86IGF1dG8gMjAvMTsiPjwvZGl2PgorICAgICAgICAgeWllbGRpbmcgYSBy
ZXNvbHZlZCBmbGV4IGJhc2Ugc2l6ZSBvZiAxOTBweC4gLS0+CisgICAgPGRpdiBjbGFzcz0iaXRl
bSIgc3R5bGU9Im1pbi13aWR0aDowOyBoZWlnaHQ6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAx
OS8xOyI+PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgog
ICAgIDwhLS0gVGhlIGNvbnRlbnQtYm94IGhlaWdodCAxMHB4IGlzIHRyYW5zZmVycmVkIHRvIHRo
ZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi13aWR0aDphdXRv
IG9mIDIwMHB4LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0iaGVpZ2h0OiAyNXB4
OyBhc3BlY3QtcmF0aW86IGF1dG8gMjAvMTsiPjwvZGl2PgorICAgICAgICAgeWllbGRpbmcgYSBy
ZXNvbHZlZCBtaW4td2lkdGg6YXV0byBvZiAxOTBweC4gLS0+CisgICAgPGRpdiBjbGFzcz0iaXRl
bSIgc3R5bGU9ImhlaWdodDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDE5LzE7Ij48L2Rpdj4K
ICAgPC9kaXY+CiAKICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciI+CiAgICAgPCEtLSBUaGUg
Y29udGVudC1ib3ggbWluLWhlaWdodCAxMHB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4
aXMsCi0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi13aWR0aDphdXRvIG9mIDIwMHB4
LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWluLWhlaWdodDogMjVweDsgYXNw
ZWN0LXJhdGlvOiBhdXRvIDIwLzE7Ij48L2Rpdj4KKyAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2
ZWQgbWluLXdpZHRoOmF1dG8gb2YgMTkwcHguIC0tPgorICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0
eWxlPSJtaW4taGVpZ2h0OiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMTkvMTsiPjwvZGl2Pgog
ICA8L2Rpdj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KICAgICA8IS0tIFRoZSBj
b250ZW50LWJveCBoZWlnaHQgMTBweCAoY2xhbXBlZCBieSBtYXgtaGVpZ2h0KSBpcyB0cmFuc2Zl
cnJlZAotICAgICAgICAgdG8gdGhlIG1haW4gYXhpcywgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4t
d2lkdGg6YXV0byBvZiAyMDBweC4gLS0+Ci0gICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1h
eC1oZWlnaHQ6IDI1cHg7IGhlaWdodDogMTAwcHg7IGFzcGVjdC1yYXRpbzogYXV0byAyMC8xOyI+
PC9kaXY+CisgICAgICAgICB0byB0aGUgbWFpbiBheGlzLCB5aWVsZGluZyBhIHJlc29sdmVkIG1p
bi13aWR0aDphdXRvIG9mIDE5MHB4LiAtLT4KKyAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0i
bWF4LWhlaWdodDogMjVweDsgaGVpZ2h0OiAxMDBweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDE5LzE7
Ij48L2Rpdj4KICAgPC9kaXY+CiA8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9m
bGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJh
dGlvLTAyNi5odG1sCmluZGV4IDFkZjE0NDY4NjMyYmFhOGZmZDAzZDY5MGY3ZGRhYTYxOGFjZDdi
ZjYuLmM0YTI1MDgxOGJiNzc4NmUyZjM5NTkyMmQyOGUzYzc1MTliNGVhM2EgMTAwNjQ0Ci0tLSBh
L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp
bmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sCisrKyBiL0xheW91dFRl
c3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0
LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sCkBAIC0xNSw2ICsxNSw3IEBACiAgIC5p
dGVtIHsKICAgICBiYWNrZ3JvdW5kOiBncmVlbjsKICAgICBwYWRkaW5nLWxlZnQ6IDE1cHg7Cisg
ICAgcGFkZGluZy10b3A6IDEwcHg7CiAgICAgYm94LXNpemluZzogYm9yZGVyLWJveDsKICAgfQog
ICAuaXRlbSA+IGRpdiB7CkBAIC01MywyNSArNTQsMjUgQEAKICAgICAgICBiZWNhdXNlIGl0cyB2
YWx1ZSBjb250YWlucyAnYXV0bycuIC0tPgogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIiBz
dHlsZT0iaGVpZ2h0OiBhdXRvOyI+CiAgICAgPCEtLSBUaGUgY29udGVudC1ib3ggd2lkdGggMTBw
eCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSBy
ZXNvbHZlZCBmbGV4IGJhc2Ugc2l6ZSBvZiAyMDBweC4gLS0+Ci0gICAgPGRpdiBjbGFzcz0iaXRl
bSIgc3R5bGU9Im1pbi1oZWlnaHQ6MDsgd2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAx
LzIwOyI+PGRpdj48L2Rpdj48L2Rpdj4KKyAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgZmxl
eCBiYXNlIHNpemUgb2YgMTkwcHguIC0tPgorICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJt
aW4taGVpZ2h0OjA7IHdpZHRoOiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMS8xOTsiPjxkaXY+
PC9kaXY+PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgog
ICAgIDwhLS0gVGhlIGNvbnRlbnQtYm94IHdpZHRoIDEwcHggaXMgdHJhbnNmZXJyZWQgdG8gdGhl
IG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLWhlaWdodDphdXRv
IG9mIDIwMHB4LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0id2lkdGg6IDI1cHg7
IGFzcGVjdC1yYXRpbzogYXV0byAxLzIwOyI+PGRpdj48L2Rpdj48L2Rpdj4KKyAgICAgICAgIHlp
ZWxkaW5nIGEgcmVzb2x2ZWQgbWluLWhlaWdodDphdXRvIG9mIDE5MHB4LiAtLT4KKyAgICA8ZGl2
IGNsYXNzPSJpdGVtIiBzdHlsZT0id2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE5
OyI+PGRpdj48L2Rpdj48L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRpdiBjbGFzcz0iZmxleENvbnRh
aW5lciI+CiAgICAgPCEtLSBUaGUgY29udGVudC1ib3ggbWluLXdpZHRoIDEwcHggaXMgdHJhbnNm
ZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWlu
LWhlaWdodDphdXRvIG9mIDIwMHB4LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0i
bWluLXdpZHRoOiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMS8yMDsiPjxkaXY+PC9kaXY+PC9k
aXY+CisgICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi1oZWlnaHQ6YXV0byBvZiAxOTBw
eC4gLS0+CisgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi13aWR0aDogMjVweDsgYXNw
ZWN0LXJhdGlvOiBhdXRvIDEvMTk7Ij48ZGl2PjwvZGl2PjwvZGl2PgogICA8L2Rpdj4KIAogICA8
ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KICAgICA8IS0tIFRoZSBjb250ZW50LWJveCB3aWR0
aCAxMHB4IChjbGFtcGVkIGJ5IG1heC13aWR0aCkgaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4g
YXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLWhlaWdodDphdXRvIG9mIDIw
MHB4LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWF4LXdpZHRoOiAyNXB4OyB3
aWR0aDogMTAwcHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzIwOyI+PGRpdj48L2Rpdj48L2Rpdj4K
KyAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLWhlaWdodDphdXRvIG9mIDE5MHB4LiAt
LT4KKyAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWF4LXdpZHRoOiAyNXB4OyB3aWR0aDog
MTAwcHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE5OyI+PGRpdj48L2Rpdj48L2Rpdj4KICAgPC9k
aXY+CiA8L2h0bWw+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>421915</attachid>
            <date>2021-03-02 01:43:42 -0800</date>
            <delta_ts>2021-03-03 03:35:54 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210302104340.patch</filename>
            <type>text/plain</type>
            <size>12706</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNzI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzBmMTllZTkyZWQ1MWZm
ZDc1NzE0N2ZkNzgyOWZhMjkxYzVlNzJiMy4uYzY3OTNmNDIxYWI2NjdiYWZlY2E2NmE3NjFhYTRl
ZTdkMDEwYWUwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAzLTAyICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBGaXggZmxleC1hc3BlY3QtcmF0aW8tMDI1KzI2Lmh0bWwgYnkgZml4aW5nIHR3byB0aGlu
Z3M6CisgICAgICAgIC0gYXBwbHkgdHJhbnNmZXJyZWQgbWluL21heCBzaXplcyBmb3IgaW50cmlu
c2ljIHNpemluZy4KKyAgICAgICAgLSBtYWtlIGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRp
b1VzaW5nIHRha2UgaW50byBhY2NvdW50CisgICAgICAgICAgYm94LXNpemluZyBmb3IgdGhlIGNh
c2Ugd2hlcmUgQ1NTIGFzcGVjdC1yYXRpbyBpcyBhcHBsaWVkLgorCisgICAgICAgICogcmVuZGVy
aW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhp
YmxlQm94Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyBjb25zdCk6CisgICAg
ICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6YWRqdXN0Q2hpbGRTaXplRm9yTWluQW5k
TWF4KToKKwogMjAyMS0wMy0wMSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAg
ICAgICAgIFtMRkNdW0lGQ10gTW92ZSBzaW1wbGlmaWVkIGJhc2VsaW5lIGFsaWdubWVudCB0byBh
IGRlZGljYXRlZCBmdW5jdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n
L1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJG
bGV4aWJsZUJveC5jcHAKaW5kZXggZDNjZDIyOGM1NmI5MzM5MmNkZjBkYzQ3NDM2YTA5MDIzYzFm
N2MyNC4uNDFhZGIzOGI5MjlmZDVlZWE3MDMwNTM4NDI1YWM5MjgzZTA1ZjM4MCAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9T
b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC03OTMsNyAr
NzkzLDEyIEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZy
b21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJvCiAgICAgICAgIC8vIFdlIG5lZWQgdG8g
c3Vic3RyYWN0IHRoZSBib3JkZXIgYW5kIHBhZGRpbmcgZXh0ZW50IGZyb20gdGhlIGNyb3NzIGF4
aXMuCiAgICAgICAgIC8vIEZ1cnRoZXJtb3JlLCB0aGUgc2l6aW5nIGNhbGN1bGF0aW9ucyB0aGF0
IGZsb29yIHRoZSBjb250ZW50IGJveCBzaXplIGF0IHplcm8gd2hlbiBhcHBseWluZyBib3gtc2l6
aW5nIGFyZSBhbHNvIGlnbm9yZWQuCiAgICAgICAgIC8vIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9y
Zy9jc3MtZmxleGJveC8jYWxnby1tYWluLWl0ZW0uCi0gICAgICAgIGlmIChib3guc3R5bGUoKS5i
b3hTaXppbmcoKSA9PSBCb3hTaXppbmc6OkJvcmRlckJveCkKKyAgICAgICAgYm9vbCBzdWJ0cmFj
dEJvcmRlclBhZGRpbmcgPSBmYWxzZTsKKyAgICAgICAgaWYgKGJveC5zdHlsZSgpLmhhc0FzcGVj
dFJhdGlvKCkpCisgICAgICAgICAgICBzdWJ0cmFjdEJvcmRlclBhZGRpbmcgPSBib3guc3R5bGUo
KS5ib3hTaXppbmdGb3JBc3BlY3RSYXRpbygpID09IEJveFNpemluZzo6Q29udGVudEJveDsKKyAg
ICAgICAgZWxzZSBpZiAoYm94LnN0eWxlKCkuYm94U2l6aW5nKCkgPT0gQm94U2l6aW5nOjpCb3Jk
ZXJCb3gpCisgICAgICAgICAgICBzdWJ0cmFjdEJvcmRlclBhZGRpbmcgPSB0cnVlOworICAgICAg
ICBpZiAoc3VidHJhY3RCb3JkZXJQYWRkaW5nKQogICAgICAgICAgICAgdmFsdWUgLT0gaXNIb3Jp
em9udGFsRmxvdygpID8gYm94LnZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpIDogYm94
Lmhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCk7CiAgICAgICAgIHJldHVybiB2YWx1
ZTsKICAgICB9OwpAQCAtODE2LDE1ICs4MjEsMTggQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJs
ZUJveDo6Y29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoY29uc3QgUmVuZGVyQm8K
IAogICAgIGNvbnN0IExheW91dFNpemUmIGNoaWxkSW50cmluc2ljU2l6ZSA9IGNoaWxkLmludHJp
bnNpY1NpemUoKTsKICAgICBkb3VibGUgcmF0aW87Ci0gICAgaWYgKGNoaWxkLnN0eWxlKCkuYXNw
ZWN0UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpSYXRpbyB8fCAoY2hpbGQuc3R5bGUo
KS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OkF1dG9BbmRSYXRpbyAmJiBj
aGlsZEludHJpbnNpY1NpemUuaXNFbXB0eSgpKSkKKyAgICBMYXlvdXRVbml0IGJvcmRlclBhZGRp
bmc7CisgICAgaWYgKGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0
aW9UeXBlOjpSYXRpbyB8fCAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3Bl
Y3RSYXRpb1R5cGU6OkF1dG9BbmRSYXRpbyAmJiBjaGlsZEludHJpbnNpY1NpemUuaXNFbXB0eSgp
KSkgewogICAgICAgICByYXRpbyA9IGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9XaWR0aCgpIC8g
Y2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb0hlaWdodCgpOwotICAgIGVsc2UgeworICAgICAgICBp
ZiAoY2hpbGQuc3R5bGUoKS5ib3hTaXppbmdGb3JBc3BlY3RSYXRpbygpID09IEJveFNpemluZzo6
Qm9yZGVyQm94KQorICAgICAgICAgICAgYm9yZGVyUGFkZGluZyA9IGlzSG9yaXpvbnRhbEZsb3co
KSA/IGNoaWxkLmhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCkgOiBjaGlsZC52ZXJ0
aWNhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKTsKKyAgICB9IGVsc2UgewogICAgICAgICBBU1NF
UlQoY2hpbGRJbnRyaW5zaWNTaXplLmhlaWdodCgpKTsKICAgICAgICAgcmF0aW8gPSBjaGlsZElu
dHJpbnNpY1NpemUud2lkdGgoKS50b0Zsb2F0KCkgLyBjaGlsZEludHJpbnNpY1NpemUuaGVpZ2h0
KCkudG9GbG9hdCgpOwogICAgIH0KICAgICBpZiAoaXNIb3Jpem9udGFsRmxvdygpKQotICAgICAg
ICByZXR1cm4gTGF5b3V0VW5pdChjcm9zc1NpemUudmFsdWUoKSAqIHJhdGlvKTsKLSAgICByZXR1
cm4gTGF5b3V0VW5pdChjcm9zc1NpemUudmFsdWUoKSAvIHJhdGlvKTsKKyAgICAgICAgcmV0dXJu
IExheW91dFVuaXQoY3Jvc3NTaXplLnZhbHVlKCkgKiByYXRpbykgLSBib3JkZXJQYWRkaW5nOwor
ICAgIHJldHVybiBMYXlvdXRVbml0KGNyb3NzU2l6ZS52YWx1ZSgpIC8gcmF0aW8pIC0gYm9yZGVy
UGFkZGluZzsKIH0KIAogdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6c2V0Rmxvd0F3YXJlTG9jYXRp
b25Gb3JDaGlsZChSZW5kZXJCb3gmIGNoaWxkLCBjb25zdCBMYXlvdXRQb2ludCYgbG9jYXRpb24p
CkBAIC0xMTkxLDExICsxMTk5LDE5IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmFk
anVzdENoaWxkU2l6ZUZvck1pbkFuZE1heChjb25zdCBSZW5kZXJCb3gmIGNoaWxkCiAgICAgICAg
IG1heEV4dGVudCA9IGNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNoaWxkLCBNYXhTaXpl
LCBtYXgpOwogICAgICAgICBjaGlsZFNpemUgPSBzdGQ6Om1pbihjaGlsZFNpemUsIG1heEV4dGVu
dC52YWx1ZU9yKGNoaWxkU2l6ZSkpOwogICAgIH0KKyAgICBMZW5ndGggY3Jvc3NNYXggPSBjcm9z
c1NpemVMZW5ndGhGb3JDaGlsZChNYXhTaXplLCBjaGlsZCk7CisgICAgaWYgKGNoaWxkLnN0eWxl
KCkuaGFzQXNwZWN0UmF0aW8oKSAmJiBjaGlsZENyb3NzU2l6ZUlzRGVmaW5pdGUoY2hpbGQsIGNy
b3NzTWF4KSkgeworICAgICAgICBtYXhFeHRlbnQgPSBjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0
UmF0aW9Vc2luZyhjaGlsZCwgY3Jvc3NNYXgpOworICAgICAgICBjaGlsZFNpemUgPSBzdGQ6Om1p
bihjaGlsZFNpemUsIG1heEV4dGVudC52YWx1ZU9yKGNoaWxkU2l6ZSkpOworICAgIH0KIAogICAg
IExlbmd0aCBtaW4gPSBtYWluU2l6ZUxlbmd0aEZvckNoaWxkKE1pblNpemUsIGNoaWxkKTsKICAg
ICBpZiAobWluLmlzU3BlY2lmaWVkT3JJbnRyaW5zaWMoKSkKICAgICAgICAgcmV0dXJuIHN0ZDo6
bWF4KGNoaWxkU2l6ZSwgc3RkOjptYXgoMF9sdSwgY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hp
bGQoY2hpbGQsIE1pblNpemUsIG1pbikudmFsdWVPcihjaGlsZFNpemUpKSk7Ci0gICAgCisgICAg
TGVuZ3RoIGNyb3NzTWluID0gY3Jvc3NTaXplTGVuZ3RoRm9yQ2hpbGQoTWluU2l6ZSwgY2hpbGQp
OworICAgIGlmIChjaGlsZC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkgJiYgY2hpbGRDcm9zc1Np
emVJc0RlZmluaXRlKGNoaWxkLCBjcm9zc01pbikpCisgICAgICAgIHJldHVybiBzdGQ6Om1heChj
aGlsZFNpemUsIGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNoaWxkLCBjcm9z
c01pbikpOworCiAgICAgaWYgKHNob3VsZEFwcGx5TWluU2l6ZUF1dG9Gb3JDaGlsZChjaGlsZCkp
IHsKICAgICAgICAgLy8gRklYTUU6IElmIHRoZSBtaW4gdmFsdWUgaXMgZXhwZWN0ZWQgdG8gYmUg
dmFsaWQgaGVyZSwgd2UgbmVlZCB0byBjb21lIHVwIHdpdGggYSBub24gb3B0aW9uYWwgdmVyc2lv
biBvZiBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZCBhbmQKICAgICAgICAgLy8gZW5zdXJl
IGl0J3MgdmFsaWQgdGhyb3VnaCB0aGUgdmlydHVhbCBjYWxscyBvZiBjb21wdXRlSW50cmluc2lj
TG9naWNhbENvbnRlbnRIZWlnaHRVc2luZy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n
ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA0NDg5YjgxYjg4MmUyYzA1NWM2MjNk
OTg3N2Y1ZWEyYjI1MGYxOTVmLi5mYTdmMDNkMDIzYjc3NjA0Mjc0MGI4NGVkYTY3NTE0NjJlNjE4
ZDI5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv
Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDMtMDIgIFJvYiBCdWlzICA8cmJ1aXNA
aWdhbGlhLmNvbT4KKworICAgICAgICBGaXggZmxleC1hc3BlY3QtcmF0aW8tMDI1KzI2Lmh0bWwK
KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjM1Nwor
CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkYXB0IHBs
YXRmb3JtIHRlc3QgZXhwZWN0YXRpb25zLgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoK
KwogMjAyMS0wMy0wMSAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4K
IAogICAgICAgICBbR1RLXSBXZWIgaW5zcGVjdG9yIHJlbGF0ZWQgdGVzdHMgdmVyeSBzbG93IG9y
IHRpbWVvdXQgaW4gZGVidWcgbW9kZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv
dzNjL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXgg
MjBlNjVjMGViYmFjZWE5MDNlOTU1MGU2NzYyNzllYTQ3NWVlYTIwYS4uNWIyNjA4NDhhOGEyYThl
Yzk1MDAzMGYwOGQ5NDk3MjZiNDI1ZDEzMSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0
ZWQvdzNjL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9n
CkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMDMtMDIgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNv
bT4KKworICAgICAgICBGaXggZmxleC1hc3BlY3QtcmF0aW8tMDI1KzI2Lmh0bWwKKyAgICAgICAg
aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjM1NworCisgICAgICAg
IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN5bmMgdGhlc2UgdGVzdHMg
dG8gdGVzdCBib3RoIG1haW4gYW5kIGNyb3NzIHNpemUgcGFkZGluZy4KKworICAgICAgICAqIHdl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3Qt
cmF0aW8tMDI1Lmh0bWw6CisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6
aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbDoKKwogMjAyMS0wMi0y
OCAgQW50b2luZSBRdWludCAgPGdyYW91dHNAd2Via2l0Lm9yZz4KIAogICAgICAgICBCbGVuZGlu
ZyBvZiBib3JkZXItaW1hZ2Utd2lkdGggc2hvdWxkIGJlIGRpc2NyZXRlIGJldHdlZW4gImF1dG8i
IHZhbHVlcyBhbmQgb3RoZXIgdHlwZXMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBl
Y3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGQ5NWQ0MGY2MTNj
Zjc3ODFlNDFjZWYwM2RmNzllN2I2MzY0Njk0ZjMuLjhkYzE4OTI1N2JjN2IxY2Q4NjE4Yzk2Y2Ri
YTM4MDQ1ZjIzODYzZTkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMK
KysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDU1NCw4ICs0NTU0LDYgQEAg
d2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby8KICMgZmxleC1iYXNpczpjb250ZW50CiB3ZWJraXQub3Jn
L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv
YXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMi5odG1sIFsg
SW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJh
dGlvLTAyNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGlt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv
L2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQu
b3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp
bmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxNS5odG1sIFsgSW1hZ2VPbmx5RmFp
bHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxNi5odG1s
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0
LXJhdGlvLTAxNy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj
dC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbCBiL0xheW91dFRlc3RzL2ltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgt
YXNwZWN0LXJhdGlvLTAyNS5odG1sCmluZGV4IGZhOWNlOGViY2U2OWYwMmU2YjEzZDlkMjIzM2Qx
ZTNiNDZjN2YxYWIuLmM0ZmY4MTEwZDdiZWQ3MDc5Yzg2NGRkZjE5MmY4MjQyOTMyZTU4OGQgMTAw
NjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1sCisrKyBi
L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp
bmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1sCkBAIC0xNCw2ICsxNCw3
IEBACiAgIC5pdGVtIHsKICAgICBiYWNrZ3JvdW5kOiBncmVlbjsKICAgICBwYWRkaW5nLXRvcDog
MTVweDsKKyAgICBwYWRkaW5nLWxlZnQ6IDEwcHg7CiAgICAgYm94LXNpemluZzogYm9yZGVyLWJv
eDsKICAgfQogICA8L3N0eWxlPgpAQCAtNDksMjUgKzUwLDI1IEBACiAgICAgICAgYmVjYXVzZSBp
dHMgdmFsdWUgY29udGFpbnMgJ2F1dG8nLiAtLT4KICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5l
ciIgc3R5bGU9IndpZHRoOiBhdXRvOyI+CiAgICAgPCEtLSBUaGUgY29udGVudC1ib3ggaGVpZ2h0
IDEwcHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5n
IGEgcmVzb2x2ZWQgZmxleCBiYXNlIHNpemUgb2YgMjAwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9
Iml0ZW0iIHN0eWxlPSJtaW4td2lkdGg6MDsgaGVpZ2h0OiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1
dG8gMjAvMTsiPjwvZGl2PgorICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBmbGV4IGJhc2Ug
c2l6ZSBvZiAxOTBweC4gLS0+CisgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi13aWR0
aDowOyBoZWlnaHQ6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxOS8xOyI+PC9kaXY+CiAgIDwv
ZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgogICAgIDwhLS0gVGhlIGNvbnRl
bnQtYm94IGhlaWdodCAxMHB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMsCi0gICAg
ICAgICB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi13aWR0aDphdXRvIG9mIDIwMHB4LiAtLT4KLSAg
ICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0iaGVpZ2h0OiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1
dG8gMjAvMTsiPjwvZGl2PgorICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4td2lkdGg6
YXV0byBvZiAxOTBweC4gLS0+CisgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9ImhlaWdodDog
MjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDE5LzE7Ij48L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRp
diBjbGFzcz0iZmxleENvbnRhaW5lciI+CiAgICAgPCEtLSBUaGUgY29udGVudC1ib3ggbWluLWhl
aWdodCAxMHB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVs
ZGluZyBhIHJlc29sdmVkIG1pbi13aWR0aDphdXRvIG9mIDIwMHB4LiAtLT4KLSAgICA8ZGl2IGNs
YXNzPSJpdGVtIiBzdHlsZT0ibWluLWhlaWdodDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDIw
LzE7Ij48L2Rpdj4KKyAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLXdpZHRoOmF1dG8g
b2YgMTkwcHguIC0tPgorICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4taGVpZ2h0OiAy
NXB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMTkvMTsiPjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2
IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KICAgICA8IS0tIFRoZSBjb250ZW50LWJveCBoZWlnaHQg
MTBweCAoY2xhbXBlZCBieSBtYXgtaGVpZ2h0KSBpcyB0cmFuc2ZlcnJlZAotICAgICAgICAgdG8g
dGhlIG1haW4gYXhpcywgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4td2lkdGg6YXV0byBvZiAyMDBw
eC4gLS0+Ci0gICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1heC1oZWlnaHQ6IDI1cHg7IGhl
aWdodDogMTAwcHg7IGFzcGVjdC1yYXRpbzogYXV0byAyMC8xOyI+PC9kaXY+CisgICAgICAgICB0
byB0aGUgbWFpbiBheGlzLCB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi13aWR0aDphdXRvIG9mIDE5
MHB4LiAtLT4KKyAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWF4LWhlaWdodDogMjVweDsg
aGVpZ2h0OiAxMDBweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDE5LzE7Ij48L2Rpdj4KICAgPC9kaXY+
CiA8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0w
MjYuaHRtbCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sCmluZGV4
IDFkZjE0NDY4NjMyYmFhOGZmZDAzZDY5MGY3ZGRhYTYxOGFjZDdiZjYuLmM0YTI1MDgxOGJiNzc4
NmUyZjM5NTkyMmQyOGUzYzc1MTliNGVhM2EgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Zs
ZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0
LXJhdGlvLTAyNi5odG1sCkBAIC0xNSw2ICsxNSw3IEBACiAgIC5pdGVtIHsKICAgICBiYWNrZ3Jv
dW5kOiBncmVlbjsKICAgICBwYWRkaW5nLWxlZnQ6IDE1cHg7CisgICAgcGFkZGluZy10b3A6IDEw
cHg7CiAgICAgYm94LXNpemluZzogYm9yZGVyLWJveDsKICAgfQogICAuaXRlbSA+IGRpdiB7CkBA
IC01MywyNSArNTQsMjUgQEAKICAgICAgICBiZWNhdXNlIGl0cyB2YWx1ZSBjb250YWlucyAnYXV0
bycuIC0tPgogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIiBzdHlsZT0iaGVpZ2h0OiBhdXRv
OyI+CiAgICAgPCEtLSBUaGUgY29udGVudC1ib3ggd2lkdGggMTBweCBpcyB0cmFuc2ZlcnJlZCB0
byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBmbGV4IGJhc2Ug
c2l6ZSBvZiAyMDBweC4gLS0+Ci0gICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi1oZWln
aHQ6MDsgd2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzIwOyI+PGRpdj48L2Rpdj48
L2Rpdj4KKyAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgZmxleCBiYXNlIHNpemUgb2YgMTkw
cHguIC0tPgorICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4taGVpZ2h0OjA7IHdpZHRo
OiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMS8xOTsiPjxkaXY+PC9kaXY+PC9kaXY+CiAgIDwv
ZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgogICAgIDwhLS0gVGhlIGNvbnRl
bnQtYm94IHdpZHRoIDEwcHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAg
ICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLWhlaWdodDphdXRvIG9mIDIwMHB4LiAtLT4KLSAg
ICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0id2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0
byAxLzIwOyI+PGRpdj48L2Rpdj48L2Rpdj4KKyAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQg
bWluLWhlaWdodDphdXRvIG9mIDE5MHB4LiAtLT4KKyAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHls
ZT0id2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE5OyI+PGRpdj48L2Rpdj48L2Rp
dj4KICAgPC9kaXY+CiAKICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciI+CiAgICAgPCEtLSBU
aGUgY29udGVudC1ib3ggbWluLXdpZHRoIDEwcHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4g
YXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLWhlaWdodDphdXRvIG9mIDIw
MHB4LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWluLXdpZHRoOiAyNXB4OyBh
c3BlY3QtcmF0aW86IGF1dG8gMS8yMDsiPjxkaXY+PC9kaXY+PC9kaXY+CisgICAgICAgICB5aWVs
ZGluZyBhIHJlc29sdmVkIG1pbi1oZWlnaHQ6YXV0byBvZiAxOTBweC4gLS0+CisgICAgPGRpdiBj
bGFzcz0iaXRlbSIgc3R5bGU9Im1pbi13aWR0aDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEv
MTk7Ij48ZGl2PjwvZGl2PjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29u
dGFpbmVyIj4KICAgICA8IS0tIFRoZSBjb250ZW50LWJveCB3aWR0aCAxMHB4IChjbGFtcGVkIGJ5
IG1heC13aWR0aCkgaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlp
ZWxkaW5nIGEgcmVzb2x2ZWQgbWluLWhlaWdodDphdXRvIG9mIDIwMHB4LiAtLT4KLSAgICA8ZGl2
IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWF4LXdpZHRoOiAyNXB4OyB3aWR0aDogMTAwcHg7IGFzcGVj
dC1yYXRpbzogYXV0byAxLzIwOyI+PGRpdj48L2Rpdj48L2Rpdj4KKyAgICAgICAgIHlpZWxkaW5n
IGEgcmVzb2x2ZWQgbWluLWhlaWdodDphdXRvIG9mIDE5MHB4LiAtLT4KKyAgICA8ZGl2IGNsYXNz
PSJpdGVtIiBzdHlsZT0ibWF4LXdpZHRoOiAyNXB4OyB3aWR0aDogMTAwcHg7IGFzcGVjdC1yYXRp
bzogYXV0byAxLzE5OyI+PGRpdj48L2Rpdj48L2Rpdj4KICAgPC9kaXY+CiA8L2h0bWw+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>422056</attachid>
            <date>2021-03-03 03:35:59 -0800</date>
            <delta_ts>2021-03-03 05:40:24 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210303123557.patch</filename>
            <type>text/plain</type>
            <size>14113</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczODEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWJkNjE2NDJlZmJlNmE2
MzIzNjgxYjg4Mjg1OWViMTg5NjIwODk4ZC4uMTk5MDA3ZmJjNjJiNTc0MmZkODZkNzY0MzZhYmRk
YzNlZTdjZmM0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTAzLTAzICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBGaXggZmxleC1hc3BlY3QtcmF0aW8tMDI1KzI2Lmh0bWwgYnkgZml4aW5nIHR3byB0aGlu
Z3M6CisgICAgICAgIC0gYXBwbHkgdHJhbnNmZXJyZWQgbWluL21heCBzaXplcyBmb3IgaW50cmlu
c2ljIHNpemluZy4KKyAgICAgICAgLSBtYWtlIGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRp
b1VzaW5nIHRha2UgaW50byBhY2NvdW50CisgICAgICAgICAgYm94LXNpemluZyBmb3IgdGhlIGNh
c2Ugd2hlcmUgQ1NTIGFzcGVjdC1yYXRpbyBpcyBhcHBsaWVkLgorCisgICAgICAgIEJlaGF2aW9y
IG1hdGNoZXMgQ2hyb21lIGFuZCBGaXJlZm94LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl
ckZsZXhpYmxlQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpj
b21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyBjb25zdCk6CisgICAgICAgIChXZWJD
b3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6YWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KToKKwog
MjAyMS0wMy0wMiAgTWFudWVsIFJlZ28gQ2FzYXNub3ZhcyAgPHJlZ29AaWdhbGlhLmNvbT4KIAog
ICAgICAgICBbc2VsZWN0b3JzXSA6Zm9jdXMtdmlzaWJsZSBpbXBsZW1lbnRhdGlvbgpkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1Nv
dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKaW5kZXggZDNjZDIy
OGM1NmI5MzM5MmNkZjBkYzQ3NDM2YTA5MDIzYzFmN2MyNC4uZDU3NTcxNGE3NzMwNjAxMTgxYzc3
OTVmNmQwMDdkNmQ5MzM0NTIzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n
L1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu
ZGVyRmxleGlibGVCb3guY3BwCkBAIC03OTMsNyArNzkzLDEyIEBAIExheW91dFVuaXQgUmVuZGVy
RmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJl
bmRlckJvCiAgICAgICAgIC8vIFdlIG5lZWQgdG8gc3Vic3RyYWN0IHRoZSBib3JkZXIgYW5kIHBh
ZGRpbmcgZXh0ZW50IGZyb20gdGhlIGNyb3NzIGF4aXMuCiAgICAgICAgIC8vIEZ1cnRoZXJtb3Jl
LCB0aGUgc2l6aW5nIGNhbGN1bGF0aW9ucyB0aGF0IGZsb29yIHRoZSBjb250ZW50IGJveCBzaXpl
IGF0IHplcm8gd2hlbiBhcHBseWluZyBib3gtc2l6aW5nIGFyZSBhbHNvIGlnbm9yZWQuCiAgICAg
ICAgIC8vIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZmxleGJveC8jYWxnby1tYWluLWl0
ZW0uCi0gICAgICAgIGlmIChib3guc3R5bGUoKS5ib3hTaXppbmcoKSA9PSBCb3hTaXppbmc6OkJv
cmRlckJveCkKKyAgICAgICAgYm9vbCBzdWJ0cmFjdEJvcmRlclBhZGRpbmcgPSBmYWxzZTsKKyAg
ICAgICAgaWYgKGJveC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpCisgICAgICAgICAgICBzdWJ0
cmFjdEJvcmRlclBhZGRpbmcgPSBib3guc3R5bGUoKS5ib3hTaXppbmdGb3JBc3BlY3RSYXRpbygp
ID09IEJveFNpemluZzo6Q29udGVudEJveDsKKyAgICAgICAgZWxzZSBpZiAoYm94LnN0eWxlKCku
Ym94U2l6aW5nKCkgPT0gQm94U2l6aW5nOjpCb3JkZXJCb3gpCisgICAgICAgICAgICBzdWJ0cmFj
dEJvcmRlclBhZGRpbmcgPSB0cnVlOworICAgICAgICBpZiAoc3VidHJhY3RCb3JkZXJQYWRkaW5n
KQogICAgICAgICAgICAgdmFsdWUgLT0gaXNIb3Jpem9udGFsRmxvdygpID8gYm94LnZlcnRpY2Fs
Qm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpIDogYm94Lmhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5n
RXh0ZW50KCk7CiAgICAgICAgIHJldHVybiB2YWx1ZTsKICAgICB9OwpAQCAtODE2LDE1ICs4MjEs
MTggQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJvbUFz
cGVjdFJhdGlvVXNpbmcoY29uc3QgUmVuZGVyQm8KIAogICAgIGNvbnN0IExheW91dFNpemUmIGNo
aWxkSW50cmluc2ljU2l6ZSA9IGNoaWxkLmludHJpbnNpY1NpemUoKTsKICAgICBkb3VibGUgcmF0
aW87Ci0gICAgaWYgKGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0
aW9UeXBlOjpSYXRpbyB8fCAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3Bl
Y3RSYXRpb1R5cGU6OkF1dG9BbmRSYXRpbyAmJiBjaGlsZEludHJpbnNpY1NpemUuaXNFbXB0eSgp
KSkKKyAgICBMYXlvdXRVbml0IGJvcmRlclBhZGRpbmc7CisgICAgaWYgKGNoaWxkLnN0eWxlKCku
YXNwZWN0UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpSYXRpbyB8fCAoY2hpbGQuc3R5
bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OkF1dG9BbmRSYXRpbyAm
JiBjaGlsZEludHJpbnNpY1NpemUuaXNFbXB0eSgpKSkgewogICAgICAgICByYXRpbyA9IGNoaWxk
LnN0eWxlKCkuYXNwZWN0UmF0aW9XaWR0aCgpIC8gY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb0hl
aWdodCgpOwotICAgIGVsc2UgeworICAgICAgICBpZiAoY2hpbGQuc3R5bGUoKS5ib3hTaXppbmdG
b3JBc3BlY3RSYXRpbygpID09IEJveFNpemluZzo6Qm9yZGVyQm94KQorICAgICAgICAgICAgYm9y
ZGVyUGFkZGluZyA9IGlzSG9yaXpvbnRhbEZsb3coKSA/IGNoaWxkLmhvcml6b250YWxCb3JkZXJB
bmRQYWRkaW5nRXh0ZW50KCkgOiBjaGlsZC52ZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQo
KTsKKyAgICB9IGVsc2UgewogICAgICAgICBBU1NFUlQoY2hpbGRJbnRyaW5zaWNTaXplLmhlaWdo
dCgpKTsKICAgICAgICAgcmF0aW8gPSBjaGlsZEludHJpbnNpY1NpemUud2lkdGgoKS50b0Zsb2F0
KCkgLyBjaGlsZEludHJpbnNpY1NpemUuaGVpZ2h0KCkudG9GbG9hdCgpOwogICAgIH0KICAgICBp
ZiAoaXNIb3Jpem9udGFsRmxvdygpKQotICAgICAgICByZXR1cm4gTGF5b3V0VW5pdChjcm9zc1Np
emUudmFsdWUoKSAqIHJhdGlvKTsKLSAgICByZXR1cm4gTGF5b3V0VW5pdChjcm9zc1NpemUudmFs
dWUoKSAvIHJhdGlvKTsKKyAgICAgICAgcmV0dXJuIExheW91dFVuaXQoY3Jvc3NTaXplLnZhbHVl
KCkgKiByYXRpbykgLSBib3JkZXJQYWRkaW5nOworICAgIHJldHVybiBMYXlvdXRVbml0KGNyb3Nz
U2l6ZS52YWx1ZSgpIC8gcmF0aW8pIC0gYm9yZGVyUGFkZGluZzsKIH0KIAogdm9pZCBSZW5kZXJG
bGV4aWJsZUJveDo6c2V0Rmxvd0F3YXJlTG9jYXRpb25Gb3JDaGlsZChSZW5kZXJCb3gmIGNoaWxk
LCBjb25zdCBMYXlvdXRQb2ludCYgbG9jYXRpb24pCkBAIC0xMTkxLDExICsxMTk5LDE5IEBAIExh
eW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heChj
b25zdCBSZW5kZXJCb3gmIGNoaWxkCiAgICAgICAgIG1heEV4dGVudCA9IGNvbXB1dGVNYWluQXhp
c0V4dGVudEZvckNoaWxkKGNoaWxkLCBNYXhTaXplLCBtYXgpOwogICAgICAgICBjaGlsZFNpemUg
PSBzdGQ6Om1pbihjaGlsZFNpemUsIG1heEV4dGVudC52YWx1ZU9yKGNoaWxkU2l6ZSkpOwogICAg
IH0KKyAgICBMZW5ndGggY3Jvc3NNYXggPSBjcm9zc1NpemVMZW5ndGhGb3JDaGlsZChNYXhTaXpl
LCBjaGlsZCk7CisgICAgaWYgKGNoaWxkLnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSAmJiAhY2hp
bGRNYWluU2l6ZUlzRGVmaW5pdGUoY2hpbGQsIGZsZXhCYXNpc0ZvckNoaWxkKGNoaWxkKSkgJiYg
Y2hpbGRDcm9zc1NpemVJc0RlZmluaXRlKGNoaWxkLCBjcm9zc01heCkpIHsKKyAgICAgICAgbWF4
RXh0ZW50ID0gY29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoY2hpbGQsIGNyb3Nz
TWF4KTsKKyAgICAgICAgY2hpbGRTaXplID0gc3RkOjptaW4oY2hpbGRTaXplLCBtYXhFeHRlbnQu
dmFsdWVPcihjaGlsZFNpemUpKTsKKyAgICB9CiAKICAgICBMZW5ndGggbWluID0gbWFpblNpemVM
ZW5ndGhGb3JDaGlsZChNaW5TaXplLCBjaGlsZCk7CiAgICAgaWYgKG1pbi5pc1NwZWNpZmllZE9y
SW50cmluc2ljKCkpCiAgICAgICAgIHJldHVybiBzdGQ6Om1heChjaGlsZFNpemUsIHN0ZDo6bWF4
KDBfbHUsIGNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNoaWxkLCBNaW5TaXplLCBtaW4p
LnZhbHVlT3IoY2hpbGRTaXplKSkpOwotICAgIAorICAgIExlbmd0aCBjcm9zc01pbiA9IGNyb3Nz
U2l6ZUxlbmd0aEZvckNoaWxkKE1pblNpemUsIGNoaWxkKTsKKyAgICBpZiAoY2hpbGQuc3R5bGUo
KS5oYXNBc3BlY3RSYXRpbygpICYmICFjaGlsZE1haW5TaXplSXNEZWZpbml0ZShjaGlsZCwgZmxl
eEJhc2lzRm9yQ2hpbGQoY2hpbGQpKSAmJiBjaGlsZENyb3NzU2l6ZUlzRGVmaW5pdGUoY2hpbGQs
IGNyb3NzTWluKSkKKyAgICAgICAgcmV0dXJuIHN0ZDo6bWF4KGNoaWxkU2l6ZSwgY29tcHV0ZU1h
aW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoY2hpbGQsIGNyb3NzTWluKSk7CisKICAgICBpZiAo
c2hvdWxkQXBwbHlNaW5TaXplQXV0b0ZvckNoaWxkKGNoaWxkKSkgewogICAgICAgICAvLyBGSVhN
RTogSWYgdGhlIG1pbiB2YWx1ZSBpcyBleHBlY3RlZCB0byBiZSB2YWxpZCBoZXJlLCB3ZSBuZWVk
IHRvIGNvbWUgdXAgd2l0aCBhIG5vbiBvcHRpb25hbCB2ZXJzaW9uIG9mIGNvbXB1dGVNYWluQXhp
c0V4dGVudEZvckNoaWxkIGFuZAogICAgICAgICAvLyBlbnN1cmUgaXQncyB2YWxpZCB0aHJvdWdo
IHRoZSB2aXJ0dWFsIGNhbGxzIG9mIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsQ29udGVudEhlaWdo
dFVzaW5nLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMv
Q2hhbmdlTG9nCmluZGV4IDAxNjliNDgwYWRhNTZjMDAyZjhiNWY4Y2M3YmFjZjYyNzQ5ZTcwM2Uu
LjAxNjkwYTcwOWU4OWY2OTc4OTBhOTA0Y2NmMmZiYzBkYTlkYjQwYWYgMTAwNjQ0Ci0tLSBhL0xh
eW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyAr
MSwxNCBAQAorMjAyMS0wMy0wMyAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAg
ICAgIEZpeCBmbGV4LWFzcGVjdC1yYXRpby0wMjUrMjYuaHRtbAorICAgICAgICBodHRwczovL2J1
Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyMzU3CisKKyAgICAgICAgUmV2aWV3ZWQg
YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRhcHQgcGxhdGZvcm0gdGVzdCBleHBlY3Rh
dGlvbnMuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTAzLTAyICBNYW51
ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtzZWxlY3Rv
cnNdIDpmb2N1cy12aXNpYmxlIGltcGxlbWVudGF0aW9uCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0
cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5n
ZUxvZwppbmRleCAzMDdhYTYzNzE1OTg1MTJiNTI2Nzg0YjRiMjNjNjBlYjE0NTgwMDAyLi5jM2Ri
NDJkNDg1MmQ3ZDdiNTc4NDJkZTQyYWY4MzRhZTk2MzkwMjI2IDEwMDY0NAotLS0gYS9MYXlvdXRU
ZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz
Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMS0wMy0wMyAgUm9iIEJ1aXMgIDxyYnVp
c0BpZ2FsaWEuY29tPgorCisgICAgICAgIEZpeCBmbGV4LWFzcGVjdC1yYXRpby0wMjUrMjYuaHRt
bAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyMzU3
CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3luYyB0
aGVzZSB0ZXN0cyB0byB0ZXN0IGJvdGggbWFpbiBhbmQgY3Jvc3Mgc2l6ZSBwYWRkaW5nLgorCisg
ICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9m
bGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbDoKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sOgor
CiAyMDIxLTAzLTAyICBNYW51ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgog
CiAgICAgICAgIFtzZWxlY3RvcnNdIDpmb2N1cy12aXNpYmxlIGltcGxlbWVudGF0aW9uCmRpZmYg
LS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4
cGVjdGF0aW9ucwppbmRleCBkNTE3MmJlZmU1NTJmNWRmYmYxMjA0OTNlOGI4M2I0MzVlNTQxZmY0
Li5hYTg4NjUwNDA1OWE4MzhkNGI2YmI1YjYwMmZmMjIxZjMyY2EwYzQ1IDEwMDY0NAotLS0gYS9M
YXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3Rh
dGlvbnMKQEAgLTQ1NTQsOCArNDU1NCw2IEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vCiAjIGZs
ZXgtYmFzaXM6Y29udGVudAogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRp
by0wMjEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9m
bGV4LWFzcGVjdC1yYXRpby0wMjIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9y
Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n
L2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbCBbIEltYWdlT25seUZhaWx1
cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbCBb
IEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1y
YXRpby0wMTUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp
by9ncmlkLWFzcGVjdC1yYXRpby0wMTYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0
Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6
aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTcuaHRtbCBbIEltYWdlT25seUZh
aWx1cmUgXQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1
Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbAppbmRleCBm
YTljZThlYmNlNjlmMDJlNmIxM2Q5ZDIyMzNkMWUzYjQ2YzdmMWFiLi5jNGZmODExMGQ3YmVkNzA3
OWM4NjRkZGYxOTJmODI0MjkzMmU1ODhkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4
LWFzcGVjdC1yYXRpby0wMjUuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1y
YXRpby0wMjUuaHRtbApAQCAtMTQsNiArMTQsNyBAQAogICAuaXRlbSB7CiAgICAgYmFja2dyb3Vu
ZDogZ3JlZW47CiAgICAgcGFkZGluZy10b3A6IDE1cHg7CisgICAgcGFkZGluZy1sZWZ0OiAxMHB4
OwogICAgIGJveC1zaXppbmc6IGJvcmRlci1ib3g7CiAgIH0KICAgPC9zdHlsZT4KQEAgLTQ5LDI1
ICs1MCwyNSBAQAogICAgICAgIGJlY2F1c2UgaXRzIHZhbHVlIGNvbnRhaW5zICdhdXRvJy4gLS0+
CiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiIHN0eWxlPSJ3aWR0aDogYXV0bzsiPgogICAg
IDwhLS0gVGhlIGNvbnRlbnQtYm94IGhlaWdodCAxMHB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBt
YWluIGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIGZsZXggYmFzZSBzaXplIG9m
IDIwMHB4LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWluLXdpZHRoOjA7IGhl
aWdodDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDIwLzE7Ij48L2Rpdj4KKyAgICAgICAgIHlp
ZWxkaW5nIGEgcmVzb2x2ZWQgZmxleCBiYXNlIHNpemUgb2YgMTkwcHguIC0tPgorICAgIDxkaXYg
Y2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4td2lkdGg6MDsgaGVpZ2h0OiAyNXB4OyBhc3BlY3QtcmF0
aW86IGF1dG8gMTkvMTsiPjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29u
dGFpbmVyIj4KICAgICA8IS0tIFRoZSBjb250ZW50LWJveCBoZWlnaHQgMTBweCBpcyB0cmFuc2Zl
cnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4t
d2lkdGg6YXV0byBvZiAyMDBweC4gLS0+Ci0gICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Imhl
aWdodDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDIwLzE7Ij48L2Rpdj4KKyAgICAgICAgIHlp
ZWxkaW5nIGEgcmVzb2x2ZWQgbWluLXdpZHRoOmF1dG8gb2YgMTkwcHguIC0tPgorICAgIDxkaXYg
Y2xhc3M9Iml0ZW0iIHN0eWxlPSJoZWlnaHQ6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxOS8x
OyI+PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgogICAg
IDwhLS0gVGhlIGNvbnRlbnQtYm94IG1pbi1oZWlnaHQgMTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0
aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4td2lkdGg6YXV0
byBvZiAyMDBweC4gLS0+Ci0gICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi1oZWlnaHQ6
IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAyMC8xOyI+PC9kaXY+CisgICAgICAgICB5aWVsZGlu
ZyBhIHJlc29sdmVkIG1pbi13aWR0aDphdXRvIG9mIDE5MHB4LiAtLT4KKyAgICA8ZGl2IGNsYXNz
PSJpdGVtIiBzdHlsZT0ibWluLWhlaWdodDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDE5LzE7
Ij48L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciI+CiAgICAg
PCEtLSBUaGUgY29udGVudC1ib3ggaGVpZ2h0IDEwcHggKGNsYW1wZWQgYnkgbWF4LWhlaWdodCkg
aXMgdHJhbnNmZXJyZWQKLSAgICAgICAgIHRvIHRoZSBtYWluIGF4aXMsIHlpZWxkaW5nIGEgcmVz
b2x2ZWQgbWluLXdpZHRoOmF1dG8gb2YgMjAwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0i
IHN0eWxlPSJtYXgtaGVpZ2h0OiAyNXB4OyBoZWlnaHQ6IDEwMHB4OyBhc3BlY3QtcmF0aW86IGF1
dG8gMjAvMTsiPjwvZGl2PgorICAgICAgICAgdG8gdGhlIG1haW4gYXhpcywgeWllbGRpbmcgYSBy
ZXNvbHZlZCBtaW4td2lkdGg6YXV0byBvZiAxOTBweC4gLS0+CisgICAgPGRpdiBjbGFzcz0iaXRl
bSIgc3R5bGU9Im1heC1oZWlnaHQ6IDI1cHg7IGhlaWdodDogMTAwcHg7IGFzcGVjdC1yYXRpbzog
YXV0byAxOS8xOyI+PC9kaXY+CiAgIDwvZGl2PgogPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0
VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl
Y3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4
LWFzcGVjdC1yYXRpby0wMjYuaHRtbAppbmRleCAxZGYxNDQ2ODYzMmJhYThmZmQwM2Q2OTBmN2Rk
YWE2MThhY2Q3YmY2Li5jNGEyNTA4MThiYjc3ODZlMmYzOTU5MjJkMjhlM2M3NTE5YjRlYTNhIDEw
MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbAorKysg
Yi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6
aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbApAQCAtMTUsNiArMTUs
NyBAQAogICAuaXRlbSB7CiAgICAgYmFja2dyb3VuZDogZ3JlZW47CiAgICAgcGFkZGluZy1sZWZ0
OiAxNXB4OworICAgIHBhZGRpbmctdG9wOiAxMHB4OwogICAgIGJveC1zaXppbmc6IGJvcmRlci1i
b3g7CiAgIH0KICAgLml0ZW0gPiBkaXYgewpAQCAtNTMsMjUgKzU0LDI1IEBACiAgICAgICAgYmVj
YXVzZSBpdHMgdmFsdWUgY29udGFpbnMgJ2F1dG8nLiAtLT4KICAgPGRpdiBjbGFzcz0iZmxleENv
bnRhaW5lciIgc3R5bGU9ImhlaWdodDogYXV0bzsiPgogICAgIDwhLS0gVGhlIGNvbnRlbnQtYm94
IHdpZHRoIDEwcHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlp
ZWxkaW5nIGEgcmVzb2x2ZWQgZmxleCBiYXNlIHNpemUgb2YgMjAwcHguIC0tPgotICAgIDxkaXYg
Y2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4taGVpZ2h0OjA7IHdpZHRoOiAyNXB4OyBhc3BlY3QtcmF0
aW86IGF1dG8gMS8yMDsiPjxkaXY+PC9kaXY+PC9kaXY+CisgICAgICAgICB5aWVsZGluZyBhIHJl
c29sdmVkIGZsZXggYmFzZSBzaXplIG9mIDE5MHB4LiAtLT4KKyAgICA8ZGl2IGNsYXNzPSJpdGVt
IiBzdHlsZT0ibWluLWhlaWdodDowOyB3aWR0aDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEv
MTk7Ij48ZGl2PjwvZGl2PjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29u
dGFpbmVyIj4KICAgICA8IS0tIFRoZSBjb250ZW50LWJveCB3aWR0aCAxMHB4IGlzIHRyYW5zZmVy
cmVkIHRvIHRoZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi1o
ZWlnaHQ6YXV0byBvZiAyMDBweC4gLS0+Ci0gICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Indp
ZHRoOiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMS8yMDsiPjxkaXY+PC9kaXY+PC9kaXY+Cisg
ICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi1oZWlnaHQ6YXV0byBvZiAxOTBweC4gLS0+
CisgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9IndpZHRoOiAyNXB4OyBhc3BlY3QtcmF0aW86
IGF1dG8gMS8xOTsiPjxkaXY+PC9kaXY+PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYgY2xhc3M9
ImZsZXhDb250YWluZXIiPgogICAgIDwhLS0gVGhlIGNvbnRlbnQtYm94IG1pbi13aWR0aCAxMHB4
IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBhIHJl
c29sdmVkIG1pbi1oZWlnaHQ6YXV0byBvZiAyMDBweC4gLS0+Ci0gICAgPGRpdiBjbGFzcz0iaXRl
bSIgc3R5bGU9Im1pbi13aWR0aDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEvMjA7Ij48ZGl2
PjwvZGl2PjwvZGl2PgorICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1
dG8gb2YgMTkwcHguIC0tPgorICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4td2lkdGg6
IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE5OyI+PGRpdj48L2Rpdj48L2Rpdj4KICAgPC9k
aXY+CiAKICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciI+CiAgICAgPCEtLSBUaGUgY29udGVu
dC1ib3ggd2lkdGggMTBweCAoY2xhbXBlZCBieSBtYXgtd2lkdGgpIGlzIHRyYW5zZmVycmVkIHRv
IHRoZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi1oZWlnaHQ6
YXV0byBvZiAyMDBweC4gLS0+Ci0gICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1heC13aWR0
aDogMjVweDsgd2lkdGg6IDEwMHB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMS8yMDsiPjxkaXY+PC9k
aXY+PC9kaXY+CisgICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi1oZWlnaHQ6YXV0byBv
ZiAxOTBweC4gLS0+CisgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1heC13aWR0aDogMjVw
eDsgd2lkdGg6IDEwMHB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMS8xOTsiPjxkaXY+PC9kaXY+PC9k
aXY+CiAgIDwvZGl2PgogPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1h
c3BlY3QtcmF0aW8tMDI3Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0w
MjcuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwLi5lOGZhNDk0MzkyNWFhYjY0MjA5Mjc3MzliMjM3NDQxYzdlMGQ4
YzYxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8t
MDI3Lmh0bWwKQEAgLTAsMCArMSwxNiBAQAorPCFET0NUWVBFIGh0bWw+Cis8dGl0bGU+Q1NTIGFz
cGVjdC1yYXRpbzogUm93IGZsZXhib3ggYW5kIHRyYW5zZmVycmVkIG1pbi9tYXgtc2l6ZTwvdGl0
bGU+Cis8bGluayByZWw9ImF1dGhvciIgdGl0bGU9Ikdvb2dsZSBMTEMiIGhyZWY9Imh0dHBzOi8v
d3d3Lmdvb2dsZS5jb20vIj4KKzxsaW5rIHJlbD0iaGVscCIgaHJlZj0iaHR0cHM6Ly9kcmFmdHMu
Y3Nzd2cub3JnL2Nzcy1zaXppbmctNC8jYXNwZWN0LXJhdGlvIj4KKzxsaW5rIHJlbD0ibWF0Y2gi
IGhyZWY9Ii4uLy4uL3JlZmVyZW5jZS9yZWYtZmlsbGVkLWdyZWVuLTEwMHB4LXNxdWFyZS54aHQi
IC8+CisKKzxwPlRlc3QgcGFzc2VzIGlmIHRoZXJlIGlzIGEgZmlsbGVkIGdyZWVuIHNxdWFyZSBh
bmQgPHN0cm9uZz5ubyByZWQ8L3N0cm9uZz4uPC9wPgorCis8ZGl2IHN0eWxlPSJkaXNwbGF5OiBm
bGV4OyBmbGV4LWRpcmVjdGlvbjogcm93OyI+CisgIDxkaXYgc3R5bGU9ImJhY2tncm91bmQ6IGdy
ZWVuOyB3aWR0aDogNjBweDsgbWF4LWhlaWdodDogNTBweDsgYXNwZWN0LXJhdGlvOiAxLzE7Ij48
L2Rpdj4KKyAgPGRpdiBzdHlsZT0iYmFja2dyb3VuZDogZ3JlZW47IHdpZHRoOiA0MHB4OyBoZWln
aHQ6IDUwcHg7IiA+PC9kaXY+Cis8L2Rpdj4KKzxkaXYgc3R5bGU9ImRpc3BsYXk6IGZsZXg7IGZs
ZXgtZGlyZWN0aW9uOiByb3c7Ij4KKyAgPGRpdiBzdHlsZT0iYmFja2dyb3VuZDogZ3JlZW47IHdp
ZHRoOiA2MHB4OyBoZWlnaHQ6IDYwcHg7IG1heC1oZWlnaHQ6IDUwcHg7IGFzcGVjdC1yYXRpbzog
MS8xOyI+PC9kaXY+CisgIDxkaXYgc3R5bGU9ImJhY2tncm91bmQ6IGdyZWVuOyB3aWR0aDogNDBw
eDsgaGVpZ2h0OiA1MHB4OyIgPjwvZGl2PgorPC9kaXY+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>422071</attachid>
            <date>2021-03-03 05:40:30 -0800</date>
            <delta_ts>2021-03-03 08:07:43 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210303144028.patch</filename>
            <type>text/plain</type>
            <size>15256</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczODEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWJkNjE2NDJlZmJlNmE2
MzIzNjgxYjg4Mjg1OWViMTg5NjIwODk4ZC4uYjE5ZWE5ZGJmZjVkZGM4MGJmNmQwYmZhMjRjOTBh
M2IwNTUzOGMyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTAzLTAzICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBGaXggZmxleC1hc3BlY3QtcmF0aW8tMDI1KzI2Lmh0bWwgYnkgZml4aW5nIHR3byB0aGlu
Z3M6CisgICAgICAgIC0gYXBwbHkgdHJhbnNmZXJyZWQgbWluL21heCBzaXplcyBmb3IgaW50cmlu
c2ljIHNpemluZy4KKyAgICAgICAgLSBtYWtlIGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRp
b1VzaW5nIHRha2UgaW50byBhY2NvdW50CisgICAgICAgICAgYm94LXNpemluZyBmb3IgdGhlIGNh
c2Ugd2hlcmUgQ1NTIGFzcGVjdC1yYXRpbyBpcyBhcHBsaWVkLgorCisgICAgICAgIEJlaGF2aW9y
IG1hdGNoZXMgQ2hyb21lIGFuZCBGaXJlZm94LgorCisgICAgICAgIFRlc3Q6IGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNw
ZWN0LXJhdGlvLTAyNy5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVC
b3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWlu
U2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl
ckZsZXhpYmxlQm94OjphZGp1c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgpOgorCiAyMDIxLTAzLTAy
ICBNYW51ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtz
ZWxlY3RvcnNdIDpmb2N1cy12aXNpYmxlIGltcGxlbWVudGF0aW9uCmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwIGIvU291cmNlL1dlYkNv
cmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAppbmRleCBkM2NkMjI4YzU2YjkzMzky
Y2RmMGRjNDc0MzZhMDkwMjNjMWY3YzI0Li5kNTc1NzE0YTc3MzA2MDExODFjNzc5NWY2ZDAwN2Q2
ZDkzMzQ1MjMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxl
eGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJs
ZUJveC5jcHAKQEAgLTc5Myw3ICs3OTMsMTIgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJv
eDo6Y29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoY29uc3QgUmVuZGVyQm8KICAg
ICAgICAgLy8gV2UgbmVlZCB0byBzdWJzdHJhY3QgdGhlIGJvcmRlciBhbmQgcGFkZGluZyBleHRl
bnQgZnJvbSB0aGUgY3Jvc3MgYXhpcy4KICAgICAgICAgLy8gRnVydGhlcm1vcmUsIHRoZSBzaXpp
bmcgY2FsY3VsYXRpb25zIHRoYXQgZmxvb3IgdGhlIGNvbnRlbnQgYm94IHNpemUgYXQgemVybyB3
aGVuIGFwcGx5aW5nIGJveC1zaXppbmcgYXJlIGFsc28gaWdub3JlZC4KICAgICAgICAgLy8gaHR0
cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1mbGV4Ym94LyNhbGdvLW1haW4taXRlbS4KLSAgICAg
ICAgaWYgKGJveC5zdHlsZSgpLmJveFNpemluZygpID09IEJveFNpemluZzo6Qm9yZGVyQm94KQor
ICAgICAgICBib29sIHN1YnRyYWN0Qm9yZGVyUGFkZGluZyA9IGZhbHNlOworICAgICAgICBpZiAo
Ym94LnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSkKKyAgICAgICAgICAgIHN1YnRyYWN0Qm9yZGVy
UGFkZGluZyA9IGJveC5zdHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJhdGlvKCkgPT0gQm94U2l6
aW5nOjpDb250ZW50Qm94OworICAgICAgICBlbHNlIGlmIChib3guc3R5bGUoKS5ib3hTaXppbmco
KSA9PSBCb3hTaXppbmc6OkJvcmRlckJveCkKKyAgICAgICAgICAgIHN1YnRyYWN0Qm9yZGVyUGFk
ZGluZyA9IHRydWU7CisgICAgICAgIGlmIChzdWJ0cmFjdEJvcmRlclBhZGRpbmcpCiAgICAgICAg
ICAgICB2YWx1ZSAtPSBpc0hvcml6b250YWxGbG93KCkgPyBib3gudmVydGljYWxCb3JkZXJBbmRQ
YWRkaW5nRXh0ZW50KCkgOiBib3guaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKTsK
ICAgICAgICAgcmV0dXJuIHZhbHVlOwogICAgIH07CkBAIC04MTYsMTUgKzgyMSwxOCBAQCBMYXlv
dXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9V
c2luZyhjb25zdCBSZW5kZXJCbwogCiAgICAgY29uc3QgTGF5b3V0U2l6ZSYgY2hpbGRJbnRyaW5z
aWNTaXplID0gY2hpbGQuaW50cmluc2ljU2l6ZSgpOwogICAgIGRvdWJsZSByYXRpbzsKLSAgICBp
ZiAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OlJh
dGlvIHx8IChjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlw
ZTo6QXV0b0FuZFJhdGlvICYmIGNoaWxkSW50cmluc2ljU2l6ZS5pc0VtcHR5KCkpKQorICAgIExh
eW91dFVuaXQgYm9yZGVyUGFkZGluZzsKKyAgICBpZiAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRp
b1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OlJhdGlvIHx8IChjaGlsZC5zdHlsZSgpLmFzcGVj
dFJhdGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6QXV0b0FuZFJhdGlvICYmIGNoaWxkSW50
cmluc2ljU2l6ZS5pc0VtcHR5KCkpKSB7CiAgICAgICAgIHJhdGlvID0gY2hpbGQuc3R5bGUoKS5h
c3BlY3RSYXRpb1dpZHRoKCkgLyBjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvSGVpZ2h0KCk7Ci0g
ICAgZWxzZSB7CisgICAgICAgIGlmIChjaGlsZC5zdHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJh
dGlvKCkgPT0gQm94U2l6aW5nOjpCb3JkZXJCb3gpCisgICAgICAgICAgICBib3JkZXJQYWRkaW5n
ID0gaXNIb3Jpem9udGFsRmxvdygpID8gY2hpbGQuaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdF
eHRlbnQoKSA6IGNoaWxkLnZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpOworICAgIH0g
ZWxzZSB7CiAgICAgICAgIEFTU0VSVChjaGlsZEludHJpbnNpY1NpemUuaGVpZ2h0KCkpOwogICAg
ICAgICByYXRpbyA9IGNoaWxkSW50cmluc2ljU2l6ZS53aWR0aCgpLnRvRmxvYXQoKSAvIGNoaWxk
SW50cmluc2ljU2l6ZS5oZWlnaHQoKS50b0Zsb2F0KCk7CiAgICAgfQogICAgIGlmIChpc0hvcml6
b250YWxGbG93KCkpCi0gICAgICAgIHJldHVybiBMYXlvdXRVbml0KGNyb3NzU2l6ZS52YWx1ZSgp
ICogcmF0aW8pOwotICAgIHJldHVybiBMYXlvdXRVbml0KGNyb3NzU2l6ZS52YWx1ZSgpIC8gcmF0
aW8pOworICAgICAgICByZXR1cm4gTGF5b3V0VW5pdChjcm9zc1NpemUudmFsdWUoKSAqIHJhdGlv
KSAtIGJvcmRlclBhZGRpbmc7CisgICAgcmV0dXJuIExheW91dFVuaXQoY3Jvc3NTaXplLnZhbHVl
KCkgLyByYXRpbykgLSBib3JkZXJQYWRkaW5nOwogfQogCiB2b2lkIFJlbmRlckZsZXhpYmxlQm94
OjpzZXRGbG93QXdhcmVMb2NhdGlvbkZvckNoaWxkKFJlbmRlckJveCYgY2hpbGQsIGNvbnN0IExh
eW91dFBvaW50JiBsb2NhdGlvbikKQEAgLTExOTEsMTEgKzExOTksMTkgQEAgTGF5b3V0VW5pdCBS
ZW5kZXJGbGV4aWJsZUJveDo6YWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KGNvbnN0IFJlbmRl
ckJveCYgY2hpbGQKICAgICAgICAgbWF4RXh0ZW50ID0gY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9y
Q2hpbGQoY2hpbGQsIE1heFNpemUsIG1heCk7CiAgICAgICAgIGNoaWxkU2l6ZSA9IHN0ZDo6bWlu
KGNoaWxkU2l6ZSwgbWF4RXh0ZW50LnZhbHVlT3IoY2hpbGRTaXplKSk7CiAgICAgfQorICAgIExl
bmd0aCBjcm9zc01heCA9IGNyb3NzU2l6ZUxlbmd0aEZvckNoaWxkKE1heFNpemUsIGNoaWxkKTsK
KyAgICBpZiAoY2hpbGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpICYmICFjaGlsZE1haW5TaXpl
SXNEZWZpbml0ZShjaGlsZCwgZmxleEJhc2lzRm9yQ2hpbGQoY2hpbGQpKSAmJiBjaGlsZENyb3Nz
U2l6ZUlzRGVmaW5pdGUoY2hpbGQsIGNyb3NzTWF4KSkgeworICAgICAgICBtYXhFeHRlbnQgPSBj
b21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjaGlsZCwgY3Jvc3NNYXgpOworICAg
ICAgICBjaGlsZFNpemUgPSBzdGQ6Om1pbihjaGlsZFNpemUsIG1heEV4dGVudC52YWx1ZU9yKGNo
aWxkU2l6ZSkpOworICAgIH0KIAogICAgIExlbmd0aCBtaW4gPSBtYWluU2l6ZUxlbmd0aEZvckNo
aWxkKE1pblNpemUsIGNoaWxkKTsKICAgICBpZiAobWluLmlzU3BlY2lmaWVkT3JJbnRyaW5zaWMo
KSkKICAgICAgICAgcmV0dXJuIHN0ZDo6bWF4KGNoaWxkU2l6ZSwgc3RkOjptYXgoMF9sdSwgY29t
cHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQoY2hpbGQsIE1pblNpemUsIG1pbikudmFsdWVPcihj
aGlsZFNpemUpKSk7Ci0gICAgCisgICAgTGVuZ3RoIGNyb3NzTWluID0gY3Jvc3NTaXplTGVuZ3Ro
Rm9yQ2hpbGQoTWluU2l6ZSwgY2hpbGQpOworICAgIGlmIChjaGlsZC5zdHlsZSgpLmhhc0FzcGVj
dFJhdGlvKCkgJiYgIWNoaWxkTWFpblNpemVJc0RlZmluaXRlKGNoaWxkLCBmbGV4QmFzaXNGb3JD
aGlsZChjaGlsZCkpICYmIGNoaWxkQ3Jvc3NTaXplSXNEZWZpbml0ZShjaGlsZCwgY3Jvc3NNaW4p
KQorICAgICAgICByZXR1cm4gc3RkOjptYXgoY2hpbGRTaXplLCBjb21wdXRlTWFpblNpemVGcm9t
QXNwZWN0UmF0aW9Vc2luZyhjaGlsZCwgY3Jvc3NNaW4pKTsKKwogICAgIGlmIChzaG91bGRBcHBs
eU1pblNpemVBdXRvRm9yQ2hpbGQoY2hpbGQpKSB7CiAgICAgICAgIC8vIEZJWE1FOiBJZiB0aGUg
bWluIHZhbHVlIGlzIGV4cGVjdGVkIHRvIGJlIHZhbGlkIGhlcmUsIHdlIG5lZWQgdG8gY29tZSB1
cCB3aXRoIGEgbm9uIG9wdGlvbmFsIHZlcnNpb24gb2YgY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9y
Q2hpbGQgYW5kCiAgICAgICAgIC8vIGVuc3VyZSBpdCdzIHZhbGlkIHRocm91Z2ggdGhlIHZpcnR1
YWwgY2FsbHMgb2YgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxDb250ZW50SGVpZ2h0VXNpbmcuCmRp
ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK
aW5kZXggMDE2OWI0ODBhZGE1NmMwMDJmOGI1ZjhjYzdiYWNmNjI3NDllNzAzZS4uMDE2OTBhNzA5
ZTg5ZjY5Nzg5MGE5MDRjY2YyZmJjMGRhOWRiNDBhZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv
Q2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisy
MDIxLTAzLTAzICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZs
ZXgtYXNwZWN0LXJhdGlvLTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg
KE9PUFMhKS4KKworICAgICAgICBBZGFwdCBwbGF0Zm9ybSB0ZXN0IGV4cGVjdGF0aW9ucy4KKwor
ICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDMtMDIgIE1hbnVlbCBSZWdvIENh
c2Fzbm92YXMgIDxyZWdvQGlnYWxpYS5jb20+CiAKICAgICAgICAgW3NlbGVjdG9yc10gOmZvY3Vz
LXZpc2libGUgaW1wbGVtZW50YXRpb24KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVk
L3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4
IDMwN2FhNjM3MTU5ODUxMmI1MjY3ODRiNGIyM2M2MGViMTQ1ODAwMDIuLmViMGQyZTAwZTViMjlj
MTZhYTM4OTY4MmFlZjUyZGM1MmIwZGI2M2MgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9y
dGVkL3czYy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxv
ZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAzLTAzICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5j
b20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlvLTAyNSsyNi5odG1sCisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjIzNTcKKworICAgICAg
ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTeW5jIHRoZXNlIHRlc3Rz
IHRvIHRlc3QgYm90aCBtYWluIGFuZCBjcm9zcyBzaXplIHBhZGRpbmcuCisKKyAgICAgICAgKiB3
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0
LXJhdGlvLTAyNS5odG1sOgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp
emluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWw6CisgICAgICAgICog
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVj
dC1yYXRpby0wMjctZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjcu
aHRtbDogQWRkZWQuCisKIDIwMjEtMDMtMDIgIE1hbnVlbCBSZWdvIENhc2Fzbm92YXMgIDxyZWdv
QGlnYWxpYS5jb20+CiAKICAgICAgICAgW3NlbGVjdG9yc10gOmZvY3VzLXZpc2libGUgaW1wbGVt
ZW50YXRpb24KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlv
dXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGQ1MTcyYmVmZTU1MmY1ZGZiZjEyMDQ5M2U4
YjgzYjQzNWU1NDFmZjQuLmFhODg2NTA0MDU5YTgzOGQ0YjZiYjViNjAyZmYyMjFmMzJjYTBjNDUg
MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVz
dHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDU1NCw4ICs0NTU0LDYgQEAgd2Via2l0Lm9yZy9iLzIx
NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj
dC1yYXRpby8KICMgZmxleC1iYXNpczpjb250ZW50CiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Zs
ZXgtYXNwZWN0LXJhdGlvLTAyMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3Jn
L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv
YXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1sIFsg
SW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJh
dGlvLTAyNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGlt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv
L2dyaWQtYXNwZWN0LXJhdGlvLTAxNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQu
b3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp
bmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxNi5odG1sIFsgSW1hZ2VPbmx5RmFp
bHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxNy5odG1s
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFz
cGVjdC1yYXRpby0wMjUuaHRtbCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAy
NS5odG1sCmluZGV4IGZhOWNlOGViY2U2OWYwMmU2YjEzZDlkMjIzM2QxZTNiNDZjN2YxYWIuLmM0
ZmY4MTEwZDdiZWQ3MDc5Yzg2NGRkZjE5MmY4MjQyOTMyZTU4OGQgMTAwNjQ0Ci0tLSBhL0xheW91
dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw
ZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1sCisrKyBiL0xheW91dFRlc3RzL2lt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv
L2ZsZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1sCkBAIC0xNCw2ICsxNCw3IEBACiAgIC5pdGVtIHsK
ICAgICBiYWNrZ3JvdW5kOiBncmVlbjsKICAgICBwYWRkaW5nLXRvcDogMTVweDsKKyAgICBwYWRk
aW5nLWxlZnQ6IDEwcHg7CiAgICAgYm94LXNpemluZzogYm9yZGVyLWJveDsKICAgfQogICA8L3N0
eWxlPgpAQCAtNDksMjUgKzUwLDI1IEBACiAgICAgICAgYmVjYXVzZSBpdHMgdmFsdWUgY29udGFp
bnMgJ2F1dG8nLiAtLT4KICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciIgc3R5bGU9IndpZHRo
OiBhdXRvOyI+CiAgICAgPCEtLSBUaGUgY29udGVudC1ib3ggaGVpZ2h0IDEwcHggaXMgdHJhbnNm
ZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgZmxl
eCBiYXNlIHNpemUgb2YgMjAwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJt
aW4td2lkdGg6MDsgaGVpZ2h0OiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMjAvMTsiPjwvZGl2
PgorICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBmbGV4IGJhc2Ugc2l6ZSBvZiAxOTBweC4g
LS0+CisgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi13aWR0aDowOyBoZWlnaHQ6IDI1
cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxOS8xOyI+PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYg
Y2xhc3M9ImZsZXhDb250YWluZXIiPgogICAgIDwhLS0gVGhlIGNvbnRlbnQtYm94IGhlaWdodCAx
MHB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBh
IHJlc29sdmVkIG1pbi13aWR0aDphdXRvIG9mIDIwMHB4LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJp
dGVtIiBzdHlsZT0iaGVpZ2h0OiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMjAvMTsiPjwvZGl2
PgorICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4td2lkdGg6YXV0byBvZiAxOTBweC4g
LS0+CisgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9ImhlaWdodDogMjVweDsgYXNwZWN0LXJh
dGlvOiBhdXRvIDE5LzE7Ij48L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRpdiBjbGFzcz0iZmxleENv
bnRhaW5lciI+CiAgICAgPCEtLSBUaGUgY29udGVudC1ib3ggbWluLWhlaWdodCAxMHB4IGlzIHRy
YW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVk
IG1pbi13aWR0aDphdXRvIG9mIDIwMHB4LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHls
ZT0ibWluLWhlaWdodDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDIwLzE7Ij48L2Rpdj4KKyAg
ICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLXdpZHRoOmF1dG8gb2YgMTkwcHguIC0tPgor
ICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4taGVpZ2h0OiAyNXB4OyBhc3BlY3QtcmF0
aW86IGF1dG8gMTkvMTsiPjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29u
dGFpbmVyIj4KICAgICA8IS0tIFRoZSBjb250ZW50LWJveCBoZWlnaHQgMTBweCAoY2xhbXBlZCBi
eSBtYXgtaGVpZ2h0KSBpcyB0cmFuc2ZlcnJlZAotICAgICAgICAgdG8gdGhlIG1haW4gYXhpcywg
eWllbGRpbmcgYSByZXNvbHZlZCBtaW4td2lkdGg6YXV0byBvZiAyMDBweC4gLS0+Ci0gICAgPGRp
diBjbGFzcz0iaXRlbSIgc3R5bGU9Im1heC1oZWlnaHQ6IDI1cHg7IGhlaWdodDogMTAwcHg7IGFz
cGVjdC1yYXRpbzogYXV0byAyMC8xOyI+PC9kaXY+CisgICAgICAgICB0byB0aGUgbWFpbiBheGlz
LCB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi13aWR0aDphdXRvIG9mIDE5MHB4LiAtLT4KKyAgICA8
ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWF4LWhlaWdodDogMjVweDsgaGVpZ2h0OiAxMDBweDsg
YXNwZWN0LXJhdGlvOiBhdXRvIDE5LzE7Ij48L2Rpdj4KICAgPC9kaXY+CiA8L2h0bWw+CmRpZmYg
LS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbCBiL0xheW91
dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw
ZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sCmluZGV4IDFkZjE0NDY4NjMyYmFh
OGZmZDAzZDY5MGY3ZGRhYTYxOGFjZDdiZjYuLmM0YTI1MDgxOGJiNzc4NmUyZjM5NTkyMmQyOGUz
Yzc1MTliNGVhM2EgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlv
LTAyNi5odG1sCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1s
CkBAIC0xNSw2ICsxNSw3IEBACiAgIC5pdGVtIHsKICAgICBiYWNrZ3JvdW5kOiBncmVlbjsKICAg
ICBwYWRkaW5nLWxlZnQ6IDE1cHg7CisgICAgcGFkZGluZy10b3A6IDEwcHg7CiAgICAgYm94LXNp
emluZzogYm9yZGVyLWJveDsKICAgfQogICAuaXRlbSA+IGRpdiB7CkBAIC01MywyNSArNTQsMjUg
QEAKICAgICAgICBiZWNhdXNlIGl0cyB2YWx1ZSBjb250YWlucyAnYXV0bycuIC0tPgogICA8ZGl2
IGNsYXNzPSJmbGV4Q29udGFpbmVyIiBzdHlsZT0iaGVpZ2h0OiBhdXRvOyI+CiAgICAgPCEtLSBU
aGUgY29udGVudC1ib3ggd2lkdGggMTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlz
LAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBmbGV4IGJhc2Ugc2l6ZSBvZiAyMDBweC4g
LS0+Ci0gICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi1oZWlnaHQ6MDsgd2lkdGg6IDI1
cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzIwOyI+PGRpdj48L2Rpdj48L2Rpdj4KKyAgICAgICAg
IHlpZWxkaW5nIGEgcmVzb2x2ZWQgZmxleCBiYXNlIHNpemUgb2YgMTkwcHguIC0tPgorICAgIDxk
aXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4taGVpZ2h0OjA7IHdpZHRoOiAyNXB4OyBhc3BlY3Qt
cmF0aW86IGF1dG8gMS8xOTsiPjxkaXY+PC9kaXY+PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYg
Y2xhc3M9ImZsZXhDb250YWluZXIiPgogICAgIDwhLS0gVGhlIGNvbnRlbnQtYm94IHdpZHRoIDEw
cHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEg
cmVzb2x2ZWQgbWluLWhlaWdodDphdXRvIG9mIDIwMHB4LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJp
dGVtIiBzdHlsZT0id2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzIwOyI+PGRpdj48
L2Rpdj48L2Rpdj4KKyAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLWhlaWdodDphdXRv
IG9mIDE5MHB4LiAtLT4KKyAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0id2lkdGg6IDI1cHg7
IGFzcGVjdC1yYXRpbzogYXV0byAxLzE5OyI+PGRpdj48L2Rpdj48L2Rpdj4KICAgPC9kaXY+CiAK
ICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciI+CiAgICAgPCEtLSBUaGUgY29udGVudC1ib3gg
bWluLXdpZHRoIDEwcHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAg
IHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLWhlaWdodDphdXRvIG9mIDIwMHB4LiAtLT4KLSAgICA8
ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWluLXdpZHRoOiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1
dG8gMS8yMDsiPjxkaXY+PC9kaXY+PC9kaXY+CisgICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVk
IG1pbi1oZWlnaHQ6YXV0byBvZiAxOTBweC4gLS0+CisgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5
bGU9Im1pbi13aWR0aDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEvMTk7Ij48ZGl2PjwvZGl2
PjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KICAgICA8
IS0tIFRoZSBjb250ZW50LWJveCB3aWR0aCAxMHB4IChjbGFtcGVkIGJ5IG1heC13aWR0aCkgaXMg
dHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2
ZWQgbWluLWhlaWdodDphdXRvIG9mIDIwMHB4LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJpdGVtIiBz
dHlsZT0ibWF4LXdpZHRoOiAyNXB4OyB3aWR0aDogMTAwcHg7IGFzcGVjdC1yYXRpbzogYXV0byAx
LzIwOyI+PGRpdj48L2Rpdj48L2Rpdj4KKyAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWlu
LWhlaWdodDphdXRvIG9mIDE5MHB4LiAtLT4KKyAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0i
bWF4LXdpZHRoOiAyNXB4OyB3aWR0aDogMTAwcHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE5OyI+
PGRpdj48L2Rpdj48L2Rpdj4KICAgPC9kaXY+CiA8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj
dC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjctZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3Rz
L2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh
dGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNy1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAw
NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQ4ZDcx
Zjg2MjAxMjE5MTcxYzJhNmY4NGVhYjljZmI5ODdkYTg3OWUKLS0tIC9kZXYvbnVsbAorKysgYi9M
YXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n
L2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjctZXhwZWN0ZWQuaHRtbApAQCAtMCww
ICsxLDEzIEBACis8IURPQ1RZUEUgaHRtbD4KKzxtZXRhIGNoYXJzZXQ9InV0Zi04Ij4KKzx0aXRs
ZT5DU1MgUmVmdGVzdCBSZWZlcmVuY2U8L3RpdGxlPgorPGxpbmsgcmVsPSJhdXRob3IiIHRpdGxl
PSJKYXZpZXIgRmVybmFuZGV6IEdhcmNpYS1Cb2VudGUiIGhyZWY9ImpmZXJuYW5kZXpAaWdhbGlh
LmNvbSIgLz4KKzxzdHlsZT4KK2RpdiB7CisgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworICBo
ZWlnaHQ6IDIwMHB4OworICB3aWR0aDogMjAwcHg7Cit9Cis8L3N0eWxlPgorPHA+VGVzdCBwYXNz
ZXMgaWYgdGhlcmUgaXMgYSBmaWxsZWQgZ3JlZW4gc3F1YXJlIGFuZCA8c3Ryb25nPm5vIHJlZDwv
c3Ryb25nPi48L3A+Cis8ZGl2PjwvZGl2PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxl
eC1hc3BlY3QtcmF0aW8tMDI3Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRp
by0wMjcuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5lOGZhNDk0MzkyNWFhYjY0MjA5Mjc3MzliMjM3NDQxYzdl
MGQ4YzYxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0
aW8tMDI3Lmh0bWwKQEAgLTAsMCArMSwxNiBAQAorPCFET0NUWVBFIGh0bWw+Cis8dGl0bGU+Q1NT
IGFzcGVjdC1yYXRpbzogUm93IGZsZXhib3ggYW5kIHRyYW5zZmVycmVkIG1pbi9tYXgtc2l6ZTwv
dGl0bGU+Cis8bGluayByZWw9ImF1dGhvciIgdGl0bGU9Ikdvb2dsZSBMTEMiIGhyZWY9Imh0dHBz
Oi8vd3d3Lmdvb2dsZS5jb20vIj4KKzxsaW5rIHJlbD0iaGVscCIgaHJlZj0iaHR0cHM6Ly9kcmFm
dHMuY3Nzd2cub3JnL2Nzcy1zaXppbmctNC8jYXNwZWN0LXJhdGlvIj4KKzxsaW5rIHJlbD0ibWF0
Y2giIGhyZWY9Ii4uLy4uL3JlZmVyZW5jZS9yZWYtZmlsbGVkLWdyZWVuLTEwMHB4LXNxdWFyZS54
aHQiIC8+CisKKzxwPlRlc3QgcGFzc2VzIGlmIHRoZXJlIGlzIGEgZmlsbGVkIGdyZWVuIHNxdWFy
ZSBhbmQgPHN0cm9uZz5ubyByZWQ8L3N0cm9uZz4uPC9wPgorCis8ZGl2IHN0eWxlPSJkaXNwbGF5
OiBmbGV4OyBmbGV4LWRpcmVjdGlvbjogcm93OyI+CisgIDxkaXYgc3R5bGU9ImJhY2tncm91bmQ6
IGdyZWVuOyB3aWR0aDogNjBweDsgbWF4LWhlaWdodDogNTBweDsgYXNwZWN0LXJhdGlvOiAxLzE7
Ij48L2Rpdj4KKyAgPGRpdiBzdHlsZT0iYmFja2dyb3VuZDogZ3JlZW47IHdpZHRoOiA0MHB4OyBo
ZWlnaHQ6IDUwcHg7IiA+PC9kaXY+Cis8L2Rpdj4KKzxkaXYgc3R5bGU9ImRpc3BsYXk6IGZsZXg7
IGZsZXgtZGlyZWN0aW9uOiByb3c7Ij4KKyAgPGRpdiBzdHlsZT0iYmFja2dyb3VuZDogZ3JlZW47
IHdpZHRoOiA2MHB4OyBoZWlnaHQ6IDYwcHg7IG1heC1oZWlnaHQ6IDUwcHg7IGFzcGVjdC1yYXRp
bzogMS8xOyI+PC9kaXY+CisgIDxkaXYgc3R5bGU9ImJhY2tncm91bmQ6IGdyZWVuOyB3aWR0aDog
NDBweDsgaGVpZ2h0OiA1MHB4OyIgPjwvZGl2PgorPC9kaXY+Cg==
</data>
<flag name="commit-queue"
          id="441107"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>422085</attachid>
            <date>2021-03-03 08:05:05 -0800</date>
            <delta_ts>2021-03-04 02:01:47 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210303170504.patch</filename>
            <type>text/plain</type>
            <size>15481</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczODEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWJkNjE2NDJlZmJlNmE2
MzIzNjgxYjg4Mjg1OWViMTg5NjIwODk4ZC4uYjE5ZWE5ZGJmZjVkZGM4MGJmNmQwYmZhMjRjOTBh
M2IwNTUzOGMyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTAzLTAzICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBGaXggZmxleC1hc3BlY3QtcmF0aW8tMDI1KzI2Lmh0bWwgYnkgZml4aW5nIHR3byB0aGlu
Z3M6CisgICAgICAgIC0gYXBwbHkgdHJhbnNmZXJyZWQgbWluL21heCBzaXplcyBmb3IgaW50cmlu
c2ljIHNpemluZy4KKyAgICAgICAgLSBtYWtlIGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRp
b1VzaW5nIHRha2UgaW50byBhY2NvdW50CisgICAgICAgICAgYm94LXNpemluZyBmb3IgdGhlIGNh
c2Ugd2hlcmUgQ1NTIGFzcGVjdC1yYXRpbyBpcyBhcHBsaWVkLgorCisgICAgICAgIEJlaGF2aW9y
IG1hdGNoZXMgQ2hyb21lIGFuZCBGaXJlZm94LgorCisgICAgICAgIFRlc3Q6IGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNw
ZWN0LXJhdGlvLTAyNy5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVC
b3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWlu
U2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl
ckZsZXhpYmxlQm94OjphZGp1c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgpOgorCiAyMDIxLTAzLTAy
ICBNYW51ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtz
ZWxlY3RvcnNdIDpmb2N1cy12aXNpYmxlIGltcGxlbWVudGF0aW9uCmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwIGIvU291cmNlL1dlYkNv
cmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAppbmRleCBkM2NkMjI4YzU2YjkzMzky
Y2RmMGRjNDc0MzZhMDkwMjNjMWY3YzI0Li5kNTc1NzE0YTc3MzA2MDExODFjNzc5NWY2ZDAwN2Q2
ZDkzMzQ1MjMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxl
eGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJs
ZUJveC5jcHAKQEAgLTc5Myw3ICs3OTMsMTIgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJv
eDo6Y29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoY29uc3QgUmVuZGVyQm8KICAg
ICAgICAgLy8gV2UgbmVlZCB0byBzdWJzdHJhY3QgdGhlIGJvcmRlciBhbmQgcGFkZGluZyBleHRl
bnQgZnJvbSB0aGUgY3Jvc3MgYXhpcy4KICAgICAgICAgLy8gRnVydGhlcm1vcmUsIHRoZSBzaXpp
bmcgY2FsY3VsYXRpb25zIHRoYXQgZmxvb3IgdGhlIGNvbnRlbnQgYm94IHNpemUgYXQgemVybyB3
aGVuIGFwcGx5aW5nIGJveC1zaXppbmcgYXJlIGFsc28gaWdub3JlZC4KICAgICAgICAgLy8gaHR0
cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1mbGV4Ym94LyNhbGdvLW1haW4taXRlbS4KLSAgICAg
ICAgaWYgKGJveC5zdHlsZSgpLmJveFNpemluZygpID09IEJveFNpemluZzo6Qm9yZGVyQm94KQor
ICAgICAgICBib29sIHN1YnRyYWN0Qm9yZGVyUGFkZGluZyA9IGZhbHNlOworICAgICAgICBpZiAo
Ym94LnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSkKKyAgICAgICAgICAgIHN1YnRyYWN0Qm9yZGVy
UGFkZGluZyA9IGJveC5zdHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJhdGlvKCkgPT0gQm94U2l6
aW5nOjpDb250ZW50Qm94OworICAgICAgICBlbHNlIGlmIChib3guc3R5bGUoKS5ib3hTaXppbmco
KSA9PSBCb3hTaXppbmc6OkJvcmRlckJveCkKKyAgICAgICAgICAgIHN1YnRyYWN0Qm9yZGVyUGFk
ZGluZyA9IHRydWU7CisgICAgICAgIGlmIChzdWJ0cmFjdEJvcmRlclBhZGRpbmcpCiAgICAgICAg
ICAgICB2YWx1ZSAtPSBpc0hvcml6b250YWxGbG93KCkgPyBib3gudmVydGljYWxCb3JkZXJBbmRQ
YWRkaW5nRXh0ZW50KCkgOiBib3guaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKTsK
ICAgICAgICAgcmV0dXJuIHZhbHVlOwogICAgIH07CkBAIC04MTYsMTUgKzgyMSwxOCBAQCBMYXlv
dXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9V
c2luZyhjb25zdCBSZW5kZXJCbwogCiAgICAgY29uc3QgTGF5b3V0U2l6ZSYgY2hpbGRJbnRyaW5z
aWNTaXplID0gY2hpbGQuaW50cmluc2ljU2l6ZSgpOwogICAgIGRvdWJsZSByYXRpbzsKLSAgICBp
ZiAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OlJh
dGlvIHx8IChjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlw
ZTo6QXV0b0FuZFJhdGlvICYmIGNoaWxkSW50cmluc2ljU2l6ZS5pc0VtcHR5KCkpKQorICAgIExh
eW91dFVuaXQgYm9yZGVyUGFkZGluZzsKKyAgICBpZiAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRp
b1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OlJhdGlvIHx8IChjaGlsZC5zdHlsZSgpLmFzcGVj
dFJhdGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6QXV0b0FuZFJhdGlvICYmIGNoaWxkSW50
cmluc2ljU2l6ZS5pc0VtcHR5KCkpKSB7CiAgICAgICAgIHJhdGlvID0gY2hpbGQuc3R5bGUoKS5h
c3BlY3RSYXRpb1dpZHRoKCkgLyBjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvSGVpZ2h0KCk7Ci0g
ICAgZWxzZSB7CisgICAgICAgIGlmIChjaGlsZC5zdHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJh
dGlvKCkgPT0gQm94U2l6aW5nOjpCb3JkZXJCb3gpCisgICAgICAgICAgICBib3JkZXJQYWRkaW5n
ID0gaXNIb3Jpem9udGFsRmxvdygpID8gY2hpbGQuaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdF
eHRlbnQoKSA6IGNoaWxkLnZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpOworICAgIH0g
ZWxzZSB7CiAgICAgICAgIEFTU0VSVChjaGlsZEludHJpbnNpY1NpemUuaGVpZ2h0KCkpOwogICAg
ICAgICByYXRpbyA9IGNoaWxkSW50cmluc2ljU2l6ZS53aWR0aCgpLnRvRmxvYXQoKSAvIGNoaWxk
SW50cmluc2ljU2l6ZS5oZWlnaHQoKS50b0Zsb2F0KCk7CiAgICAgfQogICAgIGlmIChpc0hvcml6
b250YWxGbG93KCkpCi0gICAgICAgIHJldHVybiBMYXlvdXRVbml0KGNyb3NzU2l6ZS52YWx1ZSgp
ICogcmF0aW8pOwotICAgIHJldHVybiBMYXlvdXRVbml0KGNyb3NzU2l6ZS52YWx1ZSgpIC8gcmF0
aW8pOworICAgICAgICByZXR1cm4gTGF5b3V0VW5pdChjcm9zc1NpemUudmFsdWUoKSAqIHJhdGlv
KSAtIGJvcmRlclBhZGRpbmc7CisgICAgcmV0dXJuIExheW91dFVuaXQoY3Jvc3NTaXplLnZhbHVl
KCkgLyByYXRpbykgLSBib3JkZXJQYWRkaW5nOwogfQogCiB2b2lkIFJlbmRlckZsZXhpYmxlQm94
OjpzZXRGbG93QXdhcmVMb2NhdGlvbkZvckNoaWxkKFJlbmRlckJveCYgY2hpbGQsIGNvbnN0IExh
eW91dFBvaW50JiBsb2NhdGlvbikKQEAgLTExOTEsMTEgKzExOTksMTkgQEAgTGF5b3V0VW5pdCBS
ZW5kZXJGbGV4aWJsZUJveDo6YWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KGNvbnN0IFJlbmRl
ckJveCYgY2hpbGQKICAgICAgICAgbWF4RXh0ZW50ID0gY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9y
Q2hpbGQoY2hpbGQsIE1heFNpemUsIG1heCk7CiAgICAgICAgIGNoaWxkU2l6ZSA9IHN0ZDo6bWlu
KGNoaWxkU2l6ZSwgbWF4RXh0ZW50LnZhbHVlT3IoY2hpbGRTaXplKSk7CiAgICAgfQorICAgIExl
bmd0aCBjcm9zc01heCA9IGNyb3NzU2l6ZUxlbmd0aEZvckNoaWxkKE1heFNpemUsIGNoaWxkKTsK
KyAgICBpZiAoY2hpbGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpICYmICFjaGlsZE1haW5TaXpl
SXNEZWZpbml0ZShjaGlsZCwgZmxleEJhc2lzRm9yQ2hpbGQoY2hpbGQpKSAmJiBjaGlsZENyb3Nz
U2l6ZUlzRGVmaW5pdGUoY2hpbGQsIGNyb3NzTWF4KSkgeworICAgICAgICBtYXhFeHRlbnQgPSBj
b21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjaGlsZCwgY3Jvc3NNYXgpOworICAg
ICAgICBjaGlsZFNpemUgPSBzdGQ6Om1pbihjaGlsZFNpemUsIG1heEV4dGVudC52YWx1ZU9yKGNo
aWxkU2l6ZSkpOworICAgIH0KIAogICAgIExlbmd0aCBtaW4gPSBtYWluU2l6ZUxlbmd0aEZvckNo
aWxkKE1pblNpemUsIGNoaWxkKTsKICAgICBpZiAobWluLmlzU3BlY2lmaWVkT3JJbnRyaW5zaWMo
KSkKICAgICAgICAgcmV0dXJuIHN0ZDo6bWF4KGNoaWxkU2l6ZSwgc3RkOjptYXgoMF9sdSwgY29t
cHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQoY2hpbGQsIE1pblNpemUsIG1pbikudmFsdWVPcihj
aGlsZFNpemUpKSk7Ci0gICAgCisgICAgTGVuZ3RoIGNyb3NzTWluID0gY3Jvc3NTaXplTGVuZ3Ro
Rm9yQ2hpbGQoTWluU2l6ZSwgY2hpbGQpOworICAgIGlmIChjaGlsZC5zdHlsZSgpLmhhc0FzcGVj
dFJhdGlvKCkgJiYgIWNoaWxkTWFpblNpemVJc0RlZmluaXRlKGNoaWxkLCBmbGV4QmFzaXNGb3JD
aGlsZChjaGlsZCkpICYmIGNoaWxkQ3Jvc3NTaXplSXNEZWZpbml0ZShjaGlsZCwgY3Jvc3NNaW4p
KQorICAgICAgICByZXR1cm4gc3RkOjptYXgoY2hpbGRTaXplLCBjb21wdXRlTWFpblNpemVGcm9t
QXNwZWN0UmF0aW9Vc2luZyhjaGlsZCwgY3Jvc3NNaW4pKTsKKwogICAgIGlmIChzaG91bGRBcHBs
eU1pblNpemVBdXRvRm9yQ2hpbGQoY2hpbGQpKSB7CiAgICAgICAgIC8vIEZJWE1FOiBJZiB0aGUg
bWluIHZhbHVlIGlzIGV4cGVjdGVkIHRvIGJlIHZhbGlkIGhlcmUsIHdlIG5lZWQgdG8gY29tZSB1
cCB3aXRoIGEgbm9uIG9wdGlvbmFsIHZlcnNpb24gb2YgY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9y
Q2hpbGQgYW5kCiAgICAgICAgIC8vIGVuc3VyZSBpdCdzIHZhbGlkIHRocm91Z2ggdGhlIHZpcnR1
YWwgY2FsbHMgb2YgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxDb250ZW50SGVpZ2h0VXNpbmcuCmRp
ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK
aW5kZXggMDE2OWI0ODBhZGE1NmMwMDJmOGI1ZjhjYzdiYWNmNjI3NDllNzAzZS4uMDE2OTBhNzA5
ZTg5ZjY5Nzg5MGE5MDRjY2YyZmJjMGRhOWRiNDBhZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv
Q2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisy
MDIxLTAzLTAzICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZs
ZXgtYXNwZWN0LXJhdGlvLTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg
KE9PUFMhKS4KKworICAgICAgICBBZGFwdCBwbGF0Zm9ybSB0ZXN0IGV4cGVjdGF0aW9ucy4KKwor
ICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDMtMDIgIE1hbnVlbCBSZWdvIENh
c2Fzbm92YXMgIDxyZWdvQGlnYWxpYS5jb20+CiAKICAgICAgICAgW3NlbGVjdG9yc10gOmZvY3Vz
LXZpc2libGUgaW1wbGVtZW50YXRpb24KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVk
L3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4
IDMwN2FhNjM3MTU5ODUxMmI1MjY3ODRiNGIyM2M2MGViMTQ1ODAwMDIuLjI0Y2ZjNGI1NDI3NTQ3
YzUwYmJjYjg0ZTEyMGM0NDZmYmEyNzNiZDIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9y
dGVkL3czYy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxv
ZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAzLTAzICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5j
b20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlvLTAyNSsyNi5odG1sCisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjIzNTcKKworICAgICAg
ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTeW5jIHRoZXNlIHRlc3Rz
IHRvIHRlc3QgYm90aCBtYWluIGFuZCBjcm9zcyBzaXplIHBhZGRpbmcuCisKKyAgICAgICAgKiB3
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0
LXJhdGlvLTAyNS5odG1sOgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp
emluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWw6CisgICAgICAgICog
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVj
dC1yYXRpby0wMjctZXhwZWN0ZWQueGh0OiBBZGRlZC4KKyAgICAgICAgKiB3ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNy5o
dG1sOiBBZGRlZC4KKwogMjAyMS0wMy0wMiAgTWFudWVsIFJlZ28gQ2FzYXNub3ZhcyAgPHJlZ29A
aWdhbGlhLmNvbT4KIAogICAgICAgICBbc2VsZWN0b3JzXSA6Zm9jdXMtdmlzaWJsZSBpbXBsZW1l
bnRhdGlvbgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91
dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggZDUxNzJiZWZlNTUyZjVkZmJmMTIwNDkzZThi
ODNiNDM1ZTU0MWZmNC4uYWE4ODY1MDQwNTlhODM4ZDRiNmJiNWI2MDJmZjIyMWYzMmNhMGM0NSAx
MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0
cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NTU0LDggKzQ1NTQsNiBAQCB3ZWJraXQub3JnL2IvMjE0
NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0
LXJhdGlvLwogIyBmbGV4LWJhc2lzOmNvbnRlbnQKIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxl
eC1hc3BlY3QtcmF0aW8tMDIxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcv
Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h
c3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDIyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWwgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0
aW8tMDI2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v
Z3JpZC1hc3BlY3QtcmF0aW8tMDE1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5v
cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu
Zy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE2Lmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE3Lmh0bWwg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNw
ZWN0LXJhdGlvLTAyNS5odG1sIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1
Lmh0bWwKaW5kZXggZmE5Y2U4ZWJjZTY5ZjAyZTZiMTNkOWQyMjMzZDFlM2I0NmM3ZjFhYi4uYzRm
ZjgxMTBkN2JlZDcwNzljODY0ZGRmMTkyZjgyNDI5MzJlNTg4ZCAxMDA2NDQKLS0tIGEvTGF5b3V0
VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl
Y3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v
ZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWwKQEAgLTE0LDYgKzE0LDcgQEAKICAgLml0ZW0gewog
ICAgIGJhY2tncm91bmQ6IGdyZWVuOwogICAgIHBhZGRpbmctdG9wOiAxNXB4OworICAgIHBhZGRp
bmctbGVmdDogMTBweDsKICAgICBib3gtc2l6aW5nOiBib3JkZXItYm94OwogICB9CiAgIDwvc3R5
bGU+CkBAIC00OSwyNSArNTAsMjUgQEAKICAgICAgICBiZWNhdXNlIGl0cyB2YWx1ZSBjb250YWlu
cyAnYXV0bycuIC0tPgogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIiBzdHlsZT0id2lkdGg6
IGF1dG87Ij4KICAgICA8IS0tIFRoZSBjb250ZW50LWJveCBoZWlnaHQgMTBweCBpcyB0cmFuc2Zl
cnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBmbGV4
IGJhc2Ugc2l6ZSBvZiAyMDBweC4gLS0+Ci0gICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1p
bi13aWR0aDowOyBoZWlnaHQ6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAyMC8xOyI+PC9kaXY+
CisgICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIGZsZXggYmFzZSBzaXplIG9mIDE5MHB4LiAt
LT4KKyAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWluLXdpZHRoOjA7IGhlaWdodDogMjVw
eDsgYXNwZWN0LXJhdGlvOiBhdXRvIDE5LzE7Ij48L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRpdiBj
bGFzcz0iZmxleENvbnRhaW5lciI+CiAgICAgPCEtLSBUaGUgY29udGVudC1ib3ggaGVpZ2h0IDEw
cHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEg
cmVzb2x2ZWQgbWluLXdpZHRoOmF1dG8gb2YgMjAwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0
ZW0iIHN0eWxlPSJoZWlnaHQ6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAyMC8xOyI+PC9kaXY+
CisgICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi13aWR0aDphdXRvIG9mIDE5MHB4LiAt
LT4KKyAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0iaGVpZ2h0OiAyNXB4OyBhc3BlY3QtcmF0
aW86IGF1dG8gMTkvMTsiPjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29u
dGFpbmVyIj4KICAgICA8IS0tIFRoZSBjb250ZW50LWJveCBtaW4taGVpZ2h0IDEwcHggaXMgdHJh
bnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQg
bWluLXdpZHRoOmF1dG8gb2YgMjAwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxl
PSJtaW4taGVpZ2h0OiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMjAvMTsiPjwvZGl2PgorICAg
ICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4td2lkdGg6YXV0byBvZiAxOTBweC4gLS0+Cisg
ICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi1oZWlnaHQ6IDI1cHg7IGFzcGVjdC1yYXRp
bzogYXV0byAxOS8xOyI+PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250
YWluZXIiPgogICAgIDwhLS0gVGhlIGNvbnRlbnQtYm94IGhlaWdodCAxMHB4IChjbGFtcGVkIGJ5
IG1heC1oZWlnaHQpIGlzIHRyYW5zZmVycmVkCi0gICAgICAgICB0byB0aGUgbWFpbiBheGlzLCB5
aWVsZGluZyBhIHJlc29sdmVkIG1pbi13aWR0aDphdXRvIG9mIDIwMHB4LiAtLT4KLSAgICA8ZGl2
IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWF4LWhlaWdodDogMjVweDsgaGVpZ2h0OiAxMDBweDsgYXNw
ZWN0LXJhdGlvOiBhdXRvIDIwLzE7Ij48L2Rpdj4KKyAgICAgICAgIHRvIHRoZSBtYWluIGF4aXMs
IHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLXdpZHRoOmF1dG8gb2YgMTkwcHguIC0tPgorICAgIDxk
aXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtYXgtaGVpZ2h0OiAyNXB4OyBoZWlnaHQ6IDEwMHB4OyBh
c3BlY3QtcmF0aW86IGF1dG8gMTkvMTsiPjwvZGl2PgogICA8L2Rpdj4KIDwvaHRtbD4KZGlmZiAt
LWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sIGIvTGF5b3V0
VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl
Y3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwKaW5kZXggMWRmMTQ0Njg2MzJiYWE4
ZmZkMDNkNjkwZjdkZGFhNjE4YWNkN2JmNi4uYzRhMjUwODE4YmI3Nzg2ZTJmMzk1OTIyZDI4ZTNj
NzUxOWI0ZWEzYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8t
MDI2Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwK
QEAgLTE1LDYgKzE1LDcgQEAKICAgLml0ZW0gewogICAgIGJhY2tncm91bmQ6IGdyZWVuOwogICAg
IHBhZGRpbmctbGVmdDogMTVweDsKKyAgICBwYWRkaW5nLXRvcDogMTBweDsKICAgICBib3gtc2l6
aW5nOiBib3JkZXItYm94OwogICB9CiAgIC5pdGVtID4gZGl2IHsKQEAgLTUzLDI1ICs1NCwyNSBA
QAogICAgICAgIGJlY2F1c2UgaXRzIHZhbHVlIGNvbnRhaW5zICdhdXRvJy4gLS0+CiAgIDxkaXYg
Y2xhc3M9ImZsZXhDb250YWluZXIiIHN0eWxlPSJoZWlnaHQ6IGF1dG87Ij4KICAgICA8IS0tIFRo
ZSBjb250ZW50LWJveCB3aWR0aCAxMHB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMs
Ci0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIGZsZXggYmFzZSBzaXplIG9mIDIwMHB4LiAt
LT4KLSAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWluLWhlaWdodDowOyB3aWR0aDogMjVw
eDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEvMjA7Ij48ZGl2PjwvZGl2PjwvZGl2PgorICAgICAgICAg
eWllbGRpbmcgYSByZXNvbHZlZCBmbGV4IGJhc2Ugc2l6ZSBvZiAxOTBweC4gLS0+CisgICAgPGRp
diBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi1oZWlnaHQ6MDsgd2lkdGg6IDI1cHg7IGFzcGVjdC1y
YXRpbzogYXV0byAxLzE5OyI+PGRpdj48L2Rpdj48L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRpdiBj
bGFzcz0iZmxleENvbnRhaW5lciI+CiAgICAgPCEtLSBUaGUgY29udGVudC1ib3ggd2lkdGggMTBw
eCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSBy
ZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8gb2YgMjAwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0
ZW0iIHN0eWxlPSJ3aWR0aDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEvMjA7Ij48ZGl2Pjwv
ZGl2PjwvZGl2PgorICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8g
b2YgMTkwcHguIC0tPgorICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJ3aWR0aDogMjVweDsg
YXNwZWN0LXJhdGlvOiBhdXRvIDEvMTk7Ij48ZGl2PjwvZGl2PjwvZGl2PgogICA8L2Rpdj4KIAog
ICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KICAgICA8IS0tIFRoZSBjb250ZW50LWJveCBt
aW4td2lkdGggMTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAg
eWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8gb2YgMjAwcHguIC0tPgotICAgIDxk
aXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4td2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0
byAxLzIwOyI+PGRpdj48L2Rpdj48L2Rpdj4KKyAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQg
bWluLWhlaWdodDphdXRvIG9mIDE5MHB4LiAtLT4KKyAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHls
ZT0ibWluLXdpZHRoOiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMS8xOTsiPjxkaXY+PC9kaXY+
PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgogICAgIDwh
LS0gVGhlIGNvbnRlbnQtYm94IHdpZHRoIDEwcHggKGNsYW1wZWQgYnkgbWF4LXdpZHRoKSBpcyB0
cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZl
ZCBtaW4taGVpZ2h0OmF1dG8gb2YgMjAwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0
eWxlPSJtYXgtd2lkdGg6IDI1cHg7IHdpZHRoOiAxMDBweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEv
MjA7Ij48ZGl2PjwvZGl2PjwvZGl2PgorICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4t
aGVpZ2h0OmF1dG8gb2YgMTkwcHguIC0tPgorICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJt
YXgtd2lkdGg6IDI1cHg7IHdpZHRoOiAxMDBweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEvMTk7Ij48
ZGl2PjwvZGl2PjwvZGl2PgogICA8L2Rpdj4KIDwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRl
c3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0
LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNy1leHBlY3RlZC54aHQgYi9MYXlvdXRUZXN0cy9p
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp
by9mbGV4LWFzcGVjdC1yYXRpby0wMjctZXhwZWN0ZWQueGh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0
CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjA1YTEzNzk0
NDgyYTk0ZjZjMTBiZDlkNGM5ODcwNGU2M2VmNjAzMzEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv
dXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz
cGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjctZXhwZWN0ZWQueGh0CkBAIC0wLDAgKzEs
MTkgQEAKKzwhRE9DVFlQRSBodG1sIFBVQkxJQyAiLS8vVzNDLy9EVEQgWEhUTUwgMS4wIFN0cmlj
dC8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9UUi94aHRtbDEvRFREL3hodG1sMS1zdHJpY3QuZHRk
Ij4KKzxodG1sIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hodG1sIj4KKyA8aGVhZD4K
KyAgPHRpdGxlPkNTUyBSZWZ0ZXN0IFJlZmVyZW5jZTwvdGl0bGU+CisgIDxsaW5rIHJlbD0iYXV0
aG9yIiB0aXRsZT0iR8OpcmFyZCBUYWxib3QiIGhyZWY9Imh0dHA6Ly93d3cuZ3RhbGJvdC5vcmcv
QnJvd3NlckJ1Z3NTZWN0aW9uL2NzczIxdGVzdHN1aXRlLyIgLz4KKyAgPHN0eWxlIHR5cGU9InRl
eHQvY3NzIj48IVtDREFUQVsKKyAgZGl2CisgIHsKKyAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47
CisgIGhlaWdodDogMTAwcHg7CisgIHdpZHRoOiAxMDBweDsKKyAgfQorICBdXT48L3N0eWxlPgor
IDwvaGVhZD4KKyA8Ym9keT4KKyAgPHA+VGVzdCBwYXNzZXMgaWYgdGhlcmUgaXMgYSBmaWxsZWQg
Z3JlZW4gc3F1YXJlIGFuZCA8c3Ryb25nPm5vIHJlZDwvc3Ryb25nPi48L3A+CisgIDxkaXY+PC9k
aXY+CisgPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1h
c3BlY3QtcmF0aW8tMDI3Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0w
MjcuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwLi5lOGZhNDk0MzkyNWFhYjY0MjA5Mjc3MzliMjM3NDQxYzdlMGQ4
YzYxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8t
MDI3Lmh0bWwKQEAgLTAsMCArMSwxNiBAQAorPCFET0NUWVBFIGh0bWw+Cis8dGl0bGU+Q1NTIGFz
cGVjdC1yYXRpbzogUm93IGZsZXhib3ggYW5kIHRyYW5zZmVycmVkIG1pbi9tYXgtc2l6ZTwvdGl0
bGU+Cis8bGluayByZWw9ImF1dGhvciIgdGl0bGU9Ikdvb2dsZSBMTEMiIGhyZWY9Imh0dHBzOi8v
d3d3Lmdvb2dsZS5jb20vIj4KKzxsaW5rIHJlbD0iaGVscCIgaHJlZj0iaHR0cHM6Ly9kcmFmdHMu
Y3Nzd2cub3JnL2Nzcy1zaXppbmctNC8jYXNwZWN0LXJhdGlvIj4KKzxsaW5rIHJlbD0ibWF0Y2gi
IGhyZWY9Ii4uLy4uL3JlZmVyZW5jZS9yZWYtZmlsbGVkLWdyZWVuLTEwMHB4LXNxdWFyZS54aHQi
IC8+CisKKzxwPlRlc3QgcGFzc2VzIGlmIHRoZXJlIGlzIGEgZmlsbGVkIGdyZWVuIHNxdWFyZSBh
bmQgPHN0cm9uZz5ubyByZWQ8L3N0cm9uZz4uPC9wPgorCis8ZGl2IHN0eWxlPSJkaXNwbGF5OiBm
bGV4OyBmbGV4LWRpcmVjdGlvbjogcm93OyI+CisgIDxkaXYgc3R5bGU9ImJhY2tncm91bmQ6IGdy
ZWVuOyB3aWR0aDogNjBweDsgbWF4LWhlaWdodDogNTBweDsgYXNwZWN0LXJhdGlvOiAxLzE7Ij48
L2Rpdj4KKyAgPGRpdiBzdHlsZT0iYmFja2dyb3VuZDogZ3JlZW47IHdpZHRoOiA0MHB4OyBoZWln
aHQ6IDUwcHg7IiA+PC9kaXY+Cis8L2Rpdj4KKzxkaXYgc3R5bGU9ImRpc3BsYXk6IGZsZXg7IGZs
ZXgtZGlyZWN0aW9uOiByb3c7Ij4KKyAgPGRpdiBzdHlsZT0iYmFja2dyb3VuZDogZ3JlZW47IHdp
ZHRoOiA2MHB4OyBoZWlnaHQ6IDYwcHg7IG1heC1oZWlnaHQ6IDUwcHg7IGFzcGVjdC1yYXRpbzog
MS8xOyI+PC9kaXY+CisgIDxkaXYgc3R5bGU9ImJhY2tncm91bmQ6IGdyZWVuOyB3aWR0aDogNDBw
eDsgaGVpZ2h0OiA1MHB4OyIgPjwvZGl2PgorPC9kaXY+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>422206</attachid>
            <date>2021-03-04 02:01:52 -0800</date>
            <delta_ts>2021-03-05 09:28:46 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210304110151.patch</filename>
            <type>text/plain</type>
            <size>15575</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczODc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmE0YzM3YWRjZjhmMjkz
N2E1YWU3MjM0NDRmODQ1N2FmM2U2ODU2Zi4uNjY2OWQ4ZjU1OTY3NDBhYjEzM2E4ODJmZWJiMzk5
MDMwNWZiZmZhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTAzLTA0ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBGaXggZmxleC1hc3BlY3QtcmF0aW8tMDI1KzI2Lmh0bWwgYnkgZml4aW5nIHR3byB0aGlu
Z3M6CisgICAgICAgIC0gYXBwbHkgdHJhbnNmZXJyZWQgbWluL21heCBzaXplcyBmb3IgaW50cmlu
c2ljIHNpemluZy4KKyAgICAgICAgLSBtYWtlIGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRp
b1VzaW5nIHRha2UgaW50byBhY2NvdW50CisgICAgICAgICAgYm94LXNpemluZyBmb3IgdGhlIGNh
c2Ugd2hlcmUgQ1NTIGFzcGVjdC1yYXRpbyBpcyBhcHBsaWVkLgorCisgICAgICAgIEJlaGF2aW9y
IG1hdGNoZXMgQ2hyb21lIGFuZCBGaXJlZm94LgorCisgICAgICAgIFRlc3Q6IGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNw
ZWN0LXJhdGlvLTAyNy5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVC
b3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWlu
U2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl
ckZsZXhpYmxlQm94OjphZGp1c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgpOgorCiAyMDIxLTAzLTAz
ICBKZWFuLVl2ZXMgQXZlbmFyZCAgPGp5YUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIFJl
bW90ZUNvbW1hbmRMaXN0ZW5lcklPUyBpbiBmYXZvciBvZiBhIGNvbW1vbiBSZW1vdGVDb21tYW5k
TGlzdGVuZXJDb2NvYQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl
ckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJs
ZUJveC5jcHAKaW5kZXggZDNjZDIyOGM1NmI5MzM5MmNkZjBkYzQ3NDM2YTA5MDIzYzFmN2MyNC4u
MGJiMzZkNjBjMWU5OWU0ZWI0ZTY4N2QzMDc5OWQ3MmYyMDI1Mjk3YyAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2Uv
V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC03NzEsNiArNzcxLDEy
IEBAIExlbmd0aCBSZW5kZXJGbGV4aWJsZUJveDo6bWFpblNpemVMZW5ndGhGb3JDaGlsZChTaXpl
VHlwZSBzaXplVHlwZSwgY29uc3QgUmVuZGVyCiAgICAgcmV0dXJuIHsgfTsKIH0KIAorYm9vbCBS
ZW5kZXJGbGV4aWJsZUJveDo6d2lsbENoaWxkQ3Jvc3NTaXplQmVDb250YWluZXJDcm9zc1NpemUo
Y29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKK3sKKyAgICBjb25zdCBMZW5ndGgmIGNyb3Nz
U2l6ZUxlbmd0aCA9IGlzSG9yaXpvbnRhbEZsb3coKSA/IGNoaWxkLnN0eWxlKCkuaGVpZ2h0KCkg
OiBjaGlsZC5zdHlsZSgpLndpZHRoKCk7CisgICAgcmV0dXJuICFpc011bHRpbGluZSgpICYmIGNo
aWxkQ3Jvc3NTaXplSXNEZWZpbml0ZShjaGlsZCwgTGVuZ3RoKDEwMCwgTGVuZ3RoVHlwZTo6UGVy
Y2VudCkpICYmIGFsaWdubWVudEZvckNoaWxkKGNoaWxkKSA9PSBJdGVtUG9zaXRpb246OlN0cmV0
Y2ggJiYgY3Jvc3NTaXplTGVuZ3RoLmlzQXV0bygpICYmICFoYXNBdXRvTWFyZ2luc0luQ3Jvc3NB
eGlzKGNoaWxkKTsKK30KKwogYm9vbCBSZW5kZXJGbGV4aWJsZUJveDo6dXNlQ2hpbGRBc3BlY3RS
YXRpbyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdAogewogICAgIGlmICghY2hpbGRIYXNB
c3BlY3RSYXRpbyhjaGlsZCkpCkBAIC03NzksNiArNzg1LDggQEAgYm9vbCBSZW5kZXJGbGV4aWJs
ZUJveDo6dXNlQ2hpbGRBc3BlY3RSYXRpbyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdAog
ICAgICAgICAvLyBXZSBjYW4ndCBjb21wdXRlIGEgcmF0aW8gaW4gdGhpcyBjYXNlLgogICAgICAg
ICByZXR1cm4gZmFsc2U7CiAgICAgfQorICAgIGlmICh3aWxsQ2hpbGRDcm9zc1NpemVCZUNvbnRh
aW5lckNyb3NzU2l6ZShjaGlsZCkpCisgICAgICAgIHJldHVybiB0cnVlOwogICAgIHJldHVybiBj
aGlsZENyb3NzU2l6ZUlzRGVmaW5pdGUoY2hpbGQsIGNyb3NzU2l6ZUxlbmd0aEZvckNoaWxkKE1h
aW5PclByZWZlcnJlZFNpemUsIGNoaWxkKSk7CiB9CiAKQEAgLTc5MywxMSArODAxLDE5IEBAIExh
eW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRp
b1VzaW5nKGNvbnN0IFJlbmRlckJvCiAgICAgICAgIC8vIFdlIG5lZWQgdG8gc3Vic3RyYWN0IHRo
ZSBib3JkZXIgYW5kIHBhZGRpbmcgZXh0ZW50IGZyb20gdGhlIGNyb3NzIGF4aXMuCiAgICAgICAg
IC8vIEZ1cnRoZXJtb3JlLCB0aGUgc2l6aW5nIGNhbGN1bGF0aW9ucyB0aGF0IGZsb29yIHRoZSBj
b250ZW50IGJveCBzaXplIGF0IHplcm8gd2hlbiBhcHBseWluZyBib3gtc2l6aW5nIGFyZSBhbHNv
IGlnbm9yZWQuCiAgICAgICAgIC8vIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZmxleGJv
eC8jYWxnby1tYWluLWl0ZW0uCi0gICAgICAgIGlmIChib3guc3R5bGUoKS5ib3hTaXppbmcoKSA9
PSBCb3hTaXppbmc6OkJvcmRlckJveCkKKyAgICAgICAgYm9vbCBzdWJ0cmFjdEJvcmRlclBhZGRp
bmcgPSBmYWxzZTsKKyAgICAgICAgaWYgKGJveC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpCisg
ICAgICAgICAgICBzdWJ0cmFjdEJvcmRlclBhZGRpbmcgPSBib3guc3R5bGUoKS5ib3hTaXppbmdG
b3JBc3BlY3RSYXRpbygpID09IEJveFNpemluZzo6Q29udGVudEJveDsKKyAgICAgICAgZWxzZSBp
ZiAoYm94LnN0eWxlKCkuYm94U2l6aW5nKCkgPT0gQm94U2l6aW5nOjpCb3JkZXJCb3gpCisgICAg
ICAgICAgICBzdWJ0cmFjdEJvcmRlclBhZGRpbmcgPSB0cnVlOworICAgICAgICBpZiAoc3VidHJh
Y3RCb3JkZXJQYWRkaW5nKQogICAgICAgICAgICAgdmFsdWUgLT0gaXNIb3Jpem9udGFsRmxvdygp
ID8gYm94LnZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpIDogYm94Lmhvcml6b250YWxC
b3JkZXJBbmRQYWRkaW5nRXh0ZW50KCk7CiAgICAgICAgIHJldHVybiB2YWx1ZTsKICAgICB9Owog
CisgICAgaWYgKGNyb3NzU2l6ZUxlbmd0aC5pc0F1dG8oKSAmJiB3aWxsQ2hpbGRDcm9zc1NpemVC
ZUNvbnRhaW5lckNyb3NzU2l6ZShjaGlsZCkpCisgICAgICAgIGNyb3NzU2l6ZUxlbmd0aCA9IExl
bmd0aCgxMDAsIExlbmd0aFR5cGU6OlBlcmNlbnQpOworCiAgICAgT3B0aW9uYWw8TGF5b3V0VW5p
dD4gY3Jvc3NTaXplOwogICAgIGlmIChjcm9zc1NpemVMZW5ndGguaXNGaXhlZCgpKQogICAgICAg
ICBjcm9zc1NpemUgPSBhZGp1c3RGb3JCb3hTaXppbmcoY2hpbGQsIGNyb3NzU2l6ZUxlbmd0aCk7
CkBAIC04MTYsMTUgKzgzMiwxOCBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21w
dXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjb25zdCBSZW5kZXJCbwogCiAgICAgY29u
c3QgTGF5b3V0U2l6ZSYgY2hpbGRJbnRyaW5zaWNTaXplID0gY2hpbGQuaW50cmluc2ljU2l6ZSgp
OwogICAgIGRvdWJsZSByYXRpbzsKLSAgICBpZiAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5
cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OlJhdGlvIHx8IChjaGlsZC5zdHlsZSgpLmFzcGVjdFJh
dGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6QXV0b0FuZFJhdGlvICYmIGNoaWxkSW50cmlu
c2ljU2l6ZS5pc0VtcHR5KCkpKQorICAgIExheW91dFVuaXQgYm9yZGVyUGFkZGluZzsKKyAgICBp
ZiAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OlJh
dGlvIHx8IChjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlw
ZTo6QXV0b0FuZFJhdGlvICYmIGNoaWxkSW50cmluc2ljU2l6ZS5pc0VtcHR5KCkpKSB7CiAgICAg
ICAgIHJhdGlvID0gY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1dpZHRoKCkgLyBjaGlsZC5zdHls
ZSgpLmFzcGVjdFJhdGlvSGVpZ2h0KCk7Ci0gICAgZWxzZSB7CisgICAgICAgIGlmIChjaGlsZC5z
dHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJhdGlvKCkgPT0gQm94U2l6aW5nOjpCb3JkZXJCb3gp
CisgICAgICAgICAgICBib3JkZXJQYWRkaW5nID0gaXNIb3Jpem9udGFsRmxvdygpID8gY2hpbGQu
aG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKSA6IGNoaWxkLnZlcnRpY2FsQm9yZGVy
QW5kUGFkZGluZ0V4dGVudCgpOworICAgIH0gZWxzZSB7CiAgICAgICAgIEFTU0VSVChjaGlsZElu
dHJpbnNpY1NpemUuaGVpZ2h0KCkpOwogICAgICAgICByYXRpbyA9IGNoaWxkSW50cmluc2ljU2l6
ZS53aWR0aCgpLnRvRmxvYXQoKSAvIGNoaWxkSW50cmluc2ljU2l6ZS5oZWlnaHQoKS50b0Zsb2F0
KCk7CiAgICAgfQogICAgIGlmIChpc0hvcml6b250YWxGbG93KCkpCi0gICAgICAgIHJldHVybiBM
YXlvdXRVbml0KGNyb3NzU2l6ZS52YWx1ZSgpICogcmF0aW8pOwotICAgIHJldHVybiBMYXlvdXRV
bml0KGNyb3NzU2l6ZS52YWx1ZSgpIC8gcmF0aW8pOworICAgICAgICByZXR1cm4gTGF5b3V0VW5p
dChjcm9zc1NpemUudmFsdWUoKSAqIHJhdGlvKSAtIGJvcmRlclBhZGRpbmc7CisgICAgcmV0dXJu
IExheW91dFVuaXQoY3Jvc3NTaXplLnZhbHVlKCkgLyByYXRpbykgLSBib3JkZXJQYWRkaW5nOwog
fQogCiB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpzZXRGbG93QXdhcmVMb2NhdGlvbkZvckNoaWxk
KFJlbmRlckJveCYgY2hpbGQsIGNvbnN0IExheW91dFBvaW50JiBsb2NhdGlvbikKQEAgLTExOTEs
MTEgKzEyMTAsMTYgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6YWRqdXN0Q2hpbGRT
aXplRm9yTWluQW5kTWF4KGNvbnN0IFJlbmRlckJveCYgY2hpbGQKICAgICAgICAgbWF4RXh0ZW50
ID0gY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQoY2hpbGQsIE1heFNpemUsIG1heCk7CiAg
ICAgICAgIGNoaWxkU2l6ZSA9IHN0ZDo6bWluKGNoaWxkU2l6ZSwgbWF4RXh0ZW50LnZhbHVlT3Io
Y2hpbGRTaXplKSk7CiAgICAgfQorICAgIExlbmd0aCBjcm9zc01heCA9IGNyb3NzU2l6ZUxlbmd0
aEZvckNoaWxkKE1heFNpemUsIGNoaWxkKTsKKyAgICBpZiAodXNlQ2hpbGRBc3BlY3RSYXRpbyhj
aGlsZCkgJiYgIWNoaWxkTWFpblNpemVJc0RlZmluaXRlKGNoaWxkLCBmbGV4QmFzaXNGb3JDaGls
ZChjaGlsZCkpICYmIGNoaWxkQ3Jvc3NTaXplSXNEZWZpbml0ZShjaGlsZCwgY3Jvc3NNYXgpKSB7
CisgICAgICAgIG1heEV4dGVudCA9IGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5n
KGNoaWxkLCBjcm9zc01heCk7CisgICAgICAgIGNoaWxkU2l6ZSA9IHN0ZDo6bWluKGNoaWxkU2l6
ZSwgbWF4RXh0ZW50LnZhbHVlT3IoY2hpbGRTaXplKSk7CisgICAgfQogCiAgICAgTGVuZ3RoIG1p
biA9IG1haW5TaXplTGVuZ3RoRm9yQ2hpbGQoTWluU2l6ZSwgY2hpbGQpOwogICAgIGlmIChtaW4u
aXNTcGVjaWZpZWRPckludHJpbnNpYygpKQogICAgICAgICByZXR1cm4gc3RkOjptYXgoY2hpbGRT
aXplLCBzdGQ6Om1heCgwX2x1LCBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjaGlsZCwg
TWluU2l6ZSwgbWluKS52YWx1ZU9yKGNoaWxkU2l6ZSkpKTsKLSAgICAKKwogICAgIGlmIChzaG91
bGRBcHBseU1pblNpemVBdXRvRm9yQ2hpbGQoY2hpbGQpKSB7CiAgICAgICAgIC8vIEZJWE1FOiBJ
ZiB0aGUgbWluIHZhbHVlIGlzIGV4cGVjdGVkIHRvIGJlIHZhbGlkIGhlcmUsIHdlIG5lZWQgdG8g
Y29tZSB1cCB3aXRoIGEgbm9uIG9wdGlvbmFsIHZlcnNpb24gb2YgY29tcHV0ZU1haW5BeGlzRXh0
ZW50Rm9yQ2hpbGQgYW5kCiAgICAgICAgIC8vIGVuc3VyZSBpdCdzIHZhbGlkIHRocm91Z2ggdGhl
IHZpcnR1YWwgY2FsbHMgb2YgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxDb250ZW50SGVpZ2h0VXNp
bmcuCkBAIC0xMjI2LDkgKzEyNTAsMTIgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6
YWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KGNvbnN0IFJlbmRlckJveCYgY2hpbGQKICAgICAg
ICAgICAgIH0KICAgICAgICAgfQogCi0gICAgICAgIHJldHVybiBzdGQ6Om1heChjaGlsZFNpemUs
IGNvbnRlbnRTaXplKTsKKyAgICAgICAgY2hpbGRTaXplID0gc3RkOjptYXgoY2hpbGRTaXplLCBj
b250ZW50U2l6ZSk7CiAgICAgfQogCisgICAgTGVuZ3RoIGNyb3NzTWluID0gY3Jvc3NTaXplTGVu
Z3RoRm9yQ2hpbGQoTWluU2l6ZSwgY2hpbGQpOworICAgIGlmIChjaGlsZEhhc0FzcGVjdFJhdGlv
KGNoaWxkKSAmJiAhY2hpbGRNYWluU2l6ZUlzRGVmaW5pdGUoY2hpbGQsIGZsZXhCYXNpc0ZvckNo
aWxkKGNoaWxkKSkgJiYgY2hpbGRDcm9zc1NpemVJc0RlZmluaXRlKGNoaWxkLCBjcm9zc01pbikp
CisgICAgICAgIHJldHVybiBzdGQ6Om1heChjaGlsZFNpemUsIGNvbXB1dGVNYWluU2l6ZUZyb21B
c3BlY3RSYXRpb1VzaW5nKGNoaWxkLCBjcm9zc01pbikpOwogICAgIHJldHVybiBzdGQ6Om1heCgw
X2x1LCBjaGlsZFNpemUpOwogfQogICAgIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu
ZGVyRmxleGlibGVCb3guaAppbmRleCA2ODBkY2Q3YzAzODA0NzJiNDk5YWQ3NDRkZWEyMWQ2OGM3
ZjRlOTQ5Li5iMTczZTJiYTVlMGE2YTYwZjU3OWY5OGNmN2NjOTNhYmQ2MTM2NDc4IDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaAorKysgYi9T
b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaApAQCAtMTQyLDYgKzE0
Miw3IEBAIHByaXZhdGU6CiAgICAgTGF5b3V0VW5pdCBjcm9zc0F4aXNTY3JvbGxiYXJFeHRlbnQo
KSBjb25zdDsKICAgICBMYXlvdXRVbml0IGNyb3NzQXhpc1Njcm9sbGJhckV4dGVudEZvckNoaWxk
KGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0OwogICAgIExheW91dFBvaW50IGZsb3dBd2Fy
ZUxvY2F0aW9uRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3Q7CisgICAgYm9v
bCB3aWxsQ2hpbGRDcm9zc1NpemVCZUNvbnRhaW5lckNyb3NzU2l6ZShjb25zdCBSZW5kZXJCb3gm
IGNoaWxkKSBjb25zdDsKICAgICBib29sIHVzZUNoaWxkQXNwZWN0UmF0aW8oY29uc3QgUmVuZGVy
Qm94JiBjaGlsZCkgY29uc3Q7CiAgICAgYm9vbCBjaGlsZENyb3NzU2l6ZVNob3VsZFVzZUNvbnRh
aW5lckNyb3NzU2l6ZShjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdDsKICAgICBMYXlvdXRV
bml0IGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJveCYg
Y2hpbGQsIExlbmd0aCBjcm9zc1NpemVMZW5ndGgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvTGF5b3V0
VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGUyY2E0ZWE3YjIy
OTNjOWNiZWFiZTE4NzU5NDY1MjY1YzI5Yjg2YTEuLmVlOGEzMTMxZTU4MWViMWJlN2FlOGU3NTJj
ZjkyYjU1ODUzMmJiMjQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9M
YXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wMy0wNCAgUm9iIEJ1
aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIEZpeCBmbGV4LWFzcGVjdC1yYXRpby0w
MjUrMjYuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjIyMzU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgQWRhcHQgcGxhdGZvcm0gdGVzdCBleHBlY3RhdGlvbnMuCisKKyAgICAgICAgKiBUZXN0RXhw
ZWN0YXRpb25zOgorCiAyMDIxLTAzLTAzICBSeWFuIEhhZGRhZCAgPHJ5YW5oYWRkYWRAYXBwbGUu
Y29tPgogCiAgICAgICAgIFsgQ2F0YWxpbmEgd2sxIGV3cyBdIG1lZGlhL3JlbW90ZS1jb250cm9s
LWNvbW1hbmQtc2Vlay5odG1sIGlzIGEgZmxha3kgdGltZW91dApkaWZmIC0tZ2l0IGEvTGF5b3V0
VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9D
aGFuZ2VMb2cKaW5kZXggYjg1YTFhYTIxNDI1MDU0N2YxOWFiOWVjNjgxZDdmZjY3ZTM5NjY4MC4u
YjMyZDliZjNiNGY1NDY1NjJiOTk2Yjk4NDYxYjdhZmYxMzcxM2UyMiAxMDA2NDQKLS0tIGEvTGF5
b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRl
ZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjEtMDMtMDQgIFJvYiBCdWlzICA8
cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBGaXggZmxleC1hc3BlY3QtcmF0aW8tMDI1KzI2
Lmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy
MjM1NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN5
bmMgdGhlc2UgdGVzdHMgdG8gdGVzdCBib3RoIG1haW4gYW5kIGNyb3NzIHNpemUgcGFkZGluZy4K
KworICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0
aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWw6CisgICAgICAgICogd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjYuaHRt
bDoKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh
dGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNy1leHBlY3RlZC54aHQ6IEFkZGVkLgorICAgICAgICAq
IHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3Bl
Y3QtcmF0aW8tMDI3Lmh0bWw6IEFkZGVkLgorCiAyMDIxLTAzLTAzICBTZXJnaW8gVmlsbGFyIFNl
bmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtjc3MtZmxleGJveF0gSW1wb3J0
IGxhdGVzdCBXUFQgdGVzdHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlv
bnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDUyOGEwYWZiNWQ4NTI3ZDJk
NDkxYjZlZGNlNTM3ZGNlNTc4NWIxYmYuLjFkZjY4YTVjOWU1ZmZmNTk5MGMwNmViMTgxOWJhMjJm
MWU3MjAxZmIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIv
TGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDU1NSw4ICs0NTU1LDYgQEAgd2Via2l0
Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6
aW5nL2FzcGVjdC1yYXRpby8KICMgZmxleC1iYXNpczpjb250ZW50CiB3ZWJraXQub3JnL2IvMjE0
NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0
LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3
ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMi5odG1sIFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAy
NS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgt
YXNwZWN0LXJhdGlvLTAyNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2Iv
MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw
ZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd
CiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxNi5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlv
LTAxNy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9p
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp
by9mbGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0
LXJhdGlvLTAyNi5odG1sCmluZGV4IDFkZjE0NDY4NjMyYmFhOGZmZDAzZDY5MGY3ZGRhYTYxOGFj
ZDdiZjYuLmM0YTI1MDgxOGJiNzc4NmUyZjM5NTkyMmQyOGUzYzc1MTliNGVhM2EgMTAwNjQ0Ci0t
LSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z
aXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sCisrKyBiL0xheW91
dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw
ZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sCkBAIC0xNSw2ICsxNSw3IEBACiAg
IC5pdGVtIHsKICAgICBiYWNrZ3JvdW5kOiBncmVlbjsKICAgICBwYWRkaW5nLWxlZnQ6IDE1cHg7
CisgICAgcGFkZGluZy10b3A6IDEwcHg7CiAgICAgYm94LXNpemluZzogYm9yZGVyLWJveDsKICAg
fQogICAuaXRlbSA+IGRpdiB7CkBAIC01MywyNSArNTQsMjUgQEAKICAgICAgICBiZWNhdXNlIGl0
cyB2YWx1ZSBjb250YWlucyAnYXV0bycuIC0tPgogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVy
IiBzdHlsZT0iaGVpZ2h0OiBhdXRvOyI+CiAgICAgPCEtLSBUaGUgY29udGVudC1ib3ggd2lkdGgg
MTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcg
YSByZXNvbHZlZCBmbGV4IGJhc2Ugc2l6ZSBvZiAyMDBweC4gLS0+Ci0gICAgPGRpdiBjbGFzcz0i
aXRlbSIgc3R5bGU9Im1pbi1oZWlnaHQ6MDsgd2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0
byAxLzIwOyI+PGRpdj48L2Rpdj48L2Rpdj4KKyAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQg
ZmxleCBiYXNlIHNpemUgb2YgMTkwcHguIC0tPgorICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxl
PSJtaW4taGVpZ2h0OjA7IHdpZHRoOiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMS8xOTsiPjxk
aXY+PC9kaXY+PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIi
PgogICAgIDwhLS0gVGhlIGNvbnRlbnQtYm94IHdpZHRoIDEwcHggaXMgdHJhbnNmZXJyZWQgdG8g
dGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLWhlaWdodDph
dXRvIG9mIDIwMHB4LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0id2lkdGg6IDI1
cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzIwOyI+PGRpdj48L2Rpdj48L2Rpdj4KKyAgICAgICAg
IHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLWhlaWdodDphdXRvIG9mIDE5MHB4LiAtLT4KKyAgICA8
ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0id2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAx
LzE5OyI+PGRpdj48L2Rpdj48L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRpdiBjbGFzcz0iZmxleENv
bnRhaW5lciI+CiAgICAgPCEtLSBUaGUgY29udGVudC1ib3ggbWluLXdpZHRoIDEwcHggaXMgdHJh
bnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQg
bWluLWhlaWdodDphdXRvIG9mIDIwMHB4LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHls
ZT0ibWluLXdpZHRoOiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMS8yMDsiPjxkaXY+PC9kaXY+
PC9kaXY+CisgICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi1oZWlnaHQ6YXV0byBvZiAx
OTBweC4gLS0+CisgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi13aWR0aDogMjVweDsg
YXNwZWN0LXJhdGlvOiBhdXRvIDEvMTk7Ij48ZGl2PjwvZGl2PjwvZGl2PgogICA8L2Rpdj4KIAog
ICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KICAgICA8IS0tIFRoZSBjb250ZW50LWJveCB3
aWR0aCAxMHB4IChjbGFtcGVkIGJ5IG1heC13aWR0aCkgaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1h
aW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLWhlaWdodDphdXRvIG9m
IDIwMHB4LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWF4LXdpZHRoOiAyNXB4
OyB3aWR0aDogMTAwcHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzIwOyI+PGRpdj48L2Rpdj48L2Rp
dj4KKyAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLWhlaWdodDphdXRvIG9mIDE5MHB4
LiAtLT4KKyAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWF4LXdpZHRoOiAyNXB4OyB3aWR0
aDogMTAwcHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE5OyI+PGRpdj48L2Rpdj48L2Rpdj4KICAg
PC9kaXY+CiA8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1y
YXRpby0wMjctZXhwZWN0ZWQueGh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8t
MDI3LWV4cGVjdGVkLnhodApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wNWExMzc5NDQ4MmE5NGY2YzEwYmQ5ZDRjOTg3
MDRlNjNlZjYwMzMxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3Bl
Y3QtcmF0aW8tMDI3LWV4cGVjdGVkLnhodApAQCAtMCwwICsxLDE5IEBACis8IURPQ1RZUEUgaHRt
bCBQVUJMSUMgIi0vL1czQy8vRFREIFhIVE1MIDEuMCBTdHJpY3QvL0VOIiAiaHR0cDovL3d3dy53
My5vcmcvVFIveGh0bWwxL0RURC94aHRtbDEtc3RyaWN0LmR0ZCI+Cis8aHRtbCB4bWxucz0iaHR0
cDovL3d3dy53My5vcmcvMTk5OS94aHRtbCI+CisgPGhlYWQ+CisgIDx0aXRsZT5DU1MgUmVmdGVz
dCBSZWZlcmVuY2U8L3RpdGxlPgorICA8bGluayByZWw9ImF1dGhvciIgdGl0bGU9IkfDqXJhcmQg
VGFsYm90IiBocmVmPSJodHRwOi8vd3d3Lmd0YWxib3Qub3JnL0Jyb3dzZXJCdWdzU2VjdGlvbi9j
c3MyMXRlc3RzdWl0ZS8iIC8+CisgIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+PCFbQ0RBVEFbCisg
IGRpdgorICB7CisgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworICBoZWlnaHQ6IDEwMHB4Owor
ICB3aWR0aDogMTAwcHg7CisgIH0KKyAgXV0+PC9zdHlsZT4KKyA8L2hlYWQ+CisgPGJvZHk+Cisg
IDxwPlRlc3QgcGFzc2VzIGlmIHRoZXJlIGlzIGEgZmlsbGVkIGdyZWVuIHNxdWFyZSBhbmQgPHN0
cm9uZz5ubyByZWQ8L3N0cm9uZz4uPC9wPgorICA8ZGl2PjwvZGl2PgorIDwvYm9keT4KKzwvaHRt
bD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNy5odG1s
IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp
emluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI3Lmh0bWwKbmV3IGZpbGUgbW9k
ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u
ZThmYTQ5NDM5MjVhYWI2NDIwOTI3NzM5YjIzNzQ0MWM3ZTBkOGM2MQotLS0gL2Rldi9udWxsCisr
KyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z
aXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNy5odG1sCkBAIC0wLDAgKzEs
MTYgQEAKKzwhRE9DVFlQRSBodG1sPgorPHRpdGxlPkNTUyBhc3BlY3QtcmF0aW86IFJvdyBmbGV4
Ym94IGFuZCB0cmFuc2ZlcnJlZCBtaW4vbWF4LXNpemU8L3RpdGxlPgorPGxpbmsgcmVsPSJhdXRo
b3IiIHRpdGxlPSJHb29nbGUgTExDIiBocmVmPSJodHRwczovL3d3dy5nb29nbGUuY29tLyI+Cis8
bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3Mtc2l6aW5n
LTQvI2FzcGVjdC1yYXRpbyI+Cis8bGluayByZWw9Im1hdGNoIiBocmVmPSIuLi8uLi9yZWZlcmVu
Y2UvcmVmLWZpbGxlZC1ncmVlbi0xMDBweC1zcXVhcmUueGh0IiAvPgorCis8cD5UZXN0IHBhc3Nl
cyBpZiB0aGVyZSBpcyBhIGZpbGxlZCBncmVlbiBzcXVhcmUgYW5kIDxzdHJvbmc+bm8gcmVkPC9z
dHJvbmc+LjwvcD4KKworPGRpdiBzdHlsZT0iZGlzcGxheTogZmxleDsgZmxleC1kaXJlY3Rpb246
IHJvdzsiPgorICA8ZGl2IHN0eWxlPSJiYWNrZ3JvdW5kOiBncmVlbjsgd2lkdGg6IDYwcHg7IG1h
eC1oZWlnaHQ6IDUwcHg7IGFzcGVjdC1yYXRpbzogMS8xOyI+PC9kaXY+CisgIDxkaXYgc3R5bGU9
ImJhY2tncm91bmQ6IGdyZWVuOyB3aWR0aDogNDBweDsgaGVpZ2h0OiA1MHB4OyIgPjwvZGl2Pgor
PC9kaXY+Cis8ZGl2IHN0eWxlPSJkaXNwbGF5OiBmbGV4OyBmbGV4LWRpcmVjdGlvbjogcm93OyI+
CisgIDxkaXYgc3R5bGU9ImJhY2tncm91bmQ6IGdyZWVuOyB3aWR0aDogNjBweDsgaGVpZ2h0OiA2
MHB4OyBtYXgtaGVpZ2h0OiA1MHB4OyBhc3BlY3QtcmF0aW86IDEvMTsiPjwvZGl2PgorICA8ZGl2
IHN0eWxlPSJiYWNrZ3JvdW5kOiBncmVlbjsgd2lkdGg6IDQwcHg7IGhlaWdodDogNTBweDsiID48
L2Rpdj4KKzwvZGl2Pgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>422374</attachid>
            <date>2021-03-05 09:28:51 -0800</date>
            <delta_ts>2021-03-06 03:41:30 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210305182849.patch</filename>
            <type>text/plain</type>
            <size>16416</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczOTczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmRmODFkOGIwMjFmN2Ix
NWZkZjA3YmM2NzkyYmYxMGM3MWY4ODdmYi4uYzA4NjFlZGE5ZWRmODk2YjE2MGQ5YTlhNzJiYjZm
MjIwZTFkYjQ1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTAzLTA1ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBGaXggZmxleC1hc3BlY3QtcmF0aW8tMDI1KzI2Lmh0bWwgYnkgZml4aW5nIHR3byB0aGlu
Z3M6CisgICAgICAgIC0gYXBwbHkgdHJhbnNmZXJyZWQgbWluL21heCBzaXplcyBmb3IgaW50cmlu
c2ljIHNpemluZy4KKyAgICAgICAgLSBtYWtlIGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRp
b1VzaW5nIHRha2UgaW50byBhY2NvdW50CisgICAgICAgICAgYm94LXNpemluZyBmb3IgdGhlIGNh
c2Ugd2hlcmUgQ1NTIGFzcGVjdC1yYXRpbyBpcyBhcHBsaWVkLgorCisgICAgICAgIEJlaGF2aW9y
IG1hdGNoZXMgQ2hyb21lIGFuZCBGaXJlZm94LgorCisgICAgICAgIFRlc3Q6IGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNw
ZWN0LXJhdGlvLTAyNy5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVC
b3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWlu
U2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl
ckZsZXhpYmxlQm94OjphZGp1c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgpOgorCiAyMDIxLTAzLTA1
ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBX
aW5kb3dzIGJ1aWxkIGZpeCBhZnRlciByMjczOTY2LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl
cmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKaW5kZXggOWJjNjM2MjYzOWZlMTJkNWY0OTIwZWQ4
N2MyNmE1OWVhNTRlYzBmMS4uMDFiZjYyMjM1YmVlYzkwMGEzZmY3MmFmNWZkN2ZlZTZiMGJhNGIz
YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94
LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3Bw
CkBAIC03OTYsNyArNzk2LDEyIEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1
dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJvCiAgICAgICAgIC8v
IFdlIG5lZWQgdG8gc3Vic3RyYWN0IHRoZSBib3JkZXIgYW5kIHBhZGRpbmcgZXh0ZW50IGZyb20g
dGhlIGNyb3NzIGF4aXMuCiAgICAgICAgIC8vIEZ1cnRoZXJtb3JlLCB0aGUgc2l6aW5nIGNhbGN1
bGF0aW9ucyB0aGF0IGZsb29yIHRoZSBjb250ZW50IGJveCBzaXplIGF0IHplcm8gd2hlbiBhcHBs
eWluZyBib3gtc2l6aW5nIGFyZSBhbHNvIGlnbm9yZWQuCiAgICAgICAgIC8vIGh0dHBzOi8vZHJh
ZnRzLmNzc3dnLm9yZy9jc3MtZmxleGJveC8jYWxnby1tYWluLWl0ZW0uCi0gICAgICAgIGlmIChi
b3guc3R5bGUoKS5ib3hTaXppbmcoKSA9PSBCb3hTaXppbmc6OkJvcmRlckJveCkKKyAgICAgICAg
Ym9vbCBzdWJ0cmFjdEJvcmRlclBhZGRpbmcgPSBmYWxzZTsKKyAgICAgICAgaWYgKGJveC5zdHls
ZSgpLmhhc0FzcGVjdFJhdGlvKCkpCisgICAgICAgICAgICBzdWJ0cmFjdEJvcmRlclBhZGRpbmcg
PSBib3guc3R5bGUoKS5ib3hTaXppbmdGb3JBc3BlY3RSYXRpbygpID09IEJveFNpemluZzo6Q29u
dGVudEJveDsKKyAgICAgICAgZWxzZSBpZiAoYm94LnN0eWxlKCkuYm94U2l6aW5nKCkgPT0gQm94
U2l6aW5nOjpCb3JkZXJCb3gpCisgICAgICAgICAgICBzdWJ0cmFjdEJvcmRlclBhZGRpbmcgPSB0
cnVlOworICAgICAgICBpZiAoc3VidHJhY3RCb3JkZXJQYWRkaW5nKQogICAgICAgICAgICAgdmFs
dWUgLT0gaXNIb3Jpem9udGFsRmxvdygpID8gYm94LnZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4
dGVudCgpIDogYm94Lmhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCk7CiAgICAgICAg
IHJldHVybiB2YWx1ZTsKICAgICB9OwpAQCAtODE5LDE1ICs4MjQsMTggQEAgTGF5b3V0VW5pdCBS
ZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoY29u
c3QgUmVuZGVyQm8KIAogICAgIGNvbnN0IExheW91dFNpemUmIGNoaWxkSW50cmluc2ljU2l6ZSA9
IGNoaWxkLmludHJpbnNpY1NpemUoKTsKICAgICBkb3VibGUgcmF0aW87Ci0gICAgaWYgKGNoaWxk
LnN0eWxlKCkuYXNwZWN0UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpSYXRpbyB8fCAo
Y2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OkF1dG9B
bmRSYXRpbyAmJiBjaGlsZEludHJpbnNpY1NpemUuaXNFbXB0eSgpKSkKKyAgICBMYXlvdXRVbml0
IGJvcmRlclBhZGRpbmc7CisgICAgaWYgKGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9UeXBlKCkg
PT0gQXNwZWN0UmF0aW9UeXBlOjpSYXRpbyB8fCAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5
cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OkF1dG9BbmRSYXRpbyAmJiBjaGlsZEludHJpbnNpY1Np
emUuaXNFbXB0eSgpKSkgewogICAgICAgICByYXRpbyA9IGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0
aW9XaWR0aCgpIC8gY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb0hlaWdodCgpOwotICAgIGVsc2Ug
eworICAgICAgICBpZiAoY2hpbGQuc3R5bGUoKS5ib3hTaXppbmdGb3JBc3BlY3RSYXRpbygpID09
IEJveFNpemluZzo6Qm9yZGVyQm94KQorICAgICAgICAgICAgYm9yZGVyUGFkZGluZyA9IGlzSG9y
aXpvbnRhbEZsb3coKSA/IGNoaWxkLmhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCkg
OiBjaGlsZC52ZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKTsKKyAgICB9IGVsc2Ugewog
ICAgICAgICBBU1NFUlQoY2hpbGRJbnRyaW5zaWNTaXplLmhlaWdodCgpKTsKICAgICAgICAgcmF0
aW8gPSBjaGlsZEludHJpbnNpY1NpemUud2lkdGgoKS50b0Zsb2F0KCkgLyBjaGlsZEludHJpbnNp
Y1NpemUuaGVpZ2h0KCkudG9GbG9hdCgpOwogICAgIH0KICAgICBpZiAoaXNIb3Jpem9udGFsRmxv
dygpKQotICAgICAgICByZXR1cm4gTGF5b3V0VW5pdChjcm9zc1NpemUudmFsdWUoKSAqIHJhdGlv
KTsKLSAgICByZXR1cm4gTGF5b3V0VW5pdChjcm9zc1NpemUudmFsdWUoKSAvIHJhdGlvKTsKKyAg
ICAgICAgcmV0dXJuIExheW91dFVuaXQoY3Jvc3NTaXplLnZhbHVlKCkgKiByYXRpbykgLSBib3Jk
ZXJQYWRkaW5nOworICAgIHJldHVybiBMYXlvdXRVbml0KGNyb3NzU2l6ZS52YWx1ZSgpIC8gcmF0
aW8pIC0gYm9yZGVyUGFkZGluZzsKIH0KIAogdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6c2V0Rmxv
d0F3YXJlTG9jYXRpb25Gb3JDaGlsZChSZW5kZXJCb3gmIGNoaWxkLCBjb25zdCBMYXlvdXRQb2lu
dCYgbG9jYXRpb24pCkBAIC0xMTk2LDExICsxMjA0LDIxIEBAIExheW91dFVuaXQgUmVuZGVyRmxl
eGlibGVCb3g6OmFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heChjb25zdCBSZW5kZXJCb3gmIGNo
aWxkCiAgICAgICAgIGNoaWxkU2l6ZSA9IHN0ZDo6bWluKGNoaWxkU2l6ZSwgbWF4RXh0ZW50LnZh
bHVlT3IoY2hpbGRTaXplKSk7CiAgICAgfQogCisgICAgTGVuZ3RoIGNyb3NzTWF4ID0gY3Jvc3NT
aXplTGVuZ3RoRm9yQ2hpbGQoTWF4U2l6ZSwgY2hpbGQpOworICAgIGlmIChjaGlsZC5zdHlsZSgp
Lmhhc0FzcGVjdFJhdGlvKCkgJiYgIWNoaWxkTWFpblNpemVJc0RlZmluaXRlKGNoaWxkLCBmbGV4
QmFzaXNGb3JDaGlsZChjaGlsZCkpICYmIGNoaWxkQ3Jvc3NTaXplSXNEZWZpbml0ZShjaGlsZCwg
Y3Jvc3NNYXgpKSB7CisgICAgICAgIG1heEV4dGVudCA9IGNvbXB1dGVNYWluU2l6ZUZyb21Bc3Bl
Y3RSYXRpb1VzaW5nKGNoaWxkLCBjcm9zc01heCk7CisgICAgICAgIGNoaWxkU2l6ZSA9IHN0ZDo6
bWluKGNoaWxkU2l6ZSwgbWF4RXh0ZW50LnZhbHVlT3IoY2hpbGRTaXplKSk7CisgICAgfQorCiAg
ICAgTGVuZ3RoIG1pbiA9IG1haW5TaXplTGVuZ3RoRm9yQ2hpbGQoTWluU2l6ZSwgY2hpbGQpOwog
ICAgIC8vIEludHJpbnNpYyBzaXplcyBpbiBjaGlsZCdzIGJsb2NrIGF4aXMgYXJlIGhhbmRsZWQg
YnkgdGhlIG1pbi1zaXplOmF1dG8gY29kZSBwYXRoLgogICAgIGlmIChtaW4uaXNTcGVjaWZpZWQo
KSB8fCAobWluLmlzSW50cmluc2ljKCkgJiYgbWFpbkF4aXNJc0NoaWxkSW5saW5lQXhpcyhjaGls
ZCkpKQogICAgICAgICByZXR1cm4gc3RkOjptYXgoY2hpbGRTaXplLCBzdGQ6Om1heCgwX2x1LCBj
b21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjaGlsZCwgTWluU2l6ZSwgbWluKS52YWx1ZU9y
KGNoaWxkU2l6ZSkpKTsKLSAgICAKKworICAgIExlbmd0aCBjcm9zc01pbiA9IGNyb3NzU2l6ZUxl
bmd0aEZvckNoaWxkKE1pblNpemUsIGNoaWxkKTsKKyAgICBpZiAoY2hpbGQuc3R5bGUoKS5oYXNB
c3BlY3RSYXRpbygpICYmICFjaGlsZE1haW5TaXplSXNEZWZpbml0ZShjaGlsZCwgZmxleEJhc2lz
Rm9yQ2hpbGQoY2hpbGQpKSAmJiBjaGlsZENyb3NzU2l6ZUlzRGVmaW5pdGUoY2hpbGQsIGNyb3Nz
TWluKSkKKyAgICAgICAgcmV0dXJuIHN0ZDo6bWF4KGNoaWxkU2l6ZSwgY29tcHV0ZU1haW5TaXpl
RnJvbUFzcGVjdFJhdGlvVXNpbmcoY2hpbGQsIGNyb3NzTWluKSk7CisKICAgICBpZiAoc2hvdWxk
QXBwbHlNaW5TaXplQXV0b0ZvckNoaWxkKGNoaWxkKSkgewogICAgICAgICAvLyBGSVhNRTogSWYg
dGhlIG1pbiB2YWx1ZSBpcyBleHBlY3RlZCB0byBiZSB2YWxpZCBoZXJlLCB3ZSBuZWVkIHRvIGNv
bWUgdXAgd2l0aCBhIG5vbiBvcHRpb25hbCB2ZXJzaW9uIG9mIGNvbXB1dGVNYWluQXhpc0V4dGVu
dEZvckNoaWxkIGFuZAogICAgICAgICAvLyBlbnN1cmUgaXQncyB2YWxpZCB0aHJvdWdoIHRoZSB2
aXJ0dWFsIGNhbGxzIG9mIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsQ29udGVudEhlaWdodFVzaW5n
LgpAQCAtMTIyMiwxMCArMTI0MCw4IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmFk
anVzdENoaWxkU2l6ZUZvck1pbkFuZE1heChjb25zdCBSZW5kZXJCb3gmIGNoaWxkCiAgICAgICAg
ICAgICBMYXlvdXRVbml0IHNwZWNpZmllZFNpemUgPSBzdGQ6Om1pbihyZXNvbHZlZE1haW5TaXpl
LCBtYXhFeHRlbnQudmFsdWVPcihyZXNvbHZlZE1haW5TaXplKSk7CiAgICAgICAgICAgICByZXR1
cm4gc3RkOjptYXgoY2hpbGRTaXplLCBzdGQ6Om1pbihzcGVjaWZpZWRTaXplLCBjb250ZW50U2l6
ZSkpOwogICAgICAgICB9Ci0KICAgICAgICAgaWYgKHVzZUNoaWxkQXNwZWN0UmF0aW8oY2hpbGQp
IHx8IGNoaWxkQ3Jvc3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NTaXplKGNoaWxkKSkgewot
ICAgICAgICAgICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gdHJhbnNmZXJyZWRTaXplID0gY29tcHV0
ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoY2hpbGQsIGNoaWxkQ3Jvc3NTaXplTGVuZ3Ro
KTsKLSAgICAgICAgICAgIGlmICh0cmFuc2ZlcnJlZFNpemUpIHsKKyAgICAgICAgICAgIGlmIChP
cHRpb25hbDxMYXlvdXRVbml0PiB0cmFuc2ZlcnJlZFNpemUgPSBjb21wdXRlTWFpblNpemVGcm9t
QXNwZWN0UmF0aW9Vc2luZyhjaGlsZCwgY2hpbGRDcm9zc1NpemVMZW5ndGgpKSB7CiAgICAgICAg
ICAgICAgICAgdHJhbnNmZXJyZWRTaXplID0gYWRqdXN0Q2hpbGRTaXplRm9yQXNwZWN0UmF0aW9D
cm9zc0F4aXNNaW5BbmRNYXgoY2hpbGQsIHRyYW5zZmVycmVkU2l6ZS52YWx1ZSgpKTsKICAgICAg
ICAgICAgICAgICByZXR1cm4gc3RkOjptYXgoY2hpbGRTaXplLCBzdGQ6Om1pbih0cmFuc2ZlcnJl
ZFNpemUudmFsdWUoKSwgY29udGVudFNpemUpKTsKICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBh
L0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAxOWRi
MTQxZmY1YTA5OTViZTBjMTNiMTUxZTM3MzI5NWUzOTQ2MWQ0Li5hY2ZjNTk0ZDI0Y2VhMmM3YjQ0
NTVhYWQ2OGQwZGQ1Y2NjYWFkNWYzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK
KysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDMtMDUg
IFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBGaXggZmxleC1hc3BlY3Qt
cmF0aW8tMDI1KzI2Lmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i
dWcuY2dpP2lkPTIyMjM1NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor
CisgICAgICAgIEFkYXB0IHBsYXRmb3JtIHRlc3QgZXhwZWN0YXRpb25zLgorCisgICAgICAgICog
VGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0wMy0wNSAgQ2hhbmdTZW9rIE9oICA8Y2hhbmdzZW9r
QHdlYmtpdC5vcmc+CiAKICAgICAgICAgQVZJRiBkZWNvZGluZyBzdXBwb3J0CmRpZmYgLS1naXQg
YS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0
ZWQvdzNjL0NoYW5nZUxvZwppbmRleCA2MDg3OWVkNDgxNWUyNzA2NDgzZjU1MmJhOTZhMDk5MzNj
YjVjZmVhLi4xZmI2M2IwOTRhOGI1MDk2ZjRiM2ZiZGJhYzJiOTVmNmIwZDg4NzE5IDEwMDY0NAot
LS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz
L2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAyMS0wMy0wNSAgUm9i
IEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIEZpeCBmbGV4LWFzcGVjdC1yYXRp
by0wMjUrMjYuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MjIyMzU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgU3luYyB0aGVzZSB0ZXN0cyB0byB0ZXN0IGJvdGggbWFpbiBhbmQgY3Jvc3Mgc2l6ZSBw
YWRkaW5nLgorCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz
cGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbDoKKyAgICAgICAgKiB3ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlv
LTAyNi5odG1sOgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h
c3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI3LWV4cGVjdGVkLnhodDogQWRkZWQuCisg
ICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9m
bGV4LWFzcGVjdC1yYXRpby0wMjcuaHRtbDogQWRkZWQuCisKIDIwMjEtMDMtMDUgIENocmlzIExv
cmQgIDxjbG9yZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIEFsbG93IENTUyBmb250LXN0eWxpbmcg
Zm9yIGNhbnZhcyB3aXRob3V0IFJlbmRlclN0eWxlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9U
ZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCA0NGQw
OTVjOTA0M2IwYTRhNjkxMTkzZDk2M2JiZDAxMzdkY2I1MDJkLi4zODhjYTg0OTBkNzY1YzdjYTk0
MmRjY2E4ZTAyYTBkNzg2NDgyNDVkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0
YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTQ1NTYsOCArNDU1
Niw2IEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vCiAjIGZsZXgtYmFzaXM6Y29udGVudAogd2Vi
a2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
c2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjEuaHRtbCBbIEltYWdlT25s
eUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjIu
aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFz
cGVjdC1yYXRpby0wMjUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIx
NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj
dC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQog
d2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTUuaHRtbCBbIEltYWdl
T25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0w
MTYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlk
LWFzcGVjdC1yYXRpby0wMTcuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu
Zy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWwgYi9MYXlvdXRUZXN0cy9p
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp
by9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbAppbmRleCBmYTljZThlYmNlNjlmMDJlNmIxM2Q5
ZDIyMzNkMWUzYjQ2YzdmMWFiLi5jNGZmODExMGQ3YmVkNzA3OWM4NjRkZGYxOTJmODI0MjkzMmU1
ODhkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRt
bAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbApAQCAtMTQs
NiArMTQsNyBAQAogICAuaXRlbSB7CiAgICAgYmFja2dyb3VuZDogZ3JlZW47CiAgICAgcGFkZGlu
Zy10b3A6IDE1cHg7CisgICAgcGFkZGluZy1sZWZ0OiAxMHB4OwogICAgIGJveC1zaXppbmc6IGJv
cmRlci1ib3g7CiAgIH0KICAgPC9zdHlsZT4KQEAgLTQ5LDI1ICs1MCwyNSBAQAogICAgICAgIGJl
Y2F1c2UgaXRzIHZhbHVlIGNvbnRhaW5zICdhdXRvJy4gLS0+CiAgIDxkaXYgY2xhc3M9ImZsZXhD
b250YWluZXIiIHN0eWxlPSJ3aWR0aDogYXV0bzsiPgogICAgIDwhLS0gVGhlIGNvbnRlbnQtYm94
IGhlaWdodCAxMHB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMsCi0gICAgICAgICB5
aWVsZGluZyBhIHJlc29sdmVkIGZsZXggYmFzZSBzaXplIG9mIDIwMHB4LiAtLT4KLSAgICA8ZGl2
IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWluLXdpZHRoOjA7IGhlaWdodDogMjVweDsgYXNwZWN0LXJh
dGlvOiBhdXRvIDIwLzE7Ij48L2Rpdj4KKyAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgZmxl
eCBiYXNlIHNpemUgb2YgMTkwcHguIC0tPgorICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJt
aW4td2lkdGg6MDsgaGVpZ2h0OiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMTkvMTsiPjwvZGl2
PgogICA8L2Rpdj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KICAgICA8IS0tIFRo
ZSBjb250ZW50LWJveCBoZWlnaHQgMTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlz
LAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4td2lkdGg6YXV0byBvZiAyMDBweC4g
LS0+Ci0gICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9ImhlaWdodDogMjVweDsgYXNwZWN0LXJh
dGlvOiBhdXRvIDIwLzE7Ij48L2Rpdj4KKyAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWlu
LXdpZHRoOmF1dG8gb2YgMTkwcHguIC0tPgorICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJo
ZWlnaHQ6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxOS8xOyI+PC9kaXY+CiAgIDwvZGl2Pgog
CiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgogICAgIDwhLS0gVGhlIGNvbnRlbnQtYm94
IG1pbi1oZWlnaHQgMTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAg
ICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4td2lkdGg6YXV0byBvZiAyMDBweC4gLS0+Ci0gICAg
PGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi1oZWlnaHQ6IDI1cHg7IGFzcGVjdC1yYXRpbzog
YXV0byAyMC8xOyI+PC9kaXY+CisgICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi13aWR0
aDphdXRvIG9mIDE5MHB4LiAtLT4KKyAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWluLWhl
aWdodDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDE5LzE7Ij48L2Rpdj4KICAgPC9kaXY+CiAK
ICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciI+CiAgICAgPCEtLSBUaGUgY29udGVudC1ib3gg
aGVpZ2h0IDEwcHggKGNsYW1wZWQgYnkgbWF4LWhlaWdodCkgaXMgdHJhbnNmZXJyZWQKLSAgICAg
ICAgIHRvIHRoZSBtYWluIGF4aXMsIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLXdpZHRoOmF1dG8g
b2YgMjAwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtYXgtaGVpZ2h0OiAy
NXB4OyBoZWlnaHQ6IDEwMHB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMjAvMTsiPjwvZGl2PgorICAg
ICAgICAgdG8gdGhlIG1haW4gYXhpcywgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4td2lkdGg6YXV0
byBvZiAxOTBweC4gLS0+CisgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1heC1oZWlnaHQ6
IDI1cHg7IGhlaWdodDogMTAwcHg7IGFzcGVjdC1yYXRpbzogYXV0byAxOS8xOyI+PC9kaXY+CiAg
IDwvZGl2PgogPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3Qt
cmF0aW8tMDI2Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjYuaHRt
bAppbmRleCAxZGYxNDQ2ODYzMmJhYThmZmQwM2Q2OTBmN2RkYWE2MThhY2Q3YmY2Li5jNGEyNTA4
MThiYjc3ODZlMmYzOTU5MjJkMjhlM2M3NTE5YjRlYTNhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0
cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y
YXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4
LWFzcGVjdC1yYXRpby0wMjYuaHRtbApAQCAtMTUsNiArMTUsNyBAQAogICAuaXRlbSB7CiAgICAg
YmFja2dyb3VuZDogZ3JlZW47CiAgICAgcGFkZGluZy1sZWZ0OiAxNXB4OworICAgIHBhZGRpbmct
dG9wOiAxMHB4OwogICAgIGJveC1zaXppbmc6IGJvcmRlci1ib3g7CiAgIH0KICAgLml0ZW0gPiBk
aXYgewpAQCAtNTMsMjUgKzU0LDI1IEBACiAgICAgICAgYmVjYXVzZSBpdHMgdmFsdWUgY29udGFp
bnMgJ2F1dG8nLiAtLT4KICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciIgc3R5bGU9ImhlaWdo
dDogYXV0bzsiPgogICAgIDwhLS0gVGhlIGNvbnRlbnQtYm94IHdpZHRoIDEwcHggaXMgdHJhbnNm
ZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgZmxl
eCBiYXNlIHNpemUgb2YgMjAwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJt
aW4taGVpZ2h0OjA7IHdpZHRoOiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMS8yMDsiPjxkaXY+
PC9kaXY+PC9kaXY+CisgICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIGZsZXggYmFzZSBzaXpl
IG9mIDE5MHB4LiAtLT4KKyAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWluLWhlaWdodDow
OyB3aWR0aDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEvMTk7Ij48ZGl2PjwvZGl2PjwvZGl2
PgogICA8L2Rpdj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KICAgICA8IS0tIFRo
ZSBjb250ZW50LWJveCB3aWR0aCAxMHB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMs
Ci0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi1oZWlnaHQ6YXV0byBvZiAyMDBweC4g
LS0+Ci0gICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9IndpZHRoOiAyNXB4OyBhc3BlY3QtcmF0
aW86IGF1dG8gMS8yMDsiPjxkaXY+PC9kaXY+PC9kaXY+CisgICAgICAgICB5aWVsZGluZyBhIHJl
c29sdmVkIG1pbi1oZWlnaHQ6YXV0byBvZiAxOTBweC4gLS0+CisgICAgPGRpdiBjbGFzcz0iaXRl
bSIgc3R5bGU9IndpZHRoOiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMS8xOTsiPjxkaXY+PC9k
aXY+PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgogICAg
IDwhLS0gVGhlIGNvbnRlbnQtYm94IG1pbi13aWR0aCAxMHB4IGlzIHRyYW5zZmVycmVkIHRvIHRo
ZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi1oZWlnaHQ6YXV0
byBvZiAyMDBweC4gLS0+Ci0gICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi13aWR0aDog
MjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEvMjA7Ij48ZGl2PjwvZGl2PjwvZGl2PgorICAgICAg
ICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8gb2YgMTkwcHguIC0tPgorICAg
IDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4td2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzog
YXV0byAxLzE5OyI+PGRpdj48L2Rpdj48L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRpdiBjbGFzcz0i
ZmxleENvbnRhaW5lciI+CiAgICAgPCEtLSBUaGUgY29udGVudC1ib3ggd2lkdGggMTBweCAoY2xh
bXBlZCBieSBtYXgtd2lkdGgpIGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMsCi0gICAg
ICAgICB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi1oZWlnaHQ6YXV0byBvZiAyMDBweC4gLS0+Ci0g
ICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1heC13aWR0aDogMjVweDsgd2lkdGg6IDEwMHB4
OyBhc3BlY3QtcmF0aW86IGF1dG8gMS8yMDsiPjxkaXY+PC9kaXY+PC9kaXY+CisgICAgICAgICB5
aWVsZGluZyBhIHJlc29sdmVkIG1pbi1oZWlnaHQ6YXV0byBvZiAxOTBweC4gLS0+CisgICAgPGRp
diBjbGFzcz0iaXRlbSIgc3R5bGU9Im1heC13aWR0aDogMjVweDsgd2lkdGg6IDEwMHB4OyBhc3Bl
Y3QtcmF0aW86IGF1dG8gMS8xOTsiPjxkaXY+PC9kaXY+PC9kaXY+CiAgIDwvZGl2PgogPC9odG1s
PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI3LWV4cGVj
dGVkLnhodCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNy1leHBlY3RlZC54
aHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMC4uMDVhMTM3OTQ0ODJhOTRmNmMxMGJkOWQ0Yzk4NzA0ZTYzZWY2MDMzMQot
LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNy1l
eHBlY3RlZC54aHQKQEAgLTAsMCArMSwxOSBAQAorPCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9X
M0MvL0RURCBYSFRNTCAxLjAgU3RyaWN0Ly9FTiIgImh0dHA6Ly93d3cudzMub3JnL1RSL3hodG1s
MS9EVEQveGh0bWwxLXN0cmljdC5kdGQiPgorPGh0bWwgeG1sbnM9Imh0dHA6Ly93d3cudzMub3Jn
LzE5OTkveGh0bWwiPgorIDxoZWFkPgorICA8dGl0bGU+Q1NTIFJlZnRlc3QgUmVmZXJlbmNlPC90
aXRsZT4KKyAgPGxpbmsgcmVsPSJhdXRob3IiIHRpdGxlPSJHw6lyYXJkIFRhbGJvdCIgaHJlZj0i
aHR0cDovL3d3dy5ndGFsYm90Lm9yZy9Ccm93c2VyQnVnc1NlY3Rpb24vY3NzMjF0ZXN0c3VpdGUv
IiAvPgorICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPjwhW0NEQVRBWworICBkaXYKKyAgeworICBi
YWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgaGVpZ2h0OiAxMDBweDsKKyAgd2lkdGg6IDEwMHB4
OworICB9CisgIF1dPjwvc3R5bGU+CisgPC9oZWFkPgorIDxib2R5PgorICA8cD5UZXN0IHBhc3Nl
cyBpZiB0aGVyZSBpcyBhIGZpbGxlZCBncmVlbiBzcXVhcmUgYW5kIDxzdHJvbmc+bm8gcmVkPC9z
dHJvbmc+LjwvcD4KKyAgPGRpdj48L2Rpdj4KKyA8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQg
YS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6
aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjcuaHRtbCBiL0xheW91dFRlc3Rz
L2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh
dGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4
IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmU4ZmE0OTQzOTI1YWFi
NjQyMDkyNzczOWIyMzc0NDFjN2UwZDhjNjEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0
cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y
YXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjcuaHRtbApAQCAtMCwwICsxLDE2IEBACis8IURPQ1RZ
UEUgaHRtbD4KKzx0aXRsZT5DU1MgYXNwZWN0LXJhdGlvOiBSb3cgZmxleGJveCBhbmQgdHJhbnNm
ZXJyZWQgbWluL21heC1zaXplPC90aXRsZT4KKzxsaW5rIHJlbD0iYXV0aG9yIiB0aXRsZT0iR29v
Z2xlIExMQyIgaHJlZj0iaHR0cHM6Ly93d3cuZ29vZ2xlLmNvbS8iPgorPGxpbmsgcmVsPSJoZWxw
IiBocmVmPSJodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLXNpemluZy00LyNhc3BlY3QtcmF0
aW8iPgorPGxpbmsgcmVsPSJtYXRjaCIgaHJlZj0iLi4vLi4vcmVmZXJlbmNlL3JlZi1maWxsZWQt
Z3JlZW4tMTAwcHgtc3F1YXJlLnhodCIgLz4KKworPHA+VGVzdCBwYXNzZXMgaWYgdGhlcmUgaXMg
YSBmaWxsZWQgZ3JlZW4gc3F1YXJlIGFuZCA8c3Ryb25nPm5vIHJlZDwvc3Ryb25nPi48L3A+CisK
KzxkaXYgc3R5bGU9ImRpc3BsYXk6IGZsZXg7IGZsZXgtZGlyZWN0aW9uOiByb3c7Ij4KKyAgPGRp
diBzdHlsZT0iYmFja2dyb3VuZDogZ3JlZW47IHdpZHRoOiA2MHB4OyBtYXgtaGVpZ2h0OiA1MHB4
OyBhc3BlY3QtcmF0aW86IDEvMTsiPjwvZGl2PgorICA8ZGl2IHN0eWxlPSJiYWNrZ3JvdW5kOiBn
cmVlbjsgd2lkdGg6IDQwcHg7IGhlaWdodDogNTBweDsiID48L2Rpdj4KKzwvZGl2PgorPGRpdiBz
dHlsZT0iZGlzcGxheTogZmxleDsgZmxleC1kaXJlY3Rpb246IHJvdzsiPgorICA8ZGl2IHN0eWxl
PSJiYWNrZ3JvdW5kOiBncmVlbjsgd2lkdGg6IDYwcHg7IGhlaWdodDogNjBweDsgbWF4LWhlaWdo
dDogNTBweDsgYXNwZWN0LXJhdGlvOiAxLzE7Ij48L2Rpdj4KKyAgPGRpdiBzdHlsZT0iYmFja2dy
b3VuZDogZ3JlZW47IHdpZHRoOiA0MHB4OyBoZWlnaHQ6IDUwcHg7IiA+PC9kaXY+Cis8L2Rpdj4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>422484</attachid>
            <date>2021-03-06 03:41:35 -0800</date>
            <delta_ts>2021-03-06 05:15:43 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210306124133.patch</filename>
            <type>text/plain</type>
            <size>2270</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczOTgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWFhOGVjNmE3ZmM1ZjJj
ZTc4ZTg0ZWZmY2MzMGU0Y2ZmNDhiMDcyNi4uOWQ5Y2FiNmFhZTFkMzZkNTNlNGIxYjUzNmEzNzY2
YTZlN2QxMjhmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTAzLTA2ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBXSVAuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21B
c3BlY3RSYXRpb1VzaW5nIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxl
Qm94Ojpjb21wdXRlSW5uZXJGbGV4QmFzZVNpemVGb3JDaGlsZCk6CisKIDIwMjEtMDMtMDUgIFNp
bW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgc3RpY2t5IHBv
c2l0aW9uIGluY29ycmVjdCBiZWhhdmlvciBpbiB0YWJsZSB3aXRoIGRpcj1SVEwKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3Vy
Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4IDliYzYzNjI2
MzlmZTEyZDVmNDkyMGVkODdjMjZhNTllYTU0ZWMwZjEuLmI0ZmMxNjg4NmZiZjc0YTZjY2M1MmQy
ZGU3Y2EzMzZjNDdkMDhmYzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S
ZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl
ckZsZXhpYmxlQm94LmNwcApAQCAtODAxLDE2ICs4MDEsMTMgQEAgTGF5b3V0VW5pdCBSZW5kZXJG
bGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoY29uc3QgUmVu
ZGVyQm8KICAgICAgICAgcmV0dXJuIHZhbHVlOwogICAgIH07CiAKKyAgICBpZiAoY3Jvc3NTaXpl
TGVuZ3RoLmlzQXV0bygpICYmIGNoaWxkQ3Jvc3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NT
aXplKGNoaWxkKSkKKyAgICAgICAgY3Jvc3NTaXplTGVuZ3RoID0gTGVuZ3RoKExlbmd0aFR5cGU6
OkZpbGxBdmFpbGFibGUpOworCiAgICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gY3Jvc3NTaXplOwog
ICAgIGlmIChjcm9zc1NpemVMZW5ndGguaXNGaXhlZCgpKQogICAgICAgICBjcm9zc1NpemUgPSBh
ZGp1c3RGb3JCb3hTaXppbmcoY2hpbGQsIGNyb3NzU2l6ZUxlbmd0aCk7Ci0gICAgZWxzZSBpZiAo
Y3Jvc3NTaXplTGVuZ3RoLmlzQXV0bygpKSB7Ci0gICAgICAgIEFTU0VSVChjaGlsZENyb3NzU2l6
ZVNob3VsZFVzZUNvbnRhaW5lckNyb3NzU2l6ZShjaGlsZCkpOwotICAgICAgICBhdXRvIGNvbnRh
aW5lckNyb3NzU2l6ZUxlbmd0aCA9IGlzSG9yaXpvbnRhbEZsb3coKSA/IHN0eWxlKCkuaGVpZ2h0
KCkgOiBzdHlsZSgpLndpZHRoKCk7Ci0gICAgICAgIC8vIEtlZXAgdGhpcyBzeW5jJ2VkIHdpdGgg
Y2hpbGRDcm9zc1NpemVTaG91bGRVc2VDb250YWluZXJDcm9zc1NpemUoKS4KLSAgICAgICAgQVNT
RVJUKGNvbnRhaW5lckNyb3NzU2l6ZUxlbmd0aC5pc0ZpeGVkKCkpOwotICAgICAgICBjcm9zc1Np
emUgPSB2YWx1ZUZvckxlbmd0aChjb250YWluZXJDcm9zc1NpemVMZW5ndGgsIC0xX2x1KTsKLSAg
ICB9IGVsc2UgeworICAgIGVsc2UgewogICAgICAgICBBU1NFUlQoY3Jvc3NTaXplTGVuZ3RoLmlz
UGVyY2VudE9yQ2FsY3VsYXRlZCgpKTsKICAgICAgICAgY3Jvc3NTaXplID0gbWFpbkF4aXNJc0No
aWxkSW5saW5lQXhpcyhjaGlsZCkgPyBjaGlsZC5jb21wdXRlUGVyY2VudGFnZUxvZ2ljYWxIZWln
aHQoY3Jvc3NTaXplTGVuZ3RoKSA6IGFkanVzdEJvcmRlckJveExvZ2ljYWxXaWR0aEZvckJveFNp
emluZyh2YWx1ZUZvckxlbmd0aChjcm9zc1NpemVMZW5ndGgsIGNvbnRlbnRXaWR0aCgpKSwgY3Jv
c3NTaXplTGVuZ3RoLnR5cGUoKSk7CiAgICAgICAgIGlmICghY3Jvc3NTaXplKQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>422485</attachid>
            <date>2021-03-06 05:15:48 -0800</date>
            <delta_ts>2021-03-06 06:52:01 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210306141547.patch</filename>
            <type>text/plain</type>
            <size>6911</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczOTgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWFhOGVjNmE3ZmM1ZjJj
ZTc4ZTg0ZWZmY2MzMGU0Y2ZmNDhiMDcyNi4uOWQ5Y2FiNmFhZTFkMzZkNTNlNGIxYjUzNmEzNzY2
YTZlN2QxMjhmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTAzLTA2ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBXSVAuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21B
c3BlY3RSYXRpb1VzaW5nIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxl
Qm94Ojpjb21wdXRlSW5uZXJGbGV4QmFzZVNpemVGb3JDaGlsZCk6CisKIDIwMjEtMDMtMDUgIFNp
bW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgc3RpY2t5IHBv
c2l0aW9uIGluY29ycmVjdCBiZWhhdmlvciBpbiB0YWJsZSB3aXRoIGRpcj1SVEwKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3Vy
Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4IDliYzYzNjI2
MzlmZTEyZDVmNDkyMGVkODdjMjZhNTllYTU0ZWMwZjEuLjY2M2FkN2ZiNmM1MTljNGI1N2E1ZjJi
MzAzN2E1NzEzZDk2ZDQ3NDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S
ZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl
ckZsZXhpYmxlQm94LmNwcApAQCAtNzc0LDYgKzc3NCwxOCBAQCBMZW5ndGggUmVuZGVyRmxleGli
bGVCb3g6Om1haW5TaXplTGVuZ3RoRm9yQ2hpbGQoU2l6ZVR5cGUgc2l6ZVR5cGUsIGNvbnN0IFJl
bmRlcgogICAgIHJldHVybiB7IH07CiB9CiAKK2Jvb2wgUmVuZGVyRmxleGlibGVCb3g6OndpbGxD
aGlsZENyb3NzU2l6ZUJlQ29udGFpbmVyQ3Jvc3NTaXplKGNvbnN0IFJlbmRlckJveCYgY2hpbGQp
IGNvbnN0Cit7CisgICAgaWYgKCFjaGlsZEhhc0FzcGVjdFJhdGlvKGNoaWxkKSkKKyAgICAgICAg
cmV0dXJuIGZhbHNlOworICAgIGlmICghY2hpbGQuaW50cmluc2ljU2l6ZSgpLmhlaWdodCgpICYm
ICFjaGlsZC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpIHsKKyAgICAgICAgLy8gV2UgY2FuJ3Qg
Y29tcHV0ZSBhIHJhdGlvIGluIHRoaXMgY2FzZS4KKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAg
IH0KKyAgICBjb25zdCBMZW5ndGgmIGNyb3NzU2l6ZUxlbmd0aCA9IGlzSG9yaXpvbnRhbEZsb3co
KSA/IGNoaWxkLnN0eWxlKCkuaGVpZ2h0KCkgOiBjaGlsZC5zdHlsZSgpLndpZHRoKCk7CisgICAg
cmV0dXJuICFpc011bHRpbGluZSgpICYmIGNoaWxkQ3Jvc3NTaXplSXNEZWZpbml0ZShjaGlsZCwg
TGVuZ3RoKDEwMCwgTGVuZ3RoVHlwZTo6UGVyY2VudCkpICYmIGFsaWdubWVudEZvckNoaWxkKGNo
aWxkKSA9PSBJdGVtUG9zaXRpb246OlN0cmV0Y2ggJiYgY3Jvc3NTaXplTGVuZ3RoLmlzQXV0bygp
ICYmICFoYXNBdXRvTWFyZ2luc0luQ3Jvc3NBeGlzKGNoaWxkKTsKK30KKwogYm9vbCBSZW5kZXJG
bGV4aWJsZUJveDo6dXNlQ2hpbGRBc3BlY3RSYXRpbyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBj
b25zdAogewogICAgIGlmICghY2hpbGRIYXNBc3BlY3RSYXRpbyhjaGlsZCkpCkBAIC04MDEsMTYg
KzgxMywxMyBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpblNpemVG
cm9tQXNwZWN0UmF0aW9Vc2luZyhjb25zdCBSZW5kZXJCbwogICAgICAgICByZXR1cm4gdmFsdWU7
CiAgICAgfTsKIAorICAgIGlmIChjcm9zc1NpemVMZW5ndGguaXNBdXRvKCkgJiYgd2lsbENoaWxk
Q3Jvc3NTaXplQmVDb250YWluZXJDcm9zc1NpemUoY2hpbGQpKQorICAgICAgICBjcm9zc1NpemVM
ZW5ndGggPSBMZW5ndGgoTGVuZ3RoVHlwZTo6RmlsbEF2YWlsYWJsZSk7CisKICAgICBPcHRpb25h
bDxMYXlvdXRVbml0PiBjcm9zc1NpemU7CiAgICAgaWYgKGNyb3NzU2l6ZUxlbmd0aC5pc0ZpeGVk
KCkpCiAgICAgICAgIGNyb3NzU2l6ZSA9IGFkanVzdEZvckJveFNpemluZyhjaGlsZCwgY3Jvc3NT
aXplTGVuZ3RoKTsKLSAgICBlbHNlIGlmIChjcm9zc1NpemVMZW5ndGguaXNBdXRvKCkpIHsKLSAg
ICAgICAgQVNTRVJUKGNoaWxkQ3Jvc3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NTaXplKGNo
aWxkKSk7Ci0gICAgICAgIGF1dG8gY29udGFpbmVyQ3Jvc3NTaXplTGVuZ3RoID0gaXNIb3Jpem9u
dGFsRmxvdygpID8gc3R5bGUoKS5oZWlnaHQoKSA6IHN0eWxlKCkud2lkdGgoKTsKLSAgICAgICAg
Ly8gS2VlcCB0aGlzIHN5bmMnZWQgd2l0aCBjaGlsZENyb3NzU2l6ZVNob3VsZFVzZUNvbnRhaW5l
ckNyb3NzU2l6ZSgpLgotICAgICAgICBBU1NFUlQoY29udGFpbmVyQ3Jvc3NTaXplTGVuZ3RoLmlz
Rml4ZWQoKSk7Ci0gICAgICAgIGNyb3NzU2l6ZSA9IHZhbHVlRm9yTGVuZ3RoKGNvbnRhaW5lckNy
b3NzU2l6ZUxlbmd0aCwgLTFfbHUpOwotICAgIH0gZWxzZSB7CisgICAgZWxzZSB7CiAgICAgICAg
IEFTU0VSVChjcm9zc1NpemVMZW5ndGguaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkpOwogICAgICAg
ICBjcm9zc1NpemUgPSBtYWluQXhpc0lzQ2hpbGRJbmxpbmVBeGlzKGNoaWxkKSA/IGNoaWxkLmNv
bXB1dGVQZXJjZW50YWdlTG9naWNhbEhlaWdodChjcm9zc1NpemVMZW5ndGgpIDogYWRqdXN0Qm9y
ZGVyQm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKHZhbHVlRm9yTGVuZ3RoKGNyb3NzU2l6ZUxl
bmd0aCwgY29udGVudFdpZHRoKCkpLCBjcm9zc1NpemVMZW5ndGgudHlwZSgpKTsKICAgICAgICAg
aWYgKCFjcm9zc1NpemUpCkBAIC04NjEsMjggKzg3MCw2IEBAIGJvb2wgUmVuZGVyRmxleGlibGVC
b3g6OmNoaWxkTWFpblNpemVJc0RlZmluaXRlKGNvbnN0IFJlbmRlckJveCYgY2hpbGQsIGNvbnN0
IExlCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLWJvb2wgUmVuZGVyRmxleGlibGVCb3g6OmNoaWxk
Q3Jvc3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NTaXplKGNvbnN0IFJlbmRlckJveCYgY2hp
bGQpIGNvbnN0Ci17Ci0gICAgaWYgKCFjaGlsZEhhc0FzcGVjdFJhdGlvKGNoaWxkKSkKLSAgICAg
ICAgcmV0dXJuIGZhbHNlOwotICAgIGlmICghY2hpbGQuaW50cmluc2ljU2l6ZSgpLmhlaWdodCgp
ICYmICFjaGlsZC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpIHsKLSAgICAgICAgLy8gV2UgY2Fu
J3QgY29tcHV0ZSBhIHJhdGlvIGluIHRoaXMgY2FzZS4KLSAgICAgICAgcmV0dXJuIGZhbHNlOwot
ICAgIH0KLQotICAgIC8vIDkuOCBodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLWZsZXhib3gv
I2RlZmluaXRlLXNpemVzCi0gICAgLy8gMS4gSWYgYSBzaW5nbGUtbGluZSBmbGV4IGNvbnRhaW5l
ciBoYXMgYSBkZWZpbml0ZSBjcm9zcyBzaXplLCB0aGUgYXV0b21hdGljIHByZWZlcnJlZCBvdXRl
ciBjcm9zcyBzaXplIG9mIGFueQotICAgIC8vIHN0cmV0Y2hlZCBmbGV4IGl0ZW1zIGlzIHRoZSBm
bGV4IGNvbnRhaW5lcidzIGlubmVyIGNyb3NzIHNpemUgKGNsYW1wZWQgdG8gdGhlIGZsZXggaXRl
bSdzIG1pbiBhbmQgbWF4IGNyb3NzIHNpemUpCi0gICAgLy8gYW5kIGlzIGNvbnNpZGVyZWQgZGVm
aW5pdGUuCi0gICAgaWYgKCFpc011bHRpbGluZSgpICYmIGFsaWdubWVudEZvckNoaWxkKGNoaWxk
KSA9PSBJdGVtUG9zaXRpb246OlN0cmV0Y2ggJiYgIWhhc0F1dG9NYXJnaW5zSW5Dcm9zc0F4aXMo
Y2hpbGQpKSB7Ci0gICAgICAgIC8vIFRoaXMgbXVzdCBiZSBrZXB0IGluIHN5bmMgd2l0aCBjb21w
dXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZygpLgotICAgICAgICAvLyBGSVhNRTogc28g
ZmFyIHdlJ3JlIG9ubHkgY29uc2lkZXJlZCBmaXhlZCBzaXplcyBidXQgd2Ugc2hvdWxkIGV4dGVu
ZCBpdCB0byBvdGhlciBkZWZpbml0ZSBzaXplcy4KLSAgICAgICAgYXV0byYgY3Jvc3NTaXplID0g
aXNIb3Jpem9udGFsRmxvdygpID8gc3R5bGUoKS5oZWlnaHQoKSA6IHN0eWxlKCkud2lkdGgoKTsK
LSAgICAgICAgcmV0dXJuIGNyb3NzU2l6ZS5pc0ZpeGVkKCk7Ci0gICAgfQotICAgIHJldHVybiBm
YWxzZTsKLX0KLQogYm9vbCBSZW5kZXJGbGV4aWJsZUJveDo6Y2hpbGRDcm9zc1NpemVJc0RlZmlu
aXRlKGNvbnN0IFJlbmRlckJveCYgY2hpbGQsIGNvbnN0IExlbmd0aCYgbGVuZ3RoKSBjb25zdAog
ewogICAgIGlmIChsZW5ndGguaXNBdXRvKCkpCkBAIC05MzIsNyArOTE5LDcgQEAgTGF5b3V0VW5p
dCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZUlubmVyRmxleEJhc2VTaXplRm9yQ2hpbGQoUmVu
ZGVyQm94JiBjaGlsZCwKICAgICBpZiAoY2hpbGRNYWluU2l6ZUlzRGVmaW5pdGUoY2hpbGQsIGZs
ZXhCYXNpcykpCiAgICAgICAgIHJldHVybiBzdGQ6Om1heCgwX2x1LCBjb21wdXRlTWFpbkF4aXNF
eHRlbnRGb3JDaGlsZChjaGlsZCwgTWFpbk9yUHJlZmVycmVkU2l6ZSwgZmxleEJhc2lzKS52YWx1
ZSgpKTsKIAotICAgIGlmICh1c2VDaGlsZEFzcGVjdFJhdGlvKGNoaWxkKSB8fCBjaGlsZENyb3Nz
U2l6ZVNob3VsZFVzZUNvbnRhaW5lckNyb3NzU2l6ZShjaGlsZCkpIHsKKyAgICBpZiAodXNlQ2hp
bGRBc3BlY3RSYXRpbyhjaGlsZCkgfHwgd2lsbENoaWxkQ3Jvc3NTaXplQmVDb250YWluZXJDcm9z
c1NpemUoY2hpbGQpKSB7CiAgICAgICAgIGNvbnN0IExlbmd0aCYgY3Jvc3NTaXplTGVuZ3RoID0g
Y3Jvc3NTaXplTGVuZ3RoRm9yQ2hpbGQoTWFpbk9yUHJlZmVycmVkU2l6ZSwgY2hpbGQpOwogICAg
ICAgICByZXR1cm4gYWRqdXN0Q2hpbGRTaXplRm9yQXNwZWN0UmF0aW9Dcm9zc0F4aXNNaW5BbmRN
YXgoY2hpbGQsIGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNoaWxkLCBjcm9z
c1NpemVMZW5ndGgpKTsKICAgICB9CkBAIC0xMjIzLDcgKzEyMTAsNyBAQCBMYXlvdXRVbml0IFJl
bmRlckZsZXhpYmxlQm94OjphZGp1c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgoY29uc3QgUmVuZGVy
Qm94JiBjaGlsZAogICAgICAgICAgICAgcmV0dXJuIHN0ZDo6bWF4KGNoaWxkU2l6ZSwgc3RkOjpt
aW4oc3BlY2lmaWVkU2l6ZSwgY29udGVudFNpemUpKTsKICAgICAgICAgfQogCi0gICAgICAgIGlm
ICh1c2VDaGlsZEFzcGVjdFJhdGlvKGNoaWxkKSB8fCBjaGlsZENyb3NzU2l6ZVNob3VsZFVzZUNv
bnRhaW5lckNyb3NzU2l6ZShjaGlsZCkpIHsKKyAgICAgICAgaWYgKHVzZUNoaWxkQXNwZWN0UmF0
aW8oY2hpbGQpIHx8IHdpbGxDaGlsZENyb3NzU2l6ZUJlQ29udGFpbmVyQ3Jvc3NTaXplKGNoaWxk
KSkgewogICAgICAgICAgICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gdHJhbnNmZXJyZWRTaXplID0g
Y29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoY2hpbGQsIGNoaWxkQ3Jvc3NTaXpl
TGVuZ3RoKTsKICAgICAgICAgICAgIGlmICh0cmFuc2ZlcnJlZFNpemUpIHsKICAgICAgICAgICAg
ICAgICB0cmFuc2ZlcnJlZFNpemUgPSBhZGp1c3RDaGlsZFNpemVGb3JBc3BlY3RSYXRpb0Nyb3Nz
QXhpc01pbkFuZE1heChjaGlsZCwgdHJhbnNmZXJyZWRTaXplLnZhbHVlKCkpOwpkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmggYi9Tb3VyY2Uv
V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaAppbmRleCA2ODBkY2Q3YzAzODA0
NzJiNDk5YWQ3NDRkZWEyMWQ2OGM3ZjRlOTQ5Li5hNmQ4NGE1ZjZmOTYwNTgwOTA4OWMxOWQ2MWZl
OTQ4YzRiZGEyOGMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy
RmxleGlibGVCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGli
bGVCb3guaApAQCAtMTQyLDggKzE0Miw4IEBAIHByaXZhdGU6CiAgICAgTGF5b3V0VW5pdCBjcm9z
c0F4aXNTY3JvbGxiYXJFeHRlbnQoKSBjb25zdDsKICAgICBMYXlvdXRVbml0IGNyb3NzQXhpc1Nj
cm9sbGJhckV4dGVudEZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0OwogICAg
IExheW91dFBvaW50IGZsb3dBd2FyZUxvY2F0aW9uRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JiBj
aGlsZCkgY29uc3Q7CisgICAgYm9vbCB3aWxsQ2hpbGRDcm9zc1NpemVCZUNvbnRhaW5lckNyb3Nz
U2l6ZShjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdDsKICAgICBib29sIHVzZUNoaWxkQXNw
ZWN0UmF0aW8oY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3Q7Ci0gICAgYm9vbCBjaGlsZENy
b3NzU2l6ZVNob3VsZFVzZUNvbnRhaW5lckNyb3NzU2l6ZShjb25zdCBSZW5kZXJCb3gmIGNoaWxk
KSBjb25zdDsKICAgICBMYXlvdXRVbml0IGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1Vz
aW5nKGNvbnN0IFJlbmRlckJveCYgY2hpbGQsIExlbmd0aCBjcm9zc1NpemVMZW5ndGgpIGNvbnN0
OwogICAgIHZvaWQgc2V0Rmxvd0F3YXJlTG9jYXRpb25Gb3JDaGlsZChSZW5kZXJCb3gmIGNoaWxk
LCBjb25zdCBMYXlvdXRQb2ludCYpOwogICAgIExheW91dFVuaXQgY29tcHV0ZUlubmVyRmxleEJh
c2VTaXplRm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZCwgTGF5b3V0VW5pdCBtYWluQXhpc0JvcmRl
ckFuZFBhZGRpbmcpOwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>422492</attachid>
            <date>2021-03-06 06:52:06 -0800</date>
            <delta_ts>2021-03-06 08:44:09 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210306155205.patch</filename>
            <type>text/plain</type>
            <size>3642</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczOTgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWFhOGVjNmE3ZmM1ZjJj
ZTc4ZTg0ZWZmY2MzMGU0Y2ZmNDhiMDcyNi4uM2FjYTkxNDk2MmUyNWIyODJmMzI0MzA0MjNiZWEx
MDRjNmFlMWU4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTAzLTA2ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBXSVAKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJvbUFz
cGVjdFJhdGlvVXNpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVC
b3g6OmNoaWxkQ3Jvc3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NTaXplIGNvbnN0KToKKwog
MjAyMS0wMy0wNSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAg
ICAgICBzdGlja3kgcG9zaXRpb24gaW5jb3JyZWN0IGJlaGF2aW9yIGluIHRhYmxlIHdpdGggZGly
PVJUTApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxl
Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAK
aW5kZXggOWJjNjM2MjYzOWZlMTJkNWY0OTIwZWQ4N2MyNmE1OWVhNTRlYzBmMS4uMmNhNDNhMTBl
NjIzMzA3MDgwNzMzYWUxYjc4NjA3NGFkZjAwMjhhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv
cmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y
ZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC04MDEsMTUgKzgwMSwxMiBAQCBMYXlv
dXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9V
c2luZyhjb25zdCBSZW5kZXJCbwogICAgICAgICByZXR1cm4gdmFsdWU7CiAgICAgfTsKIAorICAg
IGlmIChjcm9zc1NpemVMZW5ndGguaXNBdXRvKCkgJiYgY2hpbGRDcm9zc1NpemVTaG91bGRVc2VD
b250YWluZXJDcm9zc1NpemUoY2hpbGQpKQorICAgICAgICBjcm9zc1NpemVMZW5ndGggPSBMZW5n
dGgoMTAwLCBMZW5ndGhUeXBlOjpQZXJjZW50KTsKKwogICAgIE9wdGlvbmFsPExheW91dFVuaXQ+
IGNyb3NzU2l6ZTsKLSAgICBpZiAoY3Jvc3NTaXplTGVuZ3RoLmlzRml4ZWQoKSkKKyAgICBpZiAo
Y3Jvc3NTaXplTGVuZ3RoLmlzRml4ZWQoKSkgewogICAgICAgICBjcm9zc1NpemUgPSBhZGp1c3RG
b3JCb3hTaXppbmcoY2hpbGQsIGNyb3NzU2l6ZUxlbmd0aCk7Ci0gICAgZWxzZSBpZiAoY3Jvc3NT
aXplTGVuZ3RoLmlzQXV0bygpKSB7Ci0gICAgICAgIEFTU0VSVChjaGlsZENyb3NzU2l6ZVNob3Vs
ZFVzZUNvbnRhaW5lckNyb3NzU2l6ZShjaGlsZCkpOwotICAgICAgICBhdXRvIGNvbnRhaW5lckNy
b3NzU2l6ZUxlbmd0aCA9IGlzSG9yaXpvbnRhbEZsb3coKSA/IHN0eWxlKCkuaGVpZ2h0KCkgOiBz
dHlsZSgpLndpZHRoKCk7Ci0gICAgICAgIC8vIEtlZXAgdGhpcyBzeW5jJ2VkIHdpdGggY2hpbGRD
cm9zc1NpemVTaG91bGRVc2VDb250YWluZXJDcm9zc1NpemUoKS4KLSAgICAgICAgQVNTRVJUKGNv
bnRhaW5lckNyb3NzU2l6ZUxlbmd0aC5pc0ZpeGVkKCkpOwotICAgICAgICBjcm9zc1NpemUgPSB2
YWx1ZUZvckxlbmd0aChjb250YWluZXJDcm9zc1NpemVMZW5ndGgsIC0xX2x1KTsKICAgICB9IGVs
c2UgewogICAgICAgICBBU1NFUlQoY3Jvc3NTaXplTGVuZ3RoLmlzUGVyY2VudE9yQ2FsY3VsYXRl
ZCgpKTsKICAgICAgICAgY3Jvc3NTaXplID0gbWFpbkF4aXNJc0NoaWxkSW5saW5lQXhpcyhjaGls
ZCkgPyBjaGlsZC5jb21wdXRlUGVyY2VudGFnZUxvZ2ljYWxIZWlnaHQoY3Jvc3NTaXplTGVuZ3Ro
KSA6IGFkanVzdEJvcmRlckJveExvZ2ljYWxXaWR0aEZvckJveFNpemluZyh2YWx1ZUZvckxlbmd0
aChjcm9zc1NpemVMZW5ndGgsIGNvbnRlbnRXaWR0aCgpKSwgY3Jvc3NTaXplTGVuZ3RoLnR5cGUo
KSk7CkBAIC04NzAsMTcgKzg2Nyw4IEBAIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6OmNoaWxkQ3Jv
c3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NTaXplKGNvbnN0IFJlbmRlckJvCiAgICAgICAg
IHJldHVybiBmYWxzZTsKICAgICB9CiAKLSAgICAvLyA5LjggaHR0cHM6Ly9kcmFmdHMuY3Nzd2cu
b3JnL2Nzcy1mbGV4Ym94LyNkZWZpbml0ZS1zaXplcwotICAgIC8vIDEuIElmIGEgc2luZ2xlLWxp
bmUgZmxleCBjb250YWluZXIgaGFzIGEgZGVmaW5pdGUgY3Jvc3Mgc2l6ZSwgdGhlIGF1dG9tYXRp
YyBwcmVmZXJyZWQgb3V0ZXIgY3Jvc3Mgc2l6ZSBvZiBhbnkKLSAgICAvLyBzdHJldGNoZWQgZmxl
eCBpdGVtcyBpcyB0aGUgZmxleCBjb250YWluZXIncyBpbm5lciBjcm9zcyBzaXplIChjbGFtcGVk
IHRvIHRoZSBmbGV4IGl0ZW0ncyBtaW4gYW5kIG1heCBjcm9zcyBzaXplKQotICAgIC8vIGFuZCBp
cyBjb25zaWRlcmVkIGRlZmluaXRlLgotICAgIGlmICghaXNNdWx0aWxpbmUoKSAmJiBhbGlnbm1l
bnRGb3JDaGlsZChjaGlsZCkgPT0gSXRlbVBvc2l0aW9uOjpTdHJldGNoICYmICFoYXNBdXRvTWFy
Z2luc0luQ3Jvc3NBeGlzKGNoaWxkKSkgewotICAgICAgICAvLyBUaGlzIG11c3QgYmUga2VwdCBp
biBzeW5jIHdpdGggY29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoKS4KLSAgICAg
ICAgLy8gRklYTUU6IHNvIGZhciB3ZSdyZSBvbmx5IGNvbnNpZGVyZWQgZml4ZWQgc2l6ZXMgYnV0
IHdlIHNob3VsZCBleHRlbmQgaXQgdG8gb3RoZXIgZGVmaW5pdGUgc2l6ZXMuCi0gICAgICAgIGF1
dG8mIGNyb3NzU2l6ZSA9IGlzSG9yaXpvbnRhbEZsb3coKSA/IHN0eWxlKCkuaGVpZ2h0KCkgOiBz
dHlsZSgpLndpZHRoKCk7Ci0gICAgICAgIHJldHVybiBjcm9zc1NpemUuaXNGaXhlZCgpOwotICAg
IH0KLSAgICByZXR1cm4gZmFsc2U7CisgICAgY29uc3QgTGVuZ3RoJiBjcm9zc1NpemVMZW5ndGgg
PSBpc0hvcml6b250YWxGbG93KCkgPyBjaGlsZC5zdHlsZSgpLmhlaWdodCgpIDogY2hpbGQuc3R5
bGUoKS53aWR0aCgpOworICAgIHJldHVybiAhaXNNdWx0aWxpbmUoKSAmJiBjaGlsZENyb3NzU2l6
ZUlzRGVmaW5pdGUoY2hpbGQsIExlbmd0aCgxMDAsIExlbmd0aFR5cGU6OlBlcmNlbnQpKSAmJiBh
bGlnbm1lbnRGb3JDaGlsZChjaGlsZCkgPT0gSXRlbVBvc2l0aW9uOjpTdHJldGNoICYmIGNyb3Nz
U2l6ZUxlbmd0aC5pc0F1dG8oKSAmJiAhaGFzQXV0b01hcmdpbnNJbkNyb3NzQXhpcyhjaGlsZCk7
CiB9CiAKIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6OmNoaWxkQ3Jvc3NTaXplSXNEZWZpbml0ZShj
b25zdCBSZW5kZXJCb3gmIGNoaWxkLCBjb25zdCBMZW5ndGgmIGxlbmd0aCkgY29uc3QK
</data>
<flag name="commit-queue"
          id="441592"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>422494</attachid>
            <date>2021-03-06 08:33:17 -0800</date>
            <delta_ts>2021-03-06 11:24:44 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210306173316.patch</filename>
            <type>text/plain</type>
            <size>5218</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczOTgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWFhOGVjNmE3ZmM1ZjJj
ZTc4ZTg0ZWZmY2MzMGU0Y2ZmNDhiMDcyNi4uZTM2OTVhNGJjNGRlOWJkZGU0NDIxZDc1YTYzNWJj
ZjAyNWE1MWU0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAzLTA2ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBXSVAuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OndpbGxDaGlsZENyb3NzU2l6ZUJl
Q29udGFpbmVyQ3Jvc3NTaXplIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhp
YmxlQm94Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyBjb25zdCk6CisgICAg
ICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94Lmg6CisKIDIwMjEtMDMtMDUgIFNpbW9u
IEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgc3RpY2t5IHBvc2l0
aW9uIGluY29ycmVjdCBiZWhhdmlvciBpbiB0YWJsZSB3aXRoIGRpcj1SVEwKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2Uv
V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4IDliYzYzNjI2Mzlm
ZTEyZDVmNDkyMGVkODdjMjZhNTllYTU0ZWMwZjEuLmJhOGU4YTc3Njk4NGM0MDk3MWI1N2MyYTJm
YjdjMzM3YjhlYzEwZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k
ZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZs
ZXhpYmxlQm94LmNwcApAQCAtNzg1LDE0ICs3ODUsMTcgQEAgYm9vbCBSZW5kZXJGbGV4aWJsZUJv
eDo6dXNlQ2hpbGRBc3BlY3RSYXRpbyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdAogICAg
IHJldHVybiBjaGlsZENyb3NzU2l6ZUlzRGVmaW5pdGUoY2hpbGQsIGNyb3NzU2l6ZUxlbmd0aEZv
ckNoaWxkKE1haW5PclByZWZlcnJlZFNpemUsIGNoaWxkKSk7CiB9CiAKK2Jvb2wgUmVuZGVyRmxl
eGlibGVCb3g6OndpbGxDaGlsZENyb3NzU2l6ZUJlQ29udGFpbmVyQ3Jvc3NTaXplKGNvbnN0IFJl
bmRlckJveCYgY2hpbGQpIGNvbnN0Cit7CisgICAgY29uc3QgTGVuZ3RoJiBjcm9zc1NpemVMZW5n
dGggPSBpc0hvcml6b250YWxGbG93KCkgPyBjaGlsZC5zdHlsZSgpLmhlaWdodCgpIDogY2hpbGQu
c3R5bGUoKS53aWR0aCgpOworICAgIHJldHVybiAhaXNNdWx0aWxpbmUoKSAmJiBjaGlsZENyb3Nz
U2l6ZUlzRGVmaW5pdGUoY2hpbGQsIExlbmd0aCgxMDAsIExlbmd0aFR5cGU6OlBlcmNlbnQpKSAm
JiBhbGlnbm1lbnRGb3JDaGlsZChjaGlsZCkgPT0gSXRlbVBvc2l0aW9uOjpTdHJldGNoICYmIGNy
b3NzU2l6ZUxlbmd0aC5pc0F1dG8oKSAmJiAhaGFzQXV0b01hcmdpbnNJbkNyb3NzQXhpcyhjaGls
ZCk7Cit9CiAgICAgCiBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpblNp
emVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkLCBMZW5ndGggY3Jv
c3NTaXplTGVuZ3RoKSBjb25zdAogewogICAgIEFTU0VSVChjaGlsZEhhc0FzcGVjdFJhdGlvKGNo
aWxkKSk7CiAKLSAgICBhdXRvIGFkanVzdEZvckJveFNpemluZyA9IFt0aGlzXSAoY29uc3QgUmVu
ZGVyQm94JiBib3gsIExlbmd0aCBsZW5ndGgpIC0+IExheW91dFVuaXQgewotICAgICAgICBBU1NF
UlQobGVuZ3RoLmlzRml4ZWQoKSk7Ci0gICAgICAgIGF1dG8gdmFsdWUgPSBMYXlvdXRVbml0KGxl
bmd0aC52YWx1ZSgpKTsKKyAgICBhdXRvIGFkanVzdEZvckJveFNpemluZyA9IFt0aGlzXSAoY29u
c3QgUmVuZGVyQm94JiBib3gsIExheW91dFVuaXQgdmFsdWUpIC0+IExheW91dFVuaXQgewogICAg
ICAgICAvLyBXZSBuZWVkIHRvIHN1YnN0cmFjdCB0aGUgYm9yZGVyIGFuZCBwYWRkaW5nIGV4dGVu
dCBmcm9tIHRoZSBjcm9zcyBheGlzLgogICAgICAgICAvLyBGdXJ0aGVybW9yZSwgdGhlIHNpemlu
ZyBjYWxjdWxhdGlvbnMgdGhhdCBmbG9vciB0aGUgY29udGVudCBib3ggc2l6ZSBhdCB6ZXJvIHdo
ZW4gYXBwbHlpbmcgYm94LXNpemluZyBhcmUgYWxzbyBpZ25vcmVkLgogICAgICAgICAvLyBodHRw
czovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLWZsZXhib3gvI2FsZ28tbWFpbi1pdGVtLgpAQCAtODAx
LDE4ICs4MDQsMTUgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5T
aXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoY29uc3QgUmVuZGVyQm8KICAgICAgICAgcmV0dXJuIHZh
bHVlOwogICAgIH07CiAKKyAgICBpZiAoY3Jvc3NTaXplTGVuZ3RoLmlzQXV0bygpICYmIHdpbGxD
aGlsZENyb3NzU2l6ZUJlQ29udGFpbmVyQ3Jvc3NTaXplKGNoaWxkKSkKKyAgICAgICAgY3Jvc3NT
aXplTGVuZ3RoID0gTGVuZ3RoKDEwMCwgTGVuZ3RoVHlwZTo6UGVyY2VudCk7CisKICAgICBPcHRp
b25hbDxMYXlvdXRVbml0PiBjcm9zc1NpemU7Ci0gICAgaWYgKGNyb3NzU2l6ZUxlbmd0aC5pc0Zp
eGVkKCkpCi0gICAgICAgIGNyb3NzU2l6ZSA9IGFkanVzdEZvckJveFNpemluZyhjaGlsZCwgY3Jv
c3NTaXplTGVuZ3RoKTsKLSAgICBlbHNlIGlmIChjcm9zc1NpemVMZW5ndGguaXNBdXRvKCkpIHsK
LSAgICAgICAgQVNTRVJUKGNoaWxkQ3Jvc3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NTaXpl
KGNoaWxkKSk7Ci0gICAgICAgIGF1dG8gY29udGFpbmVyQ3Jvc3NTaXplTGVuZ3RoID0gaXNIb3Jp
em9udGFsRmxvdygpID8gc3R5bGUoKS5oZWlnaHQoKSA6IHN0eWxlKCkud2lkdGgoKTsKLSAgICAg
ICAgLy8gS2VlcCB0aGlzIHN5bmMnZWQgd2l0aCBjaGlsZENyb3NzU2l6ZVNob3VsZFVzZUNvbnRh
aW5lckNyb3NzU2l6ZSgpLgotICAgICAgICBBU1NFUlQoY29udGFpbmVyQ3Jvc3NTaXplTGVuZ3Ro
LmlzRml4ZWQoKSk7Ci0gICAgICAgIGNyb3NzU2l6ZSA9IHZhbHVlRm9yTGVuZ3RoKGNvbnRhaW5l
ckNyb3NzU2l6ZUxlbmd0aCwgLTFfbHUpOworICAgIGlmIChjcm9zc1NpemVMZW5ndGguaXNGaXhl
ZCgpKSB7CisgICAgICAgIGNyb3NzU2l6ZSA9IExheW91dFVuaXQoY3Jvc3NTaXplTGVuZ3RoLnZh
bHVlKCkpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIEFTU0VSVChjcm9zc1NpemVMZW5ndGguaXNQ
ZXJjZW50T3JDYWxjdWxhdGVkKCkpOwotICAgICAgICBjcm9zc1NpemUgPSBtYWluQXhpc0lzQ2hp
bGRJbmxpbmVBeGlzKGNoaWxkKSA/IGNoaWxkLmNvbXB1dGVQZXJjZW50YWdlTG9naWNhbEhlaWdo
dChjcm9zc1NpemVMZW5ndGgpIDogYWRqdXN0Qm9yZGVyQm94TG9naWNhbFdpZHRoRm9yQm94U2l6
aW5nKHZhbHVlRm9yTGVuZ3RoKGNyb3NzU2l6ZUxlbmd0aCwgY29udGVudFdpZHRoKCkpLCBjcm9z
c1NpemVMZW5ndGgudHlwZSgpKTsKKyAgICAgICAgY3Jvc3NTaXplID0gbWFpbkF4aXNJc0NoaWxk
SW5saW5lQXhpcyhjaGlsZCkgPyBjaGlsZC5jb21wdXRlUGVyY2VudGFnZUxvZ2ljYWxIZWlnaHQo
Y3Jvc3NTaXplTGVuZ3RoKSA6IHZhbHVlRm9yTGVuZ3RoKGNyb3NzU2l6ZUxlbmd0aCwgY29udGVu
dFdpZHRoKCkpOwogICAgICAgICBpZiAoIWNyb3NzU2l6ZSkKICAgICAgICAgICAgIHJldHVybiAw
X2x1OwogICAgIH0KQEAgLTgyNCw2ICs4MjQsNyBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxl
Qm94Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjb25zdCBSZW5kZXJCbwog
ICAgIGVsc2UgewogICAgICAgICBBU1NFUlQoY2hpbGRJbnRyaW5zaWNTaXplLmhlaWdodCgpKTsK
ICAgICAgICAgcmF0aW8gPSBjaGlsZEludHJpbnNpY1NpemUud2lkdGgoKS50b0Zsb2F0KCkgLyBj
aGlsZEludHJpbnNpY1NpemUuaGVpZ2h0KCkudG9GbG9hdCgpOworICAgICAgICAqY3Jvc3NTaXpl
ID0gYWRqdXN0Rm9yQm94U2l6aW5nKGNoaWxkLCAqY3Jvc3NTaXplKTsKICAgICB9CiAgICAgaWYg
KGlzSG9yaXpvbnRhbEZsb3coKSkKICAgICAgICAgcmV0dXJuIExheW91dFVuaXQoY3Jvc3NTaXpl
LnZhbHVlKCkgKiByYXRpbyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv
UmVuZGVyRmxleGlibGVCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4
aWJsZUJveC5oCmluZGV4IDY4MGRjZDdjMDM4MDQ3MmI0OTlhZDc0NGRlYTIxZDY4YzdmNGU5NDku
LmIxNzNlMmJhNWUwYTZhNjBmNTc5Zjk4Y2Y3Y2M5M2FiZDYxMzY0NzggMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCisrKyBiL1NvdXJjZS9X
ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCkBAIC0xNDIsNiArMTQyLDcgQEAg
cHJpdmF0ZToKICAgICBMYXlvdXRVbml0IGNyb3NzQXhpc1Njcm9sbGJhckV4dGVudCgpIGNvbnN0
OwogICAgIExheW91dFVuaXQgY3Jvc3NBeGlzU2Nyb2xsYmFyRXh0ZW50Rm9yQ2hpbGQoY29uc3Qg
UmVuZGVyQm94JiBjaGlsZCkgY29uc3Q7CiAgICAgTGF5b3V0UG9pbnQgZmxvd0F3YXJlTG9jYXRp
b25Gb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdDsKKyAgICBib29sIHdpbGxD
aGlsZENyb3NzU2l6ZUJlQ29udGFpbmVyQ3Jvc3NTaXplKGNvbnN0IFJlbmRlckJveCYgY2hpbGQp
IGNvbnN0OwogICAgIGJvb2wgdXNlQ2hpbGRBc3BlY3RSYXRpbyhjb25zdCBSZW5kZXJCb3gmIGNo
aWxkKSBjb25zdDsKICAgICBib29sIGNoaWxkQ3Jvc3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jv
c3NTaXplKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0OwogICAgIExheW91dFVuaXQgY29t
cHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoY29uc3QgUmVuZGVyQm94JiBjaGlsZCwg
TGVuZ3RoIGNyb3NzU2l6ZUxlbmd0aCkgY29uc3Q7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>422500</attachid>
            <date>2021-03-06 11:24:49 -0800</date>
            <delta_ts>2021-03-07 01:12:25 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210306202448.patch</filename>
            <type>text/plain</type>
            <size>7828</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MDQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjUyYjg5YjMyNGQxZTE0
N2E5ZjAyZGI3MTEyMDE2MDMxZDBhZjk5Zi4uZWYxOWQxMmM1NDM1ZTBjNGUyYTczNmFiYjc4ZjFk
Y2NiMTQ5ZmJiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAzLTA2ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBXSVAuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OndpbGxDaGlsZENyb3NzU2l6ZUJl
Q29udGFpbmVyQ3Jvc3NTaXplIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhp
YmxlQm94Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyBjb25zdCk6CisgICAg
ICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94Lmg6CisKIDIwMjEtMDMtMDYgIFphbGFu
IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbUmVuZGVyVHJlZUJ1aWxkZXJd
IEludmFsaWRhdGUgYmVmb3JlQ2hpbGQgd2hlbiBwYXJlbnQgY2hhbmdlcyB0byBSdWJ5QmFzZQpk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNw
cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKaW5kZXgg
OWJjNjM2MjYzOWZlMTJkNWY0OTIwZWQ4N2MyNmE1OWVhNTRlYzBmMS4uMDRjNjBiYmNmMDg5OGFi
ZGFmYzZiYjEwZWZjYTA3YmE4NmE2YTkwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp
bmcvUmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC03ODUsMTQgKzc4NSwxNyBAQCBib29sIFJlbmRl
ckZsZXhpYmxlQm94Ojp1c2VDaGlsZEFzcGVjdFJhdGlvKGNvbnN0IFJlbmRlckJveCYgY2hpbGQp
IGNvbnN0CiAgICAgcmV0dXJuIGNoaWxkQ3Jvc3NTaXplSXNEZWZpbml0ZShjaGlsZCwgY3Jvc3NT
aXplTGVuZ3RoRm9yQ2hpbGQoTWFpbk9yUHJlZmVycmVkU2l6ZSwgY2hpbGQpKTsKIH0KIAorYm9v
bCBSZW5kZXJGbGV4aWJsZUJveDo6d2lsbENoaWxkQ3Jvc3NTaXplQmVDb250YWluZXJDcm9zc1Np
emUoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKK3sKKyAgICBjb25zdCBMZW5ndGgmIGNy
b3NzU2l6ZUxlbmd0aCA9IGlzSG9yaXpvbnRhbEZsb3coKSA/IGNoaWxkLnN0eWxlKCkuaGVpZ2h0
KCkgOiBjaGlsZC5zdHlsZSgpLndpZHRoKCk7CisgICAgcmV0dXJuICFpc011bHRpbGluZSgpICYm
IGNoaWxkQ3Jvc3NTaXplSXNEZWZpbml0ZShjaGlsZCwgTGVuZ3RoKDEwMCwgTGVuZ3RoVHlwZTo6
UGVyY2VudCkpICYmIGFsaWdubWVudEZvckNoaWxkKGNoaWxkKSA9PSBJdGVtUG9zaXRpb246OlN0
cmV0Y2ggJiYgY3Jvc3NTaXplTGVuZ3RoLmlzQXV0bygpICYmICFoYXNBdXRvTWFyZ2luc0luQ3Jv
c3NBeGlzKGNoaWxkKTsKK30KICAgICAKIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNv
bXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJveCYgY2hpbGQs
IExlbmd0aCBjcm9zc1NpemVMZW5ndGgpIGNvbnN0CiB7CiAgICAgQVNTRVJUKGNoaWxkSGFzQXNw
ZWN0UmF0aW8oY2hpbGQpKTsKIAotICAgIGF1dG8gYWRqdXN0Rm9yQm94U2l6aW5nID0gW3RoaXNd
IChjb25zdCBSZW5kZXJCb3gmIGJveCwgTGVuZ3RoIGxlbmd0aCkgLT4gTGF5b3V0VW5pdCB7Ci0g
ICAgICAgIEFTU0VSVChsZW5ndGguaXNGaXhlZCgpKTsKLSAgICAgICAgYXV0byB2YWx1ZSA9IExh
eW91dFVuaXQobGVuZ3RoLnZhbHVlKCkpOworICAgIGF1dG8gYWRqdXN0Rm9yQm94U2l6aW5nID0g
W3RoaXNdIChjb25zdCBSZW5kZXJCb3gmIGJveCwgTGF5b3V0VW5pdCB2YWx1ZSkgLT4gTGF5b3V0
VW5pdCB7CiAgICAgICAgIC8vIFdlIG5lZWQgdG8gc3Vic3RyYWN0IHRoZSBib3JkZXIgYW5kIHBh
ZGRpbmcgZXh0ZW50IGZyb20gdGhlIGNyb3NzIGF4aXMuCiAgICAgICAgIC8vIEZ1cnRoZXJtb3Jl
LCB0aGUgc2l6aW5nIGNhbGN1bGF0aW9ucyB0aGF0IGZsb29yIHRoZSBjb250ZW50IGJveCBzaXpl
IGF0IHplcm8gd2hlbiBhcHBseWluZyBib3gtc2l6aW5nIGFyZSBhbHNvIGlnbm9yZWQuCiAgICAg
ICAgIC8vIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZmxleGJveC8jYWxnby1tYWluLWl0
ZW0uCkBAIC04MDEsMTggKzgwNCwxNSBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpj
b21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjb25zdCBSZW5kZXJCbwogICAgICAg
ICByZXR1cm4gdmFsdWU7CiAgICAgfTsKIAorICAgIGlmIChjcm9zc1NpemVMZW5ndGguaXNBdXRv
KCkgJiYgd2lsbENoaWxkQ3Jvc3NTaXplQmVDb250YWluZXJDcm9zc1NpemUoY2hpbGQpKQorICAg
ICAgICBjcm9zc1NpemVMZW5ndGggPSBMZW5ndGgoMTAwLCBMZW5ndGhUeXBlOjpQZXJjZW50KTsK
KwogICAgIE9wdGlvbmFsPExheW91dFVuaXQ+IGNyb3NzU2l6ZTsKLSAgICBpZiAoY3Jvc3NTaXpl
TGVuZ3RoLmlzRml4ZWQoKSkKLSAgICAgICAgY3Jvc3NTaXplID0gYWRqdXN0Rm9yQm94U2l6aW5n
KGNoaWxkLCBjcm9zc1NpemVMZW5ndGgpOwotICAgIGVsc2UgaWYgKGNyb3NzU2l6ZUxlbmd0aC5p
c0F1dG8oKSkgewotICAgICAgICBBU1NFUlQoY2hpbGRDcm9zc1NpemVTaG91bGRVc2VDb250YWlu
ZXJDcm9zc1NpemUoY2hpbGQpKTsKLSAgICAgICAgYXV0byBjb250YWluZXJDcm9zc1NpemVMZW5n
dGggPSBpc0hvcml6b250YWxGbG93KCkgPyBzdHlsZSgpLmhlaWdodCgpIDogc3R5bGUoKS53aWR0
aCgpOwotICAgICAgICAvLyBLZWVwIHRoaXMgc3luYydlZCB3aXRoIGNoaWxkQ3Jvc3NTaXplU2hv
dWxkVXNlQ29udGFpbmVyQ3Jvc3NTaXplKCkuCi0gICAgICAgIEFTU0VSVChjb250YWluZXJDcm9z
c1NpemVMZW5ndGguaXNGaXhlZCgpKTsKLSAgICAgICAgY3Jvc3NTaXplID0gdmFsdWVGb3JMZW5n
dGgoY29udGFpbmVyQ3Jvc3NTaXplTGVuZ3RoLCAtMV9sdSk7CisgICAgaWYgKGNyb3NzU2l6ZUxl
bmd0aC5pc0ZpeGVkKCkpIHsKKyAgICAgICAgY3Jvc3NTaXplID0gTGF5b3V0VW5pdChjcm9zc1Np
emVMZW5ndGgudmFsdWUoKSk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgQVNTRVJUKGNyb3NzU2l6
ZUxlbmd0aC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSk7Ci0gICAgICAgIGNyb3NzU2l6ZSA9IG1h
aW5BeGlzSXNDaGlsZElubGluZUF4aXMoY2hpbGQpID8gY2hpbGQuY29tcHV0ZVBlcmNlbnRhZ2VM
b2dpY2FsSGVpZ2h0KGNyb3NzU2l6ZUxlbmd0aCkgOiBhZGp1c3RCb3JkZXJCb3hMb2dpY2FsV2lk
dGhGb3JCb3hTaXppbmcodmFsdWVGb3JMZW5ndGgoY3Jvc3NTaXplTGVuZ3RoLCBjb250ZW50V2lk
dGgoKSksIGNyb3NzU2l6ZUxlbmd0aC50eXBlKCkpOworICAgICAgICBjcm9zc1NpemUgPSBtYWlu
QXhpc0lzQ2hpbGRJbmxpbmVBeGlzKGNoaWxkKSA/IGNoaWxkLmNvbXB1dGVQZXJjZW50YWdlTG9n
aWNhbEhlaWdodChjcm9zc1NpemVMZW5ndGgpIDogdmFsdWVGb3JMZW5ndGgoY3Jvc3NTaXplTGVu
Z3RoLCBjb250ZW50V2lkdGgoKSk7CiAgICAgICAgIGlmICghY3Jvc3NTaXplKQogICAgICAgICAg
ICAgcmV0dXJuIDBfbHU7CiAgICAgfQpAQCAtODI0LDYgKzgyNCw3IEBAIExheW91dFVuaXQgUmVu
ZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0
IFJlbmRlckJvCiAgICAgZWxzZSB7CiAgICAgICAgIEFTU0VSVChjaGlsZEludHJpbnNpY1NpemUu
aGVpZ2h0KCkpOwogICAgICAgICByYXRpbyA9IGNoaWxkSW50cmluc2ljU2l6ZS53aWR0aCgpLnRv
RmxvYXQoKSAvIGNoaWxkSW50cmluc2ljU2l6ZS5oZWlnaHQoKS50b0Zsb2F0KCk7CisgICAgICAg
ICpjcm9zc1NpemUgPSBhZGp1c3RGb3JCb3hTaXppbmcoY2hpbGQsICpjcm9zc1NpemUpOwogICAg
IH0KICAgICBpZiAoaXNIb3Jpem9udGFsRmxvdygpKQogICAgICAgICByZXR1cm4gTGF5b3V0VW5p
dChjcm9zc1NpemUudmFsdWUoKSAqIHJhdGlvKTsKQEAgLTExOTksOSArMTIwMCw4IEBAIExheW91
dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heChjb25z
dCBSZW5kZXJCb3gmIGNoaWxkCiAgICAgTGVuZ3RoIG1pbiA9IG1haW5TaXplTGVuZ3RoRm9yQ2hp
bGQoTWluU2l6ZSwgY2hpbGQpOwogICAgIC8vIEludHJpbnNpYyBzaXplcyBpbiBjaGlsZCdzIGJs
b2NrIGF4aXMgYXJlIGhhbmRsZWQgYnkgdGhlIG1pbi1zaXplOmF1dG8gY29kZSBwYXRoLgogICAg
IGlmIChtaW4uaXNTcGVjaWZpZWQoKSB8fCAobWluLmlzSW50cmluc2ljKCkgJiYgbWFpbkF4aXNJ
c0NoaWxkSW5saW5lQXhpcyhjaGlsZCkpKQotICAgICAgICByZXR1cm4gc3RkOjptYXgoY2hpbGRT
aXplLCBzdGQ6Om1heCgwX2x1LCBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjaGlsZCwg
TWluU2l6ZSwgbWluKS52YWx1ZU9yKGNoaWxkU2l6ZSkpKTsKLSAgICAKLSAgICBpZiAoc2hvdWxk
QXBwbHlNaW5TaXplQXV0b0ZvckNoaWxkKGNoaWxkKSkgeworICAgICAgICBjaGlsZFNpemUgPSBz
dGQ6Om1heChjaGlsZFNpemUsIHN0ZDo6bWF4KDBfbHUsIGNvbXB1dGVNYWluQXhpc0V4dGVudEZv
ckNoaWxkKGNoaWxkLCBNaW5TaXplLCBtaW4pLnZhbHVlT3IoY2hpbGRTaXplKSkpOworICAgIGVs
c2UgaWYgKHNob3VsZEFwcGx5TWluU2l6ZUF1dG9Gb3JDaGlsZChjaGlsZCkpIHsKICAgICAgICAg
Ly8gRklYTUU6IElmIHRoZSBtaW4gdmFsdWUgaXMgZXhwZWN0ZWQgdG8gYmUgdmFsaWQgaGVyZSwg
d2UgbmVlZCB0byBjb21lIHVwIHdpdGggYSBub24gb3B0aW9uYWwgdmVyc2lvbiBvZiBjb21wdXRl
TWFpbkF4aXNFeHRlbnRGb3JDaGlsZCBhbmQKICAgICAgICAgLy8gZW5zdXJlIGl0J3MgdmFsaWQg
dGhyb3VnaCB0aGUgdmlydHVhbCBjYWxscyBvZiBjb21wdXRlSW50cmluc2ljTG9naWNhbENvbnRl
bnRIZWlnaHRVc2luZy4KICAgICAgICAgTGF5b3V0VW5pdCBjb250ZW50U2l6ZTsKQEAgLTEyMjAs
MTggKzEyMjAsMTMgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6YWRqdXN0Q2hpbGRT
aXplRm9yTWluQW5kTWF4KGNvbnN0IFJlbmRlckJveCYgY2hpbGQKICAgICAgICAgICAgIExheW91
dFVuaXQgcmVzb2x2ZWRNYWluU2l6ZSA9IGNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNo
aWxkLCBNYWluT3JQcmVmZXJyZWRTaXplLCBtYWluU2l6ZSkudmFsdWVPcigwKTsKICAgICAgICAg
ICAgIEFTU0VSVChyZXNvbHZlZE1haW5TaXplID49IDApOwogICAgICAgICAgICAgTGF5b3V0VW5p
dCBzcGVjaWZpZWRTaXplID0gc3RkOjptaW4ocmVzb2x2ZWRNYWluU2l6ZSwgbWF4RXh0ZW50LnZh
bHVlT3IocmVzb2x2ZWRNYWluU2l6ZSkpOwotICAgICAgICAgICAgcmV0dXJuIHN0ZDo6bWF4KGNo
aWxkU2l6ZSwgc3RkOjptaW4oc3BlY2lmaWVkU2l6ZSwgY29udGVudFNpemUpKTsKLSAgICAgICAg
fQotCi0gICAgICAgIGlmICh1c2VDaGlsZEFzcGVjdFJhdGlvKGNoaWxkKSB8fCBjaGlsZENyb3Nz
U2l6ZVNob3VsZFVzZUNvbnRhaW5lckNyb3NzU2l6ZShjaGlsZCkpIHsKLSAgICAgICAgICAgIE9w
dGlvbmFsPExheW91dFVuaXQ+IHRyYW5zZmVycmVkU2l6ZSA9IGNvbXB1dGVNYWluU2l6ZUZyb21B
c3BlY3RSYXRpb1VzaW5nKGNoaWxkLCBjaGlsZENyb3NzU2l6ZUxlbmd0aCk7Ci0gICAgICAgICAg
ICBpZiAodHJhbnNmZXJyZWRTaXplKSB7Ci0gICAgICAgICAgICAgICAgdHJhbnNmZXJyZWRTaXpl
ID0gYWRqdXN0Q2hpbGRTaXplRm9yQXNwZWN0UmF0aW9Dcm9zc0F4aXNNaW5BbmRNYXgoY2hpbGQs
IHRyYW5zZmVycmVkU2l6ZS52YWx1ZSgpKTsKLSAgICAgICAgICAgICAgICByZXR1cm4gc3RkOjpt
YXgoY2hpbGRTaXplLCBzdGQ6Om1pbih0cmFuc2ZlcnJlZFNpemUudmFsdWUoKSwgY29udGVudFNp
emUpKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgfQotCi0gICAgICAgIHJldHVybiBzdGQ6Om1h
eChjaGlsZFNpemUsIGNvbnRlbnRTaXplKTsKKyAgICAgICAgICAgIGNoaWxkU2l6ZSA9IHN0ZDo6
bWF4KGNoaWxkU2l6ZSwgc3RkOjptaW4oc3BlY2lmaWVkU2l6ZSwgY29udGVudFNpemUpKTsKKyAg
ICAgICAgfSBlbHNlIGlmICh1c2VDaGlsZEFzcGVjdFJhdGlvKGNoaWxkKSB8fCBjaGlsZENyb3Nz
U2l6ZVNob3VsZFVzZUNvbnRhaW5lckNyb3NzU2l6ZShjaGlsZCkpIHsKKyAgICAgICAgICAgIExh
eW91dFVuaXQgdHJhbnNmZXJyZWRTaXplID0gY29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlv
VXNpbmcoY2hpbGQsIGNoaWxkQ3Jvc3NTaXplTGVuZ3RoKTsKKyAgICAgICAgICAgIHRyYW5zZmVy
cmVkU2l6ZSA9IGFkanVzdENoaWxkU2l6ZUZvckFzcGVjdFJhdGlvQ3Jvc3NBeGlzTWluQW5kTWF4
KGNoaWxkLCB0cmFuc2ZlcnJlZFNpemUpOworICAgICAgICAgICAgY2hpbGRTaXplID0gc3RkOjpt
YXgoY2hpbGRTaXplLCBzdGQ6Om1pbih0cmFuc2ZlcnJlZFNpemUsIGNvbnRlbnRTaXplKSk7Cisg
ICAgICAgIH0gZWxzZQorICAgICAgICAgICAgY2hpbGRTaXplID0gc3RkOjptYXgoY2hpbGRTaXpl
LCBjb250ZW50U2l6ZSk7CiAgICAgfQogCiAgICAgcmV0dXJuIHN0ZDo6bWF4KDBfbHUsIGNoaWxk
U2l6ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGli
bGVCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCmlu
ZGV4IDY4MGRjZDdjMDM4MDQ3MmI0OTlhZDc0NGRlYTIxZDY4YzdmNGU5NDkuLmIxNzNlMmJhNWUw
YTZhNjBmNTc5Zjk4Y2Y3Y2M5M2FiZDYxMzY0NzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl
cmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCkBAIC0xNDIsNiArMTQyLDcgQEAgcHJpdmF0ZToKICAg
ICBMYXlvdXRVbml0IGNyb3NzQXhpc1Njcm9sbGJhckV4dGVudCgpIGNvbnN0OwogICAgIExheW91
dFVuaXQgY3Jvc3NBeGlzU2Nyb2xsYmFyRXh0ZW50Rm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JiBj
aGlsZCkgY29uc3Q7CiAgICAgTGF5b3V0UG9pbnQgZmxvd0F3YXJlTG9jYXRpb25Gb3JDaGlsZChj
b25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdDsKKyAgICBib29sIHdpbGxDaGlsZENyb3NzU2l6
ZUJlQ29udGFpbmVyQ3Jvc3NTaXplKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0OwogICAg
IGJvb2wgdXNlQ2hpbGRBc3BlY3RSYXRpbyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdDsK
ICAgICBib29sIGNoaWxkQ3Jvc3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NTaXplKGNvbnN0
IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0OwogICAgIExheW91dFVuaXQgY29tcHV0ZU1haW5TaXpl
RnJvbUFzcGVjdFJhdGlvVXNpbmcoY29uc3QgUmVuZGVyQm94JiBjaGlsZCwgTGVuZ3RoIGNyb3Nz
U2l6ZUxlbmd0aCkgY29uc3Q7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>422522</attachid>
            <date>2021-03-07 01:12:30 -0800</date>
            <delta_ts>2021-03-07 02:38:32 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210307101229.patch</filename>
            <type>text/plain</type>
            <size>23955</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MDUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjI4OTQ5Y2FiYmNjZmE0
YzNlY2M0ZGFhODE3ZTJkNzRlNGZiMTFkMC4uY2JkY2JkMmIxMTc5YmU2OWZhNzgyMzU2YjNhMmMw
MDkwYmU0NjM1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAzLTA2ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBXSVAuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OndpbGxDaGlsZENyb3NzU2l6ZUJl
Q29udGFpbmVyQ3Jvc3NTaXplIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhp
YmxlQm94Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyBjb25zdCk6CisgICAg
ICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94Lmg6CisKIDIwMjEtMDMtMDYgIFphbGFu
IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBPbmx5IHBvc2l0aXZlIGludGVn
ZXJzIGFyZSBhbGxvd2VkIGFzIHZhbHVlcyBvZiBvcnBoYW5zIGFuZCB3aWRvd3MKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAgYi9Tb3VyY2UvV2Vi
Q29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCmluZGV4IGMwNDc5ODdmYjllNDYzZGIwYmVj
Y2YyMTc2ZTViNmE5ODhlZDNlOWMuLjQ2YjVjNjlmZDRkNDliZDkwZDZkNTNkODg4N2Q5ZDg5YjNh
NDBlNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5j
cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcApAQCAtMjI4
Miw2ICsyMjgyLDggQEAgdm9pZCBSZW5kZXJCbG9jazo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxX
aWR0aHMoKQogICAgIGlmICghaXNUYWJsZUNlbGwoKSAmJiBzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0
aCgpLmlzRml4ZWQoKSAmJiBzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLnZhbHVlKCkgPj0gMAog
ICAgICAgICAmJiAhKGlzRGVwcmVjYXRlZEZsZXhJdGVtKCkgJiYgIXN0eWxlVG9Vc2UubG9naWNh
bFdpZHRoKCkuaW50VmFsdWUoKSkpCiAgICAgICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRo
ID0gbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBhZGp1c3RDb250ZW50Qm94TG9naWNhbFdp
ZHRoRm9yQm94U2l6aW5nKHN0eWxlVG9Vc2UubG9naWNhbFdpZHRoKCkpOworICAgIGVsc2UgaWYg
KHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSkKKyAgICAgICAgbV9t
aW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IGNv
bXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKTsKICAgICBlbHNlCiAgICAgICAgIGNv
bXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoLCBt
X21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl
ckJveC5jcHAKaW5kZXggZjU4MmI1NjdhZGFlOTBjZDRkNGEwY2VmMmM5YjhkNjExYjMwMjgzMy4u
NjJhM2QzZmJmNzkyYzA4MjUwYzg4NmJhNTM4ZjcwZjRhMzI1MjIyNiAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv
cmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTY1MSw3ICs2NTEsNyBAQCB2b2lkIFJlbmRlckJv
eDo6dXBkYXRlTGF5ZXJUcmFuc2Zvcm0oKQogICAgICAgICBsYXllcigpLT51cGRhdGVUcmFuc2Zv
cm0oKTsKIH0KIAotTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0aElu
RnJhZ21lbnRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCBhdmFp
bGFibGVXaWR0aCwgUmVuZGVyQmxvY2smIGNiLCBSZW5kZXJGcmFnbWVudENvbnRhaW5lciogZnJh
Z21lbnQpIGNvbnN0CitMYXlvdXRVbml0IFJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRo
SW5GcmFnbWVudEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbFdpZHRoLCBMYXlvdXRVbml0IGF2
YWlsYWJsZVdpZHRoLCBSZW5kZXJCbG9jayYgY2IsIFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiBm
cmFnbWVudCwgYm9vbCBhbGxvd0ludHJpbnNpYykgY29uc3QKIHsKICAgICBjb25zdCBSZW5kZXJT
dHlsZSYgc3R5bGVUb1VzZSA9IHN0eWxlKCk7CiAKQEAgLTY2MCwxMyArNjYwLDE1IEBAIExheW91
dFVuaXQgUmVuZGVyQm94Ojpjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgo
TGF5b3V0VW5pdCBsb2dpY2FsCiAgICAgICAgIGxvZ2ljYWxXaWR0aCA9IHN0ZDo6Y2xhbXAobG9n
aWNhbFdpZHRoLCBsb2dpY2FsTWluV2lkdGgsIGxvZ2ljYWxNYXhXaWR0aCk7CiAgICAgfQogCi0g
ICAgaWYgKCFzdHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkpCisgICAg
aWYgKCFzdHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkgJiYgKGFsbG93
SW50cmluc2ljIHx8ICFzdHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLmlzSW50cmluc2ljKCkp
KQogICAgICAgICBsb2dpY2FsV2lkdGggPSBzdGQ6Om1pbihsb2dpY2FsV2lkdGgsIGNvbXB1dGVM
b2dpY2FsV2lkdGhJbkZyYWdtZW50VXNpbmcoTWF4U2l6ZSwgc3R5bGVUb1VzZS5sb2dpY2FsTWF4
V2lkdGgoKSwgYXZhaWxhYmxlV2lkdGgsIGNiLCBmcmFnbWVudCkpOworICAgIGlmICghYWxsb3dJ
bnRyaW5zaWMgJiYgc3R5bGVUb1VzZS5sb2dpY2FsTWluV2lkdGgoKS5pc0ludHJpbnNpYygpKQor
ICAgICAgICByZXR1cm4gbG9naWNhbFdpZHRoOwogICAgIGF1dG8gbWluTGVuZ3RoID0gc3R5bGVU
b1VzZS5sb2dpY2FsTWluV2lkdGgoKTsKLSAgICBpZiAoc3R5bGVUb1VzZS5oYXNBc3BlY3RSYXRp
bygpICYmIHN0eWxlVG9Vc2UubG9naWNhbFdpZHRoKCkuaXNBdXRvKCkgJiYgbWluTGVuZ3RoLmlz
QXV0bygpICYmIHN0eWxlVG9Vc2Uub3ZlcmZsb3dJbmxpbmVEaXJlY3Rpb24oKSA9PSBPdmVyZmxv
dzo6VmlzaWJsZSkgeworICAgIGlmIChzdHlsZVRvVXNlLmhhc0FzcGVjdFJhdGlvKCkgJiYgbWlu
TGVuZ3RoLmlzQXV0bygpICYmIChzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpIHx8
IHN0eWxlVG9Vc2UubG9naWNhbFdpZHRoKCkuaXNNaW5Db250ZW50KCkgfHwgc3R5bGVUb1VzZS5s
b2dpY2FsV2lkdGgoKS5pc01heENvbnRlbnQoKSkgJiYgc3R5bGVUb1VzZS5vdmVyZmxvd0lubGlu
ZURpcmVjdGlvbigpID09IE92ZXJmbG93OjpWaXNpYmxlKSB7CiAgICAgICAgIC8vIE1ha2Ugc3Vy
ZSB3ZSBhY3R1YWxseSB1c2VkIHRoZSBhc3BlY3QgcmF0aW8uCiAgICAgICAgIGlmIChzaG91bGRD
b21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkpCi0gICAgICAgICAgICBtaW5MZW5n
dGggPSBMZW5ndGgoTGVuZ3RoVHlwZTo6TWluQ29udGVudCk7CisgICAgICAgICAgICBtaW5MZW5n
dGggPSBMZW5ndGgoTGVuZ3RoVHlwZTo6TWluSW50cmluc2ljKTsKICAgICB9CiAgICAgcmV0dXJu
IHN0ZDo6bWF4KGxvZ2ljYWxXaWR0aCwgY29tcHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2lu
ZyhNaW5TaXplLCBtaW5MZW5ndGgsIGF2YWlsYWJsZVdpZHRoLCBjYiwgZnJhZ21lbnQpKTsKIH0K
QEAgLTI2MTIsOSArMjYxNCwxMiBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZUludHJp
bnNpY0xvZ2ljYWxXaWR0aFVzaW5nKExlbmd0aCBsb2dpY2FsV2lkdGhMZW5ndAogCiAgICAgTGF5
b3V0VW5pdCBtaW5Mb2dpY2FsV2lkdGg7CiAgICAgTGF5b3V0VW5pdCBtYXhMb2dpY2FsV2lkdGg7
Ci0gICAgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMobWluTG9naWNhbFdpZHRoLCBtYXhM
b2dpY2FsV2lkdGgpOworICAgIGlmICghbG9naWNhbFdpZHRoTGVuZ3RoLmlzTWluSW50cmluc2lj
KCkgJiYgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpKQorICAgICAg
ICBtaW5Mb2dpY2FsV2lkdGggPSBtYXhMb2dpY2FsV2lkdGggPSBjb21wdXRlTG9naWNhbFdpZHRo
RnJvbUFzcGVjdFJhdGlvKCk7CisgICAgZWxzZQorICAgICAgICBjb21wdXRlSW50cmluc2ljTG9n
aWNhbFdpZHRocyhtaW5Mb2dpY2FsV2lkdGgsIG1heExvZ2ljYWxXaWR0aCk7CiAKLSAgICBpZiAo
bG9naWNhbFdpZHRoTGVuZ3RoLmlzTWluQ29udGVudCgpKQorICAgIGlmIChsb2dpY2FsV2lkdGhM
ZW5ndGguaXNNaW5Db250ZW50KCkgfHwgbG9naWNhbFdpZHRoTGVuZ3RoLmlzTWluSW50cmluc2lj
KCkpCiAgICAgICAgIHJldHVybiBtaW5Mb2dpY2FsV2lkdGggKyBib3JkZXJBbmRQYWRkaW5nOwog
CiAgICAgaWYgKGxvZ2ljYWxXaWR0aExlbmd0aC5pc01heENvbnRlbnQoKSkKQEAgLTI2NDIsNyAr
MjY0Nyw3IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFn
bWVudFVzaW5nKFNpemVUeXBlIHdpZHRoVHlwZSwgTGVuCiAgICAgICAgIHJldHVybiBhZGp1c3RC
b3JkZXJCb3hMb2dpY2FsV2lkdGhGb3JCb3hTaXppbmcodmFsdWVGb3JMZW5ndGgobG9naWNhbFdp
ZHRoLCBhdmFpbGFibGVMb2dpY2FsV2lkdGgpLCBsb2dpY2FsV2lkdGgudHlwZSgpKTsKICAgICB9
CiAKLSAgICBpZiAobG9naWNhbFdpZHRoLmlzSW50cmluc2ljKCkpCisgICAgaWYgKGxvZ2ljYWxX
aWR0aC5pc0ludHJpbnNpYygpIHx8IGxvZ2ljYWxXaWR0aC5pc01pbkludHJpbnNpYygpKQogICAg
ICAgICByZXR1cm4gY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aFVzaW5nKGxvZ2ljYWxXaWR0
aCwgYXZhaWxhYmxlTG9naWNhbFdpZHRoLCBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoKCkp
OwogCiAgICAgTGF5b3V0VW5pdCBtYXJnaW5TdGFydDsKQEAgLTUwOTgsNyArNTEwMyw3IEBAIGJv
b2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygp
IGNvbnN0CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGF1dG8gaCA9IHN0eWxlKCkubG9n
aWNhbEhlaWdodCgpOwotICAgIHJldHVybiBoLmlzQXV0bygpIHx8ICghaXNPdXRPZkZsb3dQb3Np
dGlvbmVkKCkgJiYgaC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSAmJiAhcGVyY2VudGFnZUxvZ2lj
YWxIZWlnaHRJc1Jlc29sdmFibGUoKSk7CisgICAgcmV0dXJuIGguaXNBdXRvKCkgfHwgaC5pc0lu
dHJpbnNpYygpIHx8ICghaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgJiYgaC5pc1BlcmNlbnRPckNh
bGN1bGF0ZWQoKSAmJiAhcGVyY2VudGFnZUxvZ2ljYWxIZWlnaHRJc1Jlc29sdmFibGUoKSk7CiB9
CiAKIGJvb2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJh
dGlvKCkgY29uc3QKQEAgLTUxMzQsNyArNTEzOSw3IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpj
b21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKFJlbmRlckZyYWdtZW50Q29udGFpbmVy
CiAgICAgYXV0byBsb2dpY2FsV2lkdGggPSBpbmxpbmVTaXplRnJvbUFzcGVjdFJhdGlvKGhvcml6
b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4
dGVudCgpLCBMYXlvdXRVbml0KHN0eWxlKCkubG9naWNhbEFzcGVjdFJhdGlvKCkpLCBzdHlsZSgp
LmJveFNpemluZ0ZvckFzcGVjdFJhdGlvKCksIGxvZ2ljYWxIZWlnaHRmb3JBc3BlY3RSYXRpbyk7
CiAKICAgICBMYXlvdXRVbml0IGNvbnRhaW5lcldpZHRoSW5JbmxpbmVEaXJlY3Rpb24gPSBzdGQ6
Om1heDxMYXlvdXRVbml0PigwLCBjb250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JDb250ZW50
SW5GcmFnbWVudChmcmFnbWVudCkpOwotICAgIHJldHVybiBjb25zdHJhaW5Mb2dpY2FsV2lkdGhJ
bkZyYWdtZW50QnlNaW5NYXgobG9naWNhbFdpZHRoLCBjb250YWluZXJXaWR0aEluSW5saW5lRGly
ZWN0aW9uLCAqY29udGFpbmluZ0Jsb2NrKCksIGZyYWdtZW50KTsKKyAgICByZXR1cm4gY29uc3Ry
YWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KGxvZ2ljYWxXaWR0aCwgY29udGFpbmVy
V2lkdGhJbklubGluZURpcmVjdGlvbiwgKmNvbnRhaW5pbmdCbG9jaygpLCBmcmFnbWVudCwgZmFs
c2UpOwogfQogCiBzdGQ6OnBhaXI8TGF5b3V0VW5pdCwgTGF5b3V0VW5pdD4gUmVuZGVyQm94Ojpj
b21wdXRlTWluTWF4TG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkgY29uc3QKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaCBiL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9SZW5kZXJCb3guaAppbmRleCA2ZGU2ZWQ2YWM2Yjk2ODhmY2IzNjQ4ZGJiNGIy
ZWM5YTA5YmIxNDI0Li44MGEzYjg5MzFiZTM0YmIxMDE1MDEyYzUzY2RhN2Q5NDMzOGMxMzI3IDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKKysrIGIvU291
cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCkBAIC04NSw3ICs4NSw3IEBAIHB1Ymxp
YzoKICAgICBMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIHN0eWxlKCku
aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IHdpZHRoKCkgOiBoZWlnaHQoKTsgfQogICAgIExh
eW91dFVuaXQgbG9naWNhbEhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIHN0eWxlKCkuaXNIb3Jpem9u
dGFsV3JpdGluZ01vZGUoKSA/IGhlaWdodCgpIDogd2lkdGgoKTsgfQogCi0gICAgTGF5b3V0VW5p
dCBjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgoTGF5b3V0VW5pdCwgTGF5
b3V0VW5pdCwgUmVuZGVyQmxvY2smLCBSZW5kZXJGcmFnbWVudENvbnRhaW5lciogPSBudWxscHRy
KSBjb25zdDsKKyAgICBMYXlvdXRVbml0IGNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRC
eU1pbk1heChMYXlvdXRVbml0LCBMYXlvdXRVbml0LCBSZW5kZXJCbG9jayYsIFJlbmRlckZyYWdt
ZW50Q29udGFpbmVyKiwgYm9vbCBhbGxvd0ludHJpbnNpYyA9IHRydWUpIGNvbnN0OwogICAgIExh
eW91dFVuaXQgY29uc3RyYWluTG9naWNhbEhlaWdodEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNh
bEhlaWdodCwgT3B0aW9uYWw8TGF5b3V0VW5pdD4gaW50cmluc2ljQ29udGVudEhlaWdodCkgY29u
c3Q7CiAgICAgTGF5b3V0VW5pdCBjb25zdHJhaW5Db250ZW50Qm94TG9naWNhbEhlaWdodEJ5TWlu
TWF4KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgT3B0aW9uYWw8TGF5b3V0VW5pdD4gaW50cmlu
c2ljQ29udGVudEhlaWdodCkgY29uc3Q7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl
bmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv
UmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4IDliYzYzNjI2MzlmZTEyZDVmNDkyMGVkODdjMjZh
NTllYTU0ZWMwZjEuLmNlZWY4NmUzN2Q1NDg3ZDAzZTQ4ZThkOTQ3MDU2ZDllN2RlMjk2YWUgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAK
KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAt
Nzg1LDE0ICs3ODUsMTcgQEAgYm9vbCBSZW5kZXJGbGV4aWJsZUJveDo6dXNlQ2hpbGRBc3BlY3RS
YXRpbyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdAogICAgIHJldHVybiBjaGlsZENyb3Nz
U2l6ZUlzRGVmaW5pdGUoY2hpbGQsIGNyb3NzU2l6ZUxlbmd0aEZvckNoaWxkKE1haW5PclByZWZl
cnJlZFNpemUsIGNoaWxkKSk7CiB9CiAKK2Jvb2wgUmVuZGVyRmxleGlibGVCb3g6OndpbGxDaGls
ZENyb3NzU2l6ZUJlQ29udGFpbmVyQ3Jvc3NTaXplKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNv
bnN0Cit7CisgICAgY29uc3QgTGVuZ3RoJiBjcm9zc1NpemVMZW5ndGggPSBpc0hvcml6b250YWxG
bG93KCkgPyBjaGlsZC5zdHlsZSgpLmhlaWdodCgpIDogY2hpbGQuc3R5bGUoKS53aWR0aCgpOwor
ICAgIHJldHVybiAhaXNNdWx0aWxpbmUoKSAmJiBjaGlsZENyb3NzU2l6ZUlzRGVmaW5pdGUoY2hp
bGQsIExlbmd0aCgxMDAsIExlbmd0aFR5cGU6OlBlcmNlbnQpKSAmJiBhbGlnbm1lbnRGb3JDaGls
ZChjaGlsZCkgPT0gSXRlbVBvc2l0aW9uOjpTdHJldGNoICYmIGNyb3NzU2l6ZUxlbmd0aC5pc0F1
dG8oKSAmJiAhaGFzQXV0b01hcmdpbnNJbkNyb3NzQXhpcyhjaGlsZCk7Cit9CiAgICAgCiBMYXlv
dXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9V
c2luZyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkLCBMZW5ndGggY3Jvc3NTaXplTGVuZ3RoKSBjb25z
dAogewogICAgIEFTU0VSVChjaGlsZEhhc0FzcGVjdFJhdGlvKGNoaWxkKSk7CiAKLSAgICBhdXRv
IGFkanVzdEZvckJveFNpemluZyA9IFt0aGlzXSAoY29uc3QgUmVuZGVyQm94JiBib3gsIExlbmd0
aCBsZW5ndGgpIC0+IExheW91dFVuaXQgewotICAgICAgICBBU1NFUlQobGVuZ3RoLmlzRml4ZWQo
KSk7Ci0gICAgICAgIGF1dG8gdmFsdWUgPSBMYXlvdXRVbml0KGxlbmd0aC52YWx1ZSgpKTsKKyAg
ICBhdXRvIGFkanVzdEZvckJveFNpemluZyA9IFt0aGlzXSAoY29uc3QgUmVuZGVyQm94JiBib3gs
IExheW91dFVuaXQgdmFsdWUpIC0+IExheW91dFVuaXQgewogICAgICAgICAvLyBXZSBuZWVkIHRv
IHN1YnN0cmFjdCB0aGUgYm9yZGVyIGFuZCBwYWRkaW5nIGV4dGVudCBmcm9tIHRoZSBjcm9zcyBh
eGlzLgogICAgICAgICAvLyBGdXJ0aGVybW9yZSwgdGhlIHNpemluZyBjYWxjdWxhdGlvbnMgdGhh
dCBmbG9vciB0aGUgY29udGVudCBib3ggc2l6ZSBhdCB6ZXJvIHdoZW4gYXBwbHlpbmcgYm94LXNp
emluZyBhcmUgYWxzbyBpZ25vcmVkLgogICAgICAgICAvLyBodHRwczovL2RyYWZ0cy5jc3N3Zy5v
cmcvY3NzLWZsZXhib3gvI2FsZ28tbWFpbi1pdGVtLgpAQCAtODAxLDMzICs4MDQsMzcgQEAgTGF5
b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlv
VXNpbmcoY29uc3QgUmVuZGVyQm8KICAgICAgICAgcmV0dXJuIHZhbHVlOwogICAgIH07CiAKKyAg
ICBpZiAoY3Jvc3NTaXplTGVuZ3RoLmlzQXV0bygpICYmIHdpbGxDaGlsZENyb3NzU2l6ZUJlQ29u
dGFpbmVyQ3Jvc3NTaXplKGNoaWxkKSkKKyAgICAgICAgY3Jvc3NTaXplTGVuZ3RoID0gTGVuZ3Ro
KDEwMCwgTGVuZ3RoVHlwZTo6UGVyY2VudCk7CisKICAgICBPcHRpb25hbDxMYXlvdXRVbml0PiBj
cm9zc1NpemU7Ci0gICAgaWYgKGNyb3NzU2l6ZUxlbmd0aC5pc0ZpeGVkKCkpCi0gICAgICAgIGNy
b3NzU2l6ZSA9IGFkanVzdEZvckJveFNpemluZyhjaGlsZCwgY3Jvc3NTaXplTGVuZ3RoKTsKLSAg
ICBlbHNlIGlmIChjcm9zc1NpemVMZW5ndGguaXNBdXRvKCkpIHsKLSAgICAgICAgQVNTRVJUKGNo
aWxkQ3Jvc3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NTaXplKGNoaWxkKSk7Ci0gICAgICAg
IGF1dG8gY29udGFpbmVyQ3Jvc3NTaXplTGVuZ3RoID0gaXNIb3Jpem9udGFsRmxvdygpID8gc3R5
bGUoKS5oZWlnaHQoKSA6IHN0eWxlKCkud2lkdGgoKTsKLSAgICAgICAgLy8gS2VlcCB0aGlzIHN5
bmMnZWQgd2l0aCBjaGlsZENyb3NzU2l6ZVNob3VsZFVzZUNvbnRhaW5lckNyb3NzU2l6ZSgpLgot
ICAgICAgICBBU1NFUlQoY29udGFpbmVyQ3Jvc3NTaXplTGVuZ3RoLmlzRml4ZWQoKSk7Ci0gICAg
ICAgIGNyb3NzU2l6ZSA9IHZhbHVlRm9yTGVuZ3RoKGNvbnRhaW5lckNyb3NzU2l6ZUxlbmd0aCwg
LTFfbHUpOworICAgIGlmIChjcm9zc1NpemVMZW5ndGguaXNGaXhlZCgpKSB7CisgICAgICAgIGNy
b3NzU2l6ZSA9IExheW91dFVuaXQoY3Jvc3NTaXplTGVuZ3RoLnZhbHVlKCkpOwogICAgIH0gZWxz
ZSB7CiAgICAgICAgIEFTU0VSVChjcm9zc1NpemVMZW5ndGguaXNQZXJjZW50T3JDYWxjdWxhdGVk
KCkpOwotICAgICAgICBjcm9zc1NpemUgPSBtYWluQXhpc0lzQ2hpbGRJbmxpbmVBeGlzKGNoaWxk
KSA/IGNoaWxkLmNvbXB1dGVQZXJjZW50YWdlTG9naWNhbEhlaWdodChjcm9zc1NpemVMZW5ndGgp
IDogYWRqdXN0Qm9yZGVyQm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKHZhbHVlRm9yTGVuZ3Ro
KGNyb3NzU2l6ZUxlbmd0aCwgY29udGVudFdpZHRoKCkpLCBjcm9zc1NpemVMZW5ndGgudHlwZSgp
KTsKKyAgICAgICAgY3Jvc3NTaXplID0gbWFpbkF4aXNJc0NoaWxkSW5saW5lQXhpcyhjaGlsZCkg
PyBjaGlsZC5jb21wdXRlUGVyY2VudGFnZUxvZ2ljYWxIZWlnaHQoY3Jvc3NTaXplTGVuZ3RoKSA6
IHZhbHVlRm9yTGVuZ3RoKGNyb3NzU2l6ZUxlbmd0aCwgY29udGVudFdpZHRoKCkpOwogICAgICAg
ICBpZiAoIWNyb3NzU2l6ZSkKICAgICAgICAgICAgIHJldHVybiAwX2x1OwogICAgIH0KIAogICAg
IGNvbnN0IExheW91dFNpemUmIGNoaWxkSW50cmluc2ljU2l6ZSA9IGNoaWxkLmludHJpbnNpY1Np
emUoKTsKICAgICBkb3VibGUgcmF0aW87Ci0gICAgaWYgKGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0
aW9UeXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpSYXRpbyB8fCAoY2hpbGQuc3R5bGUoKS5hc3Bl
Y3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OkF1dG9BbmRSYXRpbyAmJiBjaGlsZElu
dHJpbnNpY1NpemUuaXNFbXB0eSgpKSkKKyAgICBMYXlvdXRVbml0IGJvcmRlcl9hbmRfcGFkZGlu
ZzsKKyAgICBpZiAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRp
b1R5cGU6OlJhdGlvIHx8IChjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvVHlwZSgpID09IEFzcGVj
dFJhdGlvVHlwZTo6QXV0b0FuZFJhdGlvICYmIGNoaWxkSW50cmluc2ljU2l6ZS5pc0VtcHR5KCkp
KSB7CiAgICAgICAgIHJhdGlvID0gY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1dpZHRoKCkgLyBj
aGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvSGVpZ2h0KCk7Ci0gICAgZWxzZSB7CisgICAgICAgIGlm
IChjaGlsZC5zdHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJhdGlvKCkgPT0gQm94U2l6aW5nOjpD
b250ZW50Qm94KSB7CisgICAgICAgICAgICAqY3Jvc3NTaXplIC09IGlzSG9yaXpvbnRhbEZsb3co
KSA/IGNoaWxkLnZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpIDogY2hpbGQuaG9yaXpv
bnRhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAg
ICAgIGJvcmRlcl9hbmRfcGFkZGluZyA9IGlzSG9yaXpvbnRhbEZsb3coKSA/IGNoaWxkLmhvcml6
b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCkgOiBjaGlsZC52ZXJ0aWNhbEJvcmRlckFuZFBh
ZGRpbmdFeHRlbnQoKTsKKyAgICAgICAgfQorICAgIH0gZWxzZSB7CiAgICAgICAgIEFTU0VSVChj
aGlsZEludHJpbnNpY1NpemUuaGVpZ2h0KCkpOwogICAgICAgICByYXRpbyA9IGNoaWxkSW50cmlu
c2ljU2l6ZS53aWR0aCgpLnRvRmxvYXQoKSAvIGNoaWxkSW50cmluc2ljU2l6ZS5oZWlnaHQoKS50
b0Zsb2F0KCk7CisgICAgICAgICpjcm9zc1NpemUgPSBhZGp1c3RGb3JCb3hTaXppbmcoY2hpbGQs
ICpjcm9zc1NpemUpOwogICAgIH0KICAgICBpZiAoaXNIb3Jpem9udGFsRmxvdygpKQotICAgICAg
ICByZXR1cm4gTGF5b3V0VW5pdChjcm9zc1NpemUudmFsdWUoKSAqIHJhdGlvKTsKLSAgICByZXR1
cm4gTGF5b3V0VW5pdChjcm9zc1NpemUudmFsdWUoKSAvIHJhdGlvKTsKKyAgICAgICAgcmV0dXJu
IExheW91dFVuaXQoY3Jvc3NTaXplLnZhbHVlKCkgKiByYXRpbykgLSBib3JkZXJfYW5kX3BhZGRp
bmc7CisgICAgcmV0dXJuIExheW91dFVuaXQoY3Jvc3NTaXplLnZhbHVlKCkgLyByYXRpbykgLSBi
b3JkZXJfYW5kX3BhZGRpbmc7CiB9CiAKIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OnNldEZsb3dB
d2FyZUxvY2F0aW9uRm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZCwgY29uc3QgTGF5b3V0UG9pbnQm
IGxvY2F0aW9uKQpAQCAtMTE5NiwxNyArMTIwMywyMiBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhp
YmxlQm94OjphZGp1c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgoY29uc3QgUmVuZGVyQm94JiBjaGls
ZAogICAgICAgICBjaGlsZFNpemUgPSBzdGQ6Om1pbihjaGlsZFNpemUsIG1heEV4dGVudC52YWx1
ZU9yKGNoaWxkU2l6ZSkpOwogICAgIH0KIAorICAgIExlbmd0aCBjcm9zc01heCA9IGNyb3NzU2l6
ZUxlbmd0aEZvckNoaWxkKE1heFNpemUsIGNoaWxkKTsKKyAgICBpZiAoKHVzZUNoaWxkQXNwZWN0
UmF0aW8oY2hpbGQpIHx8IGNoaWxkQ3Jvc3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NTaXpl
KGNoaWxkKSkgJiYgIWNoaWxkTWFpblNpemVJc0RlZmluaXRlKGNoaWxkLCBmbGV4QmFzaXNGb3JD
aGlsZChjaGlsZCkpICYmIGNoaWxkQ3Jvc3NTaXplSXNEZWZpbml0ZShjaGlsZCwgY3Jvc3NNYXgp
KSB7CisgICAgICAgIG1heEV4dGVudCA9IGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1Vz
aW5nKGNoaWxkLCBjcm9zc01heCk7CisgICAgICAgIGNoaWxkU2l6ZSA9IHN0ZDo6bWluKGNoaWxk
U2l6ZSwgbWF4RXh0ZW50LnZhbHVlT3IoY2hpbGRTaXplKSk7CisgICAgfQorCiAgICAgTGVuZ3Ro
IG1pbiA9IG1haW5TaXplTGVuZ3RoRm9yQ2hpbGQoTWluU2l6ZSwgY2hpbGQpOwogICAgIC8vIElu
dHJpbnNpYyBzaXplcyBpbiBjaGlsZCdzIGJsb2NrIGF4aXMgYXJlIGhhbmRsZWQgYnkgdGhlIG1p
bi1zaXplOmF1dG8gY29kZSBwYXRoLgogICAgIGlmIChtaW4uaXNTcGVjaWZpZWQoKSB8fCAobWlu
LmlzSW50cmluc2ljKCkgJiYgbWFpbkF4aXNJc0NoaWxkSW5saW5lQXhpcyhjaGlsZCkpKQotICAg
ICAgICByZXR1cm4gc3RkOjptYXgoY2hpbGRTaXplLCBzdGQ6Om1heCgwX2x1LCBjb21wdXRlTWFp
bkF4aXNFeHRlbnRGb3JDaGlsZChjaGlsZCwgTWluU2l6ZSwgbWluKS52YWx1ZU9yKGNoaWxkU2l6
ZSkpKTsKLSAgICAKLSAgICBpZiAoc2hvdWxkQXBwbHlNaW5TaXplQXV0b0ZvckNoaWxkKGNoaWxk
KSkgeworICAgICAgICBjaGlsZFNpemUgPSBzdGQ6Om1heChjaGlsZFNpemUsIHN0ZDo6bWF4KDBf
bHUsIGNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNoaWxkLCBNaW5TaXplLCBtaW4pLnZh
bHVlT3IoY2hpbGRTaXplKSkpOworICAgIGVsc2UgaWYgKHNob3VsZEFwcGx5TWluU2l6ZUF1dG9G
b3JDaGlsZChjaGlsZCkpIHsKICAgICAgICAgLy8gRklYTUU6IElmIHRoZSBtaW4gdmFsdWUgaXMg
ZXhwZWN0ZWQgdG8gYmUgdmFsaWQgaGVyZSwgd2UgbmVlZCB0byBjb21lIHVwIHdpdGggYSBub24g
b3B0aW9uYWwgdmVyc2lvbiBvZiBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZCBhbmQKICAg
ICAgICAgLy8gZW5zdXJlIGl0J3MgdmFsaWQgdGhyb3VnaCB0aGUgdmlydHVhbCBjYWxscyBvZiBj
b21wdXRlSW50cmluc2ljTG9naWNhbENvbnRlbnRIZWlnaHRVc2luZy4KICAgICAgICAgTGF5b3V0
VW5pdCBjb250ZW50U2l6ZTsKICAgICAgICAgTGVuZ3RoIGNoaWxkQ3Jvc3NTaXplTGVuZ3RoID0g
Y3Jvc3NTaXplTGVuZ3RoRm9yQ2hpbGQoTWFpbk9yUHJlZmVycmVkU2l6ZSwgY2hpbGQpOwotICAg
ICAgICBpZiAodXNlQ2hpbGRBc3BlY3RSYXRpbyhjaGlsZCkpCisgICAgICAgIGlmICh1c2VDaGls
ZEFzcGVjdFJhdGlvKGNoaWxkKSkvLyB8fCB3aWxsQ2hpbGRDcm9zc1NpemVCZUNvbnRhaW5lckNy
b3NzU2l6ZShjaGlsZCkpCiAgICAgICAgICAgICBjb250ZW50U2l6ZSA9IGNvbXB1dGVNYWluU2l6
ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNoaWxkLCBjaGlsZENyb3NzU2l6ZUxlbmd0aCk7CiAgICAg
ICAgIGVsc2UKICAgICAgICAgICAgIGNvbnRlbnRTaXplID0gY29tcHV0ZU1haW5BeGlzRXh0ZW50
Rm9yQ2hpbGQoY2hpbGQsIE1pblNpemUsIExlbmd0aChMZW5ndGhUeXBlOjpNaW5Db250ZW50KSku
dmFsdWVPcigwKTsKQEAgLTEyMjAsMjAgKzEyMzIsMTcgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4
aWJsZUJveDo6YWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KGNvbnN0IFJlbmRlckJveCYgY2hp
bGQKICAgICAgICAgICAgIExheW91dFVuaXQgcmVzb2x2ZWRNYWluU2l6ZSA9IGNvbXB1dGVNYWlu
QXhpc0V4dGVudEZvckNoaWxkKGNoaWxkLCBNYWluT3JQcmVmZXJyZWRTaXplLCBtYWluU2l6ZSku
dmFsdWVPcigwKTsKICAgICAgICAgICAgIEFTU0VSVChyZXNvbHZlZE1haW5TaXplID49IDApOwog
ICAgICAgICAgICAgTGF5b3V0VW5pdCBzcGVjaWZpZWRTaXplID0gc3RkOjptaW4ocmVzb2x2ZWRN
YWluU2l6ZSwgbWF4RXh0ZW50LnZhbHVlT3IocmVzb2x2ZWRNYWluU2l6ZSkpOwotICAgICAgICAg
ICAgcmV0dXJuIHN0ZDo6bWF4KGNoaWxkU2l6ZSwgc3RkOjptaW4oc3BlY2lmaWVkU2l6ZSwgY29u
dGVudFNpemUpKTsKLSAgICAgICAgfQotCi0gICAgICAgIGlmICh1c2VDaGlsZEFzcGVjdFJhdGlv
KGNoaWxkKSB8fCBjaGlsZENyb3NzU2l6ZVNob3VsZFVzZUNvbnRhaW5lckNyb3NzU2l6ZShjaGls
ZCkpIHsKLSAgICAgICAgICAgIE9wdGlvbmFsPExheW91dFVuaXQ+IHRyYW5zZmVycmVkU2l6ZSA9
IGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNoaWxkLCBjaGlsZENyb3NzU2l6
ZUxlbmd0aCk7Ci0gICAgICAgICAgICBpZiAodHJhbnNmZXJyZWRTaXplKSB7Ci0gICAgICAgICAg
ICAgICAgdHJhbnNmZXJyZWRTaXplID0gYWRqdXN0Q2hpbGRTaXplRm9yQXNwZWN0UmF0aW9Dcm9z
c0F4aXNNaW5BbmRNYXgoY2hpbGQsIHRyYW5zZmVycmVkU2l6ZS52YWx1ZSgpKTsKLSAgICAgICAg
ICAgICAgICByZXR1cm4gc3RkOjptYXgoY2hpbGRTaXplLCBzdGQ6Om1pbih0cmFuc2ZlcnJlZFNp
emUudmFsdWUoKSwgY29udGVudFNpemUpKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgfQotCi0g
ICAgICAgIHJldHVybiBzdGQ6Om1heChjaGlsZFNpemUsIGNvbnRlbnRTaXplKTsKKyAgICAgICAg
ICAgIGNoaWxkU2l6ZSA9IHN0ZDo6bWF4KGNoaWxkU2l6ZSwgc3RkOjptaW4oc3BlY2lmaWVkU2l6
ZSwgY29udGVudFNpemUpKTsKKyAgICAgICAgfSBlbHNlIGlmICh1c2VDaGlsZEFzcGVjdFJhdGlv
KGNoaWxkKSB8fCBjaGlsZENyb3NzU2l6ZVNob3VsZFVzZUNvbnRhaW5lckNyb3NzU2l6ZShjaGls
ZCkpIHsKKyAgICAgICAgICAgIExheW91dFVuaXQgdHJhbnNmZXJyZWRTaXplID0gY29tcHV0ZU1h
aW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoY2hpbGQsIGNoaWxkQ3Jvc3NTaXplTGVuZ3RoKTsK
KyAgICAgICAgICAgIHRyYW5zZmVycmVkU2l6ZSA9IGFkanVzdENoaWxkU2l6ZUZvckFzcGVjdFJh
dGlvQ3Jvc3NBeGlzTWluQW5kTWF4KGNoaWxkLCB0cmFuc2ZlcnJlZFNpemUpOworICAgICAgICAg
ICAgY2hpbGRTaXplID0gc3RkOjptYXgoY2hpbGRTaXplLCBzdGQ6Om1pbih0cmFuc2ZlcnJlZFNp
emUsIGNvbnRlbnRTaXplKSk7CisgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgY2hpbGRTaXpl
ID0gc3RkOjptYXgoY2hpbGRTaXplLCBjb250ZW50U2l6ZSk7CiAgICAgfQotCisgICAgTGVuZ3Ro
IGNyb3NzTWluID0gY3Jvc3NTaXplTGVuZ3RoRm9yQ2hpbGQoTWluU2l6ZSwgY2hpbGQpOworICAg
IGlmIChjaGlsZC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkgJiYgIWNoaWxkTWFpblNpemVJc0Rl
ZmluaXRlKGNoaWxkLCBmbGV4QmFzaXNGb3JDaGlsZChjaGlsZCkpICYmIGNoaWxkQ3Jvc3NTaXpl
SXNEZWZpbml0ZShjaGlsZCwgY3Jvc3NNaW4pKQorICAgICAgICByZXR1cm4gc3RkOjptYXgoY2hp
bGRTaXplLCBjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjaGlsZCwgY3Jvc3NN
aW4pKTsKICAgICByZXR1cm4gc3RkOjptYXgoMF9sdSwgY2hpbGRTaXplKTsKIH0KICAgICAKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oIGIv
U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKaW5kZXggNjgwZGNk
N2MwMzgwNDcyYjQ5OWFkNzQ0ZGVhMjFkNjhjN2Y0ZTk0OS4uYjE3M2UyYmE1ZTBhNmE2MGY1Nzlm
OThjZjdjYzkzYWJkNjEzNjQ3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n
L1JlbmRlckZsZXhpYmxlQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl
ckZsZXhpYmxlQm94LmgKQEAgLTE0Miw2ICsxNDIsNyBAQCBwcml2YXRlOgogICAgIExheW91dFVu
aXQgY3Jvc3NBeGlzU2Nyb2xsYmFyRXh0ZW50KCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBjcm9z
c0F4aXNTY3JvbGxiYXJFeHRlbnRGb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25z
dDsKICAgICBMYXlvdXRQb2ludCBmbG93QXdhcmVMb2NhdGlvbkZvckNoaWxkKGNvbnN0IFJlbmRl
ckJveCYgY2hpbGQpIGNvbnN0OworICAgIGJvb2wgd2lsbENoaWxkQ3Jvc3NTaXplQmVDb250YWlu
ZXJDcm9zc1NpemUoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3Q7CiAgICAgYm9vbCB1c2VD
aGlsZEFzcGVjdFJhdGlvKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0OwogICAgIGJvb2wg
Y2hpbGRDcm9zc1NpemVTaG91bGRVc2VDb250YWluZXJDcm9zc1NpemUoY29uc3QgUmVuZGVyQm94
JiBjaGlsZCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0
UmF0aW9Vc2luZyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkLCBMZW5ndGggY3Jvc3NTaXplTGVuZ3Ro
KSBjb25zdDsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3Rz
L0NoYW5nZUxvZwppbmRleCBkNDZlZTRkYzRiZjk1OWNhZjE1NWYxM2VjZGI4MDk1OTVjMWU4MmIy
Li44MTE4YTRhNGJjMDI4MmI5YTIxNTM5NzBiODIxNDk4OGRjNmQ5ZDVmIDEwMDY0NAotLS0gYS9M
YXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMg
KzEsMTQgQEAKKzIwMjEtMDMtMDYgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAg
ICAgICBTdXBwb3J0IGFzcGVjdC1yYXRpbyBpbiBpbnRyaW5zaWMgc2l6aW5nCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA4NjEKKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFbmFibGUgdGVzdHMgdGhhdCBw
YXNzIG5vdy4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDMtMDYgIFph
bGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBPbmx5IHBvc2l0aXZlIGlu
dGVnZXJzIGFyZSBhbGxvd2VkIGFzIHZhbHVlcyBvZiBvcnBoYW5zIGFuZCB3aWRvd3MKZGlmZiAt
LWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhw
ZWN0YXRpb25zCmluZGV4IDQ0ZDA5NWM5MDQzYjBhNGE2OTExOTNkOTYzYmJkMDEzN2RjYjUwMmQu
LmFjYmRjZjY0ZmQ3YjNhYWNhMzhmN2E3ZGE5OTQ2YzYyYTcxM2E0NzQgMTAwNjQ0Ci0tLSBhL0xh
eW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0
aW9ucwpAQCAtNDU1MCw2ICs0NTUwLDcgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zaGFkb3ctZGlyZWMKIHdlYmtp
dC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNj
b3Bpbmcvc2hhZG93LWRpcmVjdGlvbmFsaXR5LTAwMi50ZW50YXRpdmUuaHRtbCBbIEltYWdlT25s
eUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zbG90dGVkLXBsYWNlaG9sZGVyLmh0bWwgWyBJbWFnZU9u
bHlGYWlsdXJlIF0KIAorIyAgY29udGFpbi1pbnRyaW5zaWMtc2l6ZQogd2Via2l0Lm9yZy9iLzIx
NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj
dC1yYXRpby9hYnNwb3MtMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcv
Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h
c3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMjguaHRtbCBb
IEltYWdlT25seUZhaWx1cmUgXQpAQCAtNDU1OCwyMSArNDU1OSw4IEBAIHdlYmtpdC5vcmcvYi8y
MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl
Y3QtcmF0aW8vCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMi5o
dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNw
ZWN0LXJhdGlvLTAyNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0
NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0
LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13
ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxNS5odG1sIFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAx
Ni5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQt
YXNwZWN0LXJhdGlvLTAxNy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2Iv
MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw
ZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13
ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwMi5odG1sIFsgSW1hZ2VPbmx5
RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwNC5odG1s
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1z
aXplLTAwNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGlt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv
L2ludHJpbnNpYy1zaXplLTAwNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3Jn
L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv
YXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd
Ci13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAxMC5odG1sIFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAxMS5o
dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNp
Yy1zaXplLTAxMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYz
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh
dGlvL2ludHJpbnNpYy1zaXplLTAxMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQu
b3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp
bmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAxNS5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3RhYmxlLWVsZW1lbnQtMDAx
Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9jb250YWluLWludHJpbnNpYy1z
aXplL2NvbnRhaW4taW50cmluc2ljLXNpemUtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
IHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXNpemluZy9jb250YWluLWludHJpbnNpYy1zaXplL2NvbnRhaW4taW50cmluc2ljLXNpemUt
MDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2lt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv
L2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3Qt
cmF0aW8tMDI2Lmh0bWwKaW5kZXggMWRmMTQ0Njg2MzJiYWE4ZmZkMDNkNjkwZjdkZGFhNjE4YWNk
N2JmNi4uYzRhMjUwODE4YmI3Nzg2ZTJmMzk1OTIyZDI4ZTNjNzUxOWI0ZWEzYSAxMDA2NDQKLS0t
IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp
emluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwKKysrIGIvTGF5b3V0
VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl
Y3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwKQEAgLTE1LDYgKzE1LDcgQEAKICAg
Lml0ZW0gewogICAgIGJhY2tncm91bmQ6IGdyZWVuOwogICAgIHBhZGRpbmctbGVmdDogMTVweDsK
KyAgICBwYWRkaW5nLXRvcDogMTBweDsKICAgICBib3gtc2l6aW5nOiBib3JkZXItYm94OwogICB9
CiAgIC5pdGVtID4gZGl2IHsKQEAgLTUzLDI1ICs1NCwyNSBAQAogICAgICAgIGJlY2F1c2UgaXRz
IHZhbHVlIGNvbnRhaW5zICdhdXRvJy4gLS0+CiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIi
IHN0eWxlPSJoZWlnaHQ6IGF1dG87Ij4KICAgICA8IS0tIFRoZSBjb250ZW50LWJveCB3aWR0aCAx
MHB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBh
IHJlc29sdmVkIGZsZXggYmFzZSBzaXplIG9mIDIwMHB4LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJp
dGVtIiBzdHlsZT0ibWluLWhlaWdodDowOyB3aWR0aDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRv
IDEvMjA7Ij48ZGl2PjwvZGl2PjwvZGl2PgorICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBm
bGV4IGJhc2Ugc2l6ZSBvZiAxOTBweC4gLS0+CisgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9
Im1pbi1oZWlnaHQ6MDsgd2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE5OyI+PGRp
dj48L2Rpdj48L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciI+
CiAgICAgPCEtLSBUaGUgY29udGVudC1ib3ggd2lkdGggMTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0
aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1
dG8gb2YgMjAwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJ3aWR0aDogMjVw
eDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEvMjA7Ij48ZGl2PjwvZGl2PjwvZGl2PgorICAgICAgICAg
eWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8gb2YgMTkwcHguIC0tPgorICAgIDxk
aXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJ3aWR0aDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEv
MTk7Ij48ZGl2PjwvZGl2PjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29u
dGFpbmVyIj4KICAgICA8IS0tIFRoZSBjb250ZW50LWJveCBtaW4td2lkdGggMTBweCBpcyB0cmFu
c2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBt
aW4taGVpZ2h0OmF1dG8gb2YgMjAwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxl
PSJtaW4td2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzIwOyI+PGRpdj48L2Rpdj48
L2Rpdj4KKyAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLWhlaWdodDphdXRvIG9mIDE5
MHB4LiAtLT4KKyAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWluLXdpZHRoOiAyNXB4OyBh
c3BlY3QtcmF0aW86IGF1dG8gMS8xOTsiPjxkaXY+PC9kaXY+PC9kaXY+CiAgIDwvZGl2PgogCiAg
IDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgogICAgIDwhLS0gVGhlIGNvbnRlbnQtYm94IHdp
ZHRoIDEwcHggKGNsYW1wZWQgYnkgbWF4LXdpZHRoKSBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFp
biBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8gb2Yg
MjAwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtYXgtd2lkdGg6IDI1cHg7
IHdpZHRoOiAxMDBweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEvMjA7Ij48ZGl2PjwvZGl2PjwvZGl2
PgorICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8gb2YgMTkwcHgu
IC0tPgorICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtYXgtd2lkdGg6IDI1cHg7IHdpZHRo
OiAxMDBweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEvMTk7Ij48ZGl2PjwvZGl2PjwvZGl2PgogICA8
L2Rpdj4KIDwvaHRtbD4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>422523</attachid>
            <date>2021-03-07 02:38:37 -0800</date>
            <delta_ts>2021-03-07 05:42:28 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210307113836.patch</filename>
            <type>text/plain</type>
            <size>25617</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MDUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjI4OTQ5Y2FiYmNjZmE0
YzNlY2M0ZGFhODE3ZTJkNzRlNGZiMTFkMC4uNzQyNzQ1N2NjNDJiYTU2ZmNhM2RmZjVmNmQxY2Q1
ZTIzOTQ5ZDg3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAzLTA3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBXSVAuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OndpbGxDaGlsZENyb3NzU2l6ZUJl
Q29udGFpbmVyQ3Jvc3NTaXplIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhp
YmxlQm94Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyBjb25zdCk6CisgICAg
ICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94Lmg6CisKIDIwMjEtMDMtMDYgIFphbGFu
IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBPbmx5IHBvc2l0aXZlIGludGVn
ZXJzIGFyZSBhbGxvd2VkIGFzIHZhbHVlcyBvZiBvcnBoYW5zIGFuZCB3aWRvd3MKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XVEYvU2NyaXB0cy9QcmVmZXJlbmNlcy9XZWJQcmVmZXJlbmNlc0V4cGVyaW1l
bnRhbC55YW1sIGIvU291cmNlL1dURi9TY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2Vz
RXhwZXJpbWVudGFsLnlhbWwKaW5kZXggNGIwMDQ0NzdmZTU1MThiZjJmNjJjYjQ5NzAyMzAzNDcz
NjI1YmUxZC4uNzQyYjY1MGNjNzRmNjgyZDVhZTRkNTJhZmViMWQwZDc5ZjAyMTgyZSAxMDA2NDQK
LS0tIGEvU291cmNlL1dURi9TY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzRXhwZXJp
bWVudGFsLnlhbWwKKysrIGIvU291cmNlL1dURi9TY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZl
cmVuY2VzRXhwZXJpbWVudGFsLnlhbWwKQEAgLTQzLDExICs0MywxMSBAQCBBc3BlY3RSYXRpb0Vu
YWJsZWQ6CiAgIGh1bWFuUmVhZGFibGVEZXNjcmlwdGlvbjogIkVuYWJsZSBhc3BlY3QtcmF0aW8g
Q1NTIHByb3BlcnR5IgogICBkZWZhdWx0VmFsdWU6CiAgICAgV2ViS2l0TGVnYWN5OgotICAgICAg
ZGVmYXVsdDogZmFsc2UKKyAgICAgIGRlZmF1bHQ6IHRydWUKICAgICBXZWJLaXQ6Ci0gICAgICBk
ZWZhdWx0OiBmYWxzZQorICAgICAgZGVmYXVsdDogdHJ1ZQogICAgIFdlYkNvcmU6Ci0gICAgICBk
ZWZhdWx0OiBmYWxzZQorICAgICAgZGVmYXVsdDogdHJ1ZQogCiAjIEZJWE1FOiBUaGlzIGlzIG9u
IGJ5IGRlZmF1bHQgaW4gV2ViS2l0Mi4gUGVyaGFwcyB3ZSBzaG91bGQgY29uc2lkZXIgdHVybmlu
ZyBpdCBvbiBmb3IgV2ViS2l0TGVnYWN5IGFzIHdlbGwuCiBBc3BlY3RSYXRpb09mSW1nRnJvbVdp
ZHRoQW5kSGVpZ2h0RW5hYmxlZDoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu
Zy9SZW5kZXJCbG9jay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2su
Y3BwCmluZGV4IGMwNDc5ODdmYjllNDYzZGIwYmVjY2YyMTc2ZTViNmE5ODhlZDNlOWMuLjQ2YjVj
NjlmZDRkNDliZDkwZDZkNTNkODg4N2Q5ZDg5YjNhNDBlNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL1JlbmRlckJsb2NrLmNwcApAQCAtMjI4Miw2ICsyMjgyLDggQEAgdm9pZCBSZW5kZXJC
bG9jazo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoKQogICAgIGlmICghaXNUYWJsZUNl
bGwoKSAmJiBzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLmlzRml4ZWQoKSAmJiBzdHlsZVRvVXNl
LmxvZ2ljYWxXaWR0aCgpLnZhbHVlKCkgPj0gMAogICAgICAgICAmJiAhKGlzRGVwcmVjYXRlZEZs
ZXhJdGVtKCkgJiYgIXN0eWxlVG9Vc2UubG9naWNhbFdpZHRoKCkuaW50VmFsdWUoKSkpCiAgICAg
ICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoID0gbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lk
dGggPSBhZGp1c3RDb250ZW50Qm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKHN0eWxlVG9Vc2Uu
bG9naWNhbFdpZHRoKCkpOworICAgIGVsc2UgaWYgKHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhG
cm9tQXNwZWN0UmF0aW8oKSkKKyAgICAgICAgbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBt
X21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IGNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0
UmF0aW8oKTsKICAgICBlbHNlCiAgICAgICAgIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhz
KG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoLCBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCk7
CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIv
U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggZjU4MmI1NjdhZGFl
OTBjZDRkNGEwY2VmMmM5YjhkNjExYjMwMjgzMy4uNjJhM2QzZmJmNzkyYzA4MjUwYzg4NmJhNTM4
ZjcwZjRhMzI1MjIyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl
ckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAg
LTY1MSw3ICs2NTEsNyBAQCB2b2lkIFJlbmRlckJveDo6dXBkYXRlTGF5ZXJUcmFuc2Zvcm0oKQog
ICAgICAgICBsYXllcigpLT51cGRhdGVUcmFuc2Zvcm0oKTsKIH0KIAotTGF5b3V0VW5pdCBSZW5k
ZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChMYXlvdXRVbml0
IGxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCwgUmVuZGVyQmxvY2smIGNi
LCBSZW5kZXJGcmFnbWVudENvbnRhaW5lciogZnJhZ21lbnQpIGNvbnN0CitMYXlvdXRVbml0IFJl
bmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KExheW91dFVu
aXQgbG9naWNhbFdpZHRoLCBMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoLCBSZW5kZXJCbG9jayYg
Y2IsIFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiBmcmFnbWVudCwgYm9vbCBhbGxvd0ludHJpbnNp
YykgY29uc3QKIHsKICAgICBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGVUb1VzZSA9IHN0eWxlKCk7
CiAKQEAgLTY2MCwxMyArNjYwLDE1IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb25zdHJhaW5M
b2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgoTGF5b3V0VW5pdCBsb2dpY2FsCiAgICAgICAg
IGxvZ2ljYWxXaWR0aCA9IHN0ZDo6Y2xhbXAobG9naWNhbFdpZHRoLCBsb2dpY2FsTWluV2lkdGgs
IGxvZ2ljYWxNYXhXaWR0aCk7CiAgICAgfQogCi0gICAgaWYgKCFzdHlsZVRvVXNlLmxvZ2ljYWxN
YXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkpCisgICAgaWYgKCFzdHlsZVRvVXNlLmxvZ2ljYWxNYXhX
aWR0aCgpLmlzVW5kZWZpbmVkKCkgJiYgKGFsbG93SW50cmluc2ljIHx8ICFzdHlsZVRvVXNlLmxv
Z2ljYWxNYXhXaWR0aCgpLmlzSW50cmluc2ljKCkpKQogICAgICAgICBsb2dpY2FsV2lkdGggPSBz
dGQ6Om1pbihsb2dpY2FsV2lkdGgsIGNvbXB1dGVMb2dpY2FsV2lkdGhJbkZyYWdtZW50VXNpbmco
TWF4U2l6ZSwgc3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lkdGgoKSwgYXZhaWxhYmxlV2lkdGgsIGNi
LCBmcmFnbWVudCkpOworICAgIGlmICghYWxsb3dJbnRyaW5zaWMgJiYgc3R5bGVUb1VzZS5sb2dp
Y2FsTWluV2lkdGgoKS5pc0ludHJpbnNpYygpKQorICAgICAgICByZXR1cm4gbG9naWNhbFdpZHRo
OwogICAgIGF1dG8gbWluTGVuZ3RoID0gc3R5bGVUb1VzZS5sb2dpY2FsTWluV2lkdGgoKTsKLSAg
ICBpZiAoc3R5bGVUb1VzZS5oYXNBc3BlY3RSYXRpbygpICYmIHN0eWxlVG9Vc2UubG9naWNhbFdp
ZHRoKCkuaXNBdXRvKCkgJiYgbWluTGVuZ3RoLmlzQXV0bygpICYmIHN0eWxlVG9Vc2Uub3ZlcmZs
b3dJbmxpbmVEaXJlY3Rpb24oKSA9PSBPdmVyZmxvdzo6VmlzaWJsZSkgeworICAgIGlmIChzdHls
ZVRvVXNlLmhhc0FzcGVjdFJhdGlvKCkgJiYgbWluTGVuZ3RoLmlzQXV0bygpICYmIChzdHlsZVRv
VXNlLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpIHx8IHN0eWxlVG9Vc2UubG9naWNhbFdpZHRoKCku
aXNNaW5Db250ZW50KCkgfHwgc3R5bGVUb1VzZS5sb2dpY2FsV2lkdGgoKS5pc01heENvbnRlbnQo
KSkgJiYgc3R5bGVUb1VzZS5vdmVyZmxvd0lubGluZURpcmVjdGlvbigpID09IE92ZXJmbG93OjpW
aXNpYmxlKSB7CiAgICAgICAgIC8vIE1ha2Ugc3VyZSB3ZSBhY3R1YWxseSB1c2VkIHRoZSBhc3Bl
Y3QgcmF0aW8uCiAgICAgICAgIGlmIChzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVj
dFJhdGlvKCkpCi0gICAgICAgICAgICBtaW5MZW5ndGggPSBMZW5ndGgoTGVuZ3RoVHlwZTo6TWlu
Q29udGVudCk7CisgICAgICAgICAgICBtaW5MZW5ndGggPSBMZW5ndGgoTGVuZ3RoVHlwZTo6TWlu
SW50cmluc2ljKTsKICAgICB9CiAgICAgcmV0dXJuIHN0ZDo6bWF4KGxvZ2ljYWxXaWR0aCwgY29t
cHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyhNaW5TaXplLCBtaW5MZW5ndGgsIGF2YWls
YWJsZVdpZHRoLCBjYiwgZnJhZ21lbnQpKTsKIH0KQEAgLTI2MTIsOSArMjYxNCwxMiBAQCBMYXlv
dXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aFVzaW5nKExlbmd0
aCBsb2dpY2FsV2lkdGhMZW5ndAogCiAgICAgTGF5b3V0VW5pdCBtaW5Mb2dpY2FsV2lkdGg7CiAg
ICAgTGF5b3V0VW5pdCBtYXhMb2dpY2FsV2lkdGg7Ci0gICAgY29tcHV0ZUludHJpbnNpY0xvZ2lj
YWxXaWR0aHMobWluTG9naWNhbFdpZHRoLCBtYXhMb2dpY2FsV2lkdGgpOworICAgIGlmICghbG9n
aWNhbFdpZHRoTGVuZ3RoLmlzTWluSW50cmluc2ljKCkgJiYgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxX
aWR0aEZyb21Bc3BlY3RSYXRpbygpKQorICAgICAgICBtaW5Mb2dpY2FsV2lkdGggPSBtYXhMb2dp
Y2FsV2lkdGggPSBjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCk7CisgICAgZWxz
ZQorICAgICAgICBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhtaW5Mb2dpY2FsV2lkdGgs
IG1heExvZ2ljYWxXaWR0aCk7CiAKLSAgICBpZiAobG9naWNhbFdpZHRoTGVuZ3RoLmlzTWluQ29u
dGVudCgpKQorICAgIGlmIChsb2dpY2FsV2lkdGhMZW5ndGguaXNNaW5Db250ZW50KCkgfHwgbG9n
aWNhbFdpZHRoTGVuZ3RoLmlzTWluSW50cmluc2ljKCkpCiAgICAgICAgIHJldHVybiBtaW5Mb2dp
Y2FsV2lkdGggKyBib3JkZXJBbmRQYWRkaW5nOwogCiAgICAgaWYgKGxvZ2ljYWxXaWR0aExlbmd0
aC5pc01heENvbnRlbnQoKSkKQEAgLTI2NDIsNyArMjY0Nyw3IEBAIExheW91dFVuaXQgUmVuZGVy
Qm94Ojpjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFnbWVudFVzaW5nKFNpemVUeXBlIHdpZHRoVHlw
ZSwgTGVuCiAgICAgICAgIHJldHVybiBhZGp1c3RCb3JkZXJCb3hMb2dpY2FsV2lkdGhGb3JCb3hT
aXppbmcodmFsdWVGb3JMZW5ndGgobG9naWNhbFdpZHRoLCBhdmFpbGFibGVMb2dpY2FsV2lkdGgp
LCBsb2dpY2FsV2lkdGgudHlwZSgpKTsKICAgICB9CiAKLSAgICBpZiAobG9naWNhbFdpZHRoLmlz
SW50cmluc2ljKCkpCisgICAgaWYgKGxvZ2ljYWxXaWR0aC5pc0ludHJpbnNpYygpIHx8IGxvZ2lj
YWxXaWR0aC5pc01pbkludHJpbnNpYygpKQogICAgICAgICByZXR1cm4gY29tcHV0ZUludHJpbnNp
Y0xvZ2ljYWxXaWR0aFVzaW5nKGxvZ2ljYWxXaWR0aCwgYXZhaWxhYmxlTG9naWNhbFdpZHRoLCBi
b3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoKCkpOwogCiAgICAgTGF5b3V0VW5pdCBtYXJnaW5T
dGFydDsKQEAgLTUwOTgsNyArNTEwMyw3IEBAIGJvb2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRl
TG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0CiAgICAgICAgIHJldHVybiBmYWxz
ZTsKIAogICAgIGF1dG8gaCA9IHN0eWxlKCkubG9naWNhbEhlaWdodCgpOwotICAgIHJldHVybiBo
LmlzQXV0bygpIHx8ICghaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgJiYgaC5pc1BlcmNlbnRPckNh
bGN1bGF0ZWQoKSAmJiAhcGVyY2VudGFnZUxvZ2ljYWxIZWlnaHRJc1Jlc29sdmFibGUoKSk7Cisg
ICAgcmV0dXJuIGguaXNBdXRvKCkgfHwgaC5pc0ludHJpbnNpYygpIHx8ICghaXNPdXRPZkZsb3dQ
b3NpdGlvbmVkKCkgJiYgaC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSAmJiAhcGVyY2VudGFnZUxv
Z2ljYWxIZWlnaHRJc1Jlc29sdmFibGUoKSk7CiB9CiAKIGJvb2wgUmVuZGVyQm94OjpzaG91bGRD
b21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkgY29uc3QKQEAgLTUxMzQsNyArNTEz
OSw3IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVj
dFJhdGlvKFJlbmRlckZyYWdtZW50Q29udGFpbmVyCiAgICAgYXV0byBsb2dpY2FsV2lkdGggPSBp
bmxpbmVTaXplRnJvbUFzcGVjdFJhdGlvKGhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50
KCksIHZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpLCBMYXlvdXRVbml0KHN0eWxlKCku
bG9naWNhbEFzcGVjdFJhdGlvKCkpLCBzdHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJhdGlvKCks
IGxvZ2ljYWxIZWlnaHRmb3JBc3BlY3RSYXRpbyk7CiAKICAgICBMYXlvdXRVbml0IGNvbnRhaW5l
cldpZHRoSW5JbmxpbmVEaXJlY3Rpb24gPSBzdGQ6Om1heDxMYXlvdXRVbml0PigwLCBjb250YWlu
aW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JDb250ZW50SW5GcmFnbWVudChmcmFnbWVudCkpOwotICAg
IHJldHVybiBjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgobG9naWNhbFdp
ZHRoLCBjb250YWluZXJXaWR0aEluSW5saW5lRGlyZWN0aW9uLCAqY29udGFpbmluZ0Jsb2NrKCks
IGZyYWdtZW50KTsKKyAgICByZXR1cm4gY29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5
TWluTWF4KGxvZ2ljYWxXaWR0aCwgY29udGFpbmVyV2lkdGhJbklubGluZURpcmVjdGlvbiwgKmNv
bnRhaW5pbmdCbG9jaygpLCBmcmFnbWVudCwgZmFsc2UpOwogfQogCiBzdGQ6OnBhaXI8TGF5b3V0
VW5pdCwgTGF5b3V0VW5pdD4gUmVuZGVyQm94Ojpjb21wdXRlTWluTWF4TG9naWNhbFdpZHRoRnJv
bUFzcGVjdFJhdGlvKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu
Zy9SZW5kZXJCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAppbmRl
eCA2ZGU2ZWQ2YWM2Yjk2ODhmY2IzNjQ4ZGJiNGIyZWM5YTA5YmIxNDI0Li44MGEzYjg5MzFiZTM0
YmIxMDE1MDEyYzUzY2RhN2Q5NDMzOGMxMzI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y
ZW5kZXJpbmcvUmVuZGVyQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl
ckJveC5oCkBAIC04NSw3ICs4NSw3IEBAIHB1YmxpYzoKICAgICBMYXlvdXRVbml0IGxvZ2ljYWxX
aWR0aCgpIGNvbnN0IHsgcmV0dXJuIHN0eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/
IHdpZHRoKCkgOiBoZWlnaHQoKTsgfQogICAgIExheW91dFVuaXQgbG9naWNhbEhlaWdodCgpIGNv
bnN0IHsgcmV0dXJuIHN0eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGhlaWdodCgp
IDogd2lkdGgoKTsgfQogCi0gICAgTGF5b3V0VW5pdCBjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZy
YWdtZW50QnlNaW5NYXgoTGF5b3V0VW5pdCwgTGF5b3V0VW5pdCwgUmVuZGVyQmxvY2smLCBSZW5k
ZXJGcmFnbWVudENvbnRhaW5lciogPSBudWxscHRyKSBjb25zdDsKKyAgICBMYXlvdXRVbml0IGNv
bnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChMYXlvdXRVbml0LCBMYXlvdXRV
bml0LCBSZW5kZXJCbG9jayYsIFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiwgYm9vbCBhbGxvd0lu
dHJpbnNpYyA9IHRydWUpIGNvbnN0OwogICAgIExheW91dFVuaXQgY29uc3RyYWluTG9naWNhbEhl
aWdodEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgT3B0aW9uYWw8TGF5b3V0VW5p
dD4gaW50cmluc2ljQ29udGVudEhlaWdodCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBjb25zdHJh
aW5Db250ZW50Qm94TG9naWNhbEhlaWdodEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbEhlaWdo
dCwgT3B0aW9uYWw8TGF5b3V0VW5pdD4gaW50cmluc2ljQ29udGVudEhlaWdodCkgY29uc3Q7CiAK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5j
cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4
IDliYzYzNjI2MzlmZTEyZDVmNDkyMGVkODdjMjZhNTllYTU0ZWMwZjEuLmRlMjkyZTZhOTkwODE3
ZGFmY2Y4ZTlhNDUyNDUzZTU1YzVjY2VmNjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl
bmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy
aW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtNzg1LDE0ICs3ODUsMjMgQEAgYm9vbCBSZW5k
ZXJGbGV4aWJsZUJveDo6dXNlQ2hpbGRBc3BlY3RSYXRpbyhjb25zdCBSZW5kZXJCb3gmIGNoaWxk
KSBjb25zdAogICAgIHJldHVybiBjaGlsZENyb3NzU2l6ZUlzRGVmaW5pdGUoY2hpbGQsIGNyb3Nz
U2l6ZUxlbmd0aEZvckNoaWxkKE1haW5PclByZWZlcnJlZFNpemUsIGNoaWxkKSk7CiB9CiAKK2Jv
b2wgUmVuZGVyRmxleGlibGVCb3g6OndpbGxDaGlsZENyb3NzU2l6ZUJlQ29udGFpbmVyQ3Jvc3NT
aXplKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0Cit7CisgICAgaWYgKCFjaGlsZEhhc0Fz
cGVjdFJhdGlvKGNoaWxkKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmICghY2hpbGQu
aW50cmluc2ljU2l6ZSgpLmhlaWdodCgpICYmICFjaGlsZC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlv
KCkpIHsKKyAgICAgICAgLy8gV2UgY2FuJ3QgY29tcHV0ZSBhIHJhdGlvIGluIHRoaXMgY2FzZS4K
KyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKyAgICBjb25zdCBMZW5ndGgmIGNyb3NzU2l6
ZUxlbmd0aCA9IGlzSG9yaXpvbnRhbEZsb3coKSA/IGNoaWxkLnN0eWxlKCkuaGVpZ2h0KCkgOiBj
aGlsZC5zdHlsZSgpLndpZHRoKCk7CisgICAgcmV0dXJuICFpc011bHRpbGluZSgpICYmIGNoaWxk
Q3Jvc3NTaXplSXNEZWZpbml0ZShjaGlsZCwgTGVuZ3RoKDEwMCwgTGVuZ3RoVHlwZTo6UGVyY2Vu
dCkpICYmIGFsaWdubWVudEZvckNoaWxkKGNoaWxkKSA9PSBJdGVtUG9zaXRpb246OlN0cmV0Y2gg
JiYgY3Jvc3NTaXplTGVuZ3RoLmlzQXV0bygpICYmICFoYXNBdXRvTWFyZ2luc0luQ3Jvc3NBeGlz
KGNoaWxkKTsKK30KICAgICAKIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVN
YWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJveCYgY2hpbGQsIExlbmd0
aCBjcm9zc1NpemVMZW5ndGgpIGNvbnN0CiB7CiAgICAgQVNTRVJUKGNoaWxkSGFzQXNwZWN0UmF0
aW8oY2hpbGQpKTsKIAotICAgIGF1dG8gYWRqdXN0Rm9yQm94U2l6aW5nID0gW3RoaXNdIChjb25z
dCBSZW5kZXJCb3gmIGJveCwgTGVuZ3RoIGxlbmd0aCkgLT4gTGF5b3V0VW5pdCB7Ci0gICAgICAg
IEFTU0VSVChsZW5ndGguaXNGaXhlZCgpKTsKLSAgICAgICAgYXV0byB2YWx1ZSA9IExheW91dFVu
aXQobGVuZ3RoLnZhbHVlKCkpOworICAgIGF1dG8gYWRqdXN0Rm9yQm94U2l6aW5nID0gW3RoaXNd
IChjb25zdCBSZW5kZXJCb3gmIGJveCwgTGF5b3V0VW5pdCB2YWx1ZSkgLT4gTGF5b3V0VW5pdCB7
CiAgICAgICAgIC8vIFdlIG5lZWQgdG8gc3Vic3RyYWN0IHRoZSBib3JkZXIgYW5kIHBhZGRpbmcg
ZXh0ZW50IGZyb20gdGhlIGNyb3NzIGF4aXMuCiAgICAgICAgIC8vIEZ1cnRoZXJtb3JlLCB0aGUg
c2l6aW5nIGNhbGN1bGF0aW9ucyB0aGF0IGZsb29yIHRoZSBjb250ZW50IGJveCBzaXplIGF0IHpl
cm8gd2hlbiBhcHBseWluZyBib3gtc2l6aW5nIGFyZSBhbHNvIGlnbm9yZWQuCiAgICAgICAgIC8v
IGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZmxleGJveC8jYWxnby1tYWluLWl0ZW0uCkBA
IC04MDEsMzMgKzgxMCwzNiBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRl
TWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjb25zdCBSZW5kZXJCbwogICAgICAgICByZXR1
cm4gdmFsdWU7CiAgICAgfTsKIAorICAgIGlmIChjcm9zc1NpemVMZW5ndGguaXNBdXRvKCkgJiYg
d2lsbENoaWxkQ3Jvc3NTaXplQmVDb250YWluZXJDcm9zc1NpemUoY2hpbGQpKQorICAgICAgICBj
cm9zc1NpemVMZW5ndGggPSBMZW5ndGgoMTAwLCBMZW5ndGhUeXBlOjpQZXJjZW50KTsKKwogICAg
IE9wdGlvbmFsPExheW91dFVuaXQ+IGNyb3NzU2l6ZTsKLSAgICBpZiAoY3Jvc3NTaXplTGVuZ3Ro
LmlzRml4ZWQoKSkKLSAgICAgICAgY3Jvc3NTaXplID0gYWRqdXN0Rm9yQm94U2l6aW5nKGNoaWxk
LCBjcm9zc1NpemVMZW5ndGgpOwotICAgIGVsc2UgaWYgKGNyb3NzU2l6ZUxlbmd0aC5pc0F1dG8o
KSkgewotICAgICAgICBBU1NFUlQoY2hpbGRDcm9zc1NpemVTaG91bGRVc2VDb250YWluZXJDcm9z
c1NpemUoY2hpbGQpKTsKLSAgICAgICAgYXV0byBjb250YWluZXJDcm9zc1NpemVMZW5ndGggPSBp
c0hvcml6b250YWxGbG93KCkgPyBzdHlsZSgpLmhlaWdodCgpIDogc3R5bGUoKS53aWR0aCgpOwot
ICAgICAgICAvLyBLZWVwIHRoaXMgc3luYydlZCB3aXRoIGNoaWxkQ3Jvc3NTaXplU2hvdWxkVXNl
Q29udGFpbmVyQ3Jvc3NTaXplKCkuCi0gICAgICAgIEFTU0VSVChjb250YWluZXJDcm9zc1NpemVM
ZW5ndGguaXNGaXhlZCgpKTsKLSAgICAgICAgY3Jvc3NTaXplID0gdmFsdWVGb3JMZW5ndGgoY29u
dGFpbmVyQ3Jvc3NTaXplTGVuZ3RoLCAtMV9sdSk7CisgICAgaWYgKGNyb3NzU2l6ZUxlbmd0aC5p
c0ZpeGVkKCkpIHsKKyAgICAgICAgY3Jvc3NTaXplID0gTGF5b3V0VW5pdChjcm9zc1NpemVMZW5n
dGgudmFsdWUoKSk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgQVNTRVJUKGNyb3NzU2l6ZUxlbmd0
aC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSk7Ci0gICAgICAgIGNyb3NzU2l6ZSA9IG1haW5BeGlz
SXNDaGlsZElubGluZUF4aXMoY2hpbGQpID8gY2hpbGQuY29tcHV0ZVBlcmNlbnRhZ2VMb2dpY2Fs
SGVpZ2h0KGNyb3NzU2l6ZUxlbmd0aCkgOiBhZGp1c3RCb3JkZXJCb3hMb2dpY2FsV2lkdGhGb3JC
b3hTaXppbmcodmFsdWVGb3JMZW5ndGgoY3Jvc3NTaXplTGVuZ3RoLCBjb250ZW50V2lkdGgoKSks
IGNyb3NzU2l6ZUxlbmd0aC50eXBlKCkpOworICAgICAgICBjcm9zc1NpemUgPSBtYWluQXhpc0lz
Q2hpbGRJbmxpbmVBeGlzKGNoaWxkKSA/IGNoaWxkLmNvbXB1dGVQZXJjZW50YWdlTG9naWNhbEhl
aWdodChjcm9zc1NpemVMZW5ndGgpIDogdmFsdWVGb3JMZW5ndGgoY3Jvc3NTaXplTGVuZ3RoLCBj
b250ZW50V2lkdGgoKSk7CiAgICAgICAgIGlmICghY3Jvc3NTaXplKQogICAgICAgICAgICAgcmV0
dXJuIDBfbHU7CiAgICAgfQogCiAgICAgY29uc3QgTGF5b3V0U2l6ZSYgY2hpbGRJbnRyaW5zaWNT
aXplID0gY2hpbGQuaW50cmluc2ljU2l6ZSgpOwogICAgIGRvdWJsZSByYXRpbzsKLSAgICBpZiAo
Y2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OlJhdGlv
IHx8IChjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6
QXV0b0FuZFJhdGlvICYmIGNoaWxkSW50cmluc2ljU2l6ZS5pc0VtcHR5KCkpKQorICAgIExheW91
dFVuaXQgYm9yZGVyQW5kUGFkZGluZzsKKyAgICBpZiAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRp
b1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OlJhdGlvIHx8IChjaGlsZC5zdHlsZSgpLmFzcGVj
dFJhdGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6QXV0b0FuZFJhdGlvICYmIGNoaWxkSW50
cmluc2ljU2l6ZS5pc0VtcHR5KCkpKSB7CiAgICAgICAgIHJhdGlvID0gY2hpbGQuc3R5bGUoKS5h
c3BlY3RSYXRpb1dpZHRoKCkgLyBjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvSGVpZ2h0KCk7Ci0g
ICAgZWxzZSB7CisgICAgICAgIGlmIChjaGlsZC5zdHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJh
dGlvKCkgPT0gQm94U2l6aW5nOjpDb250ZW50Qm94KQorICAgICAgICAgICAgKmNyb3NzU2l6ZSAt
PSBpc0hvcml6b250YWxGbG93KCkgPyBjaGlsZC52ZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmdFeHRl
bnQoKSA6IGNoaWxkLmhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCk7CisgICAgICAg
IGVsc2UKKyAgICAgICAgICAgIGJvcmRlckFuZFBhZGRpbmcgPSBpc0hvcml6b250YWxGbG93KCkg
PyBjaGlsZC5ob3Jpem9udGFsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpIDogY2hpbGQudmVydGlj
YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCk7CisgICAgfSBlbHNlIHsKICAgICAgICAgQVNTRVJU
KGNoaWxkSW50cmluc2ljU2l6ZS5oZWlnaHQoKSk7CiAgICAgICAgIHJhdGlvID0gY2hpbGRJbnRy
aW5zaWNTaXplLndpZHRoKCkudG9GbG9hdCgpIC8gY2hpbGRJbnRyaW5zaWNTaXplLmhlaWdodCgp
LnRvRmxvYXQoKTsKKyAgICAgICAgKmNyb3NzU2l6ZSA9IGFkanVzdEZvckJveFNpemluZyhjaGls
ZCwgKmNyb3NzU2l6ZSk7CiAgICAgfQogICAgIGlmIChpc0hvcml6b250YWxGbG93KCkpCi0gICAg
ICAgIHJldHVybiBMYXlvdXRVbml0KGNyb3NzU2l6ZS52YWx1ZSgpICogcmF0aW8pOwotICAgIHJl
dHVybiBMYXlvdXRVbml0KGNyb3NzU2l6ZS52YWx1ZSgpIC8gcmF0aW8pOworICAgICAgICByZXR1
cm4gTGF5b3V0VW5pdChjcm9zc1NpemUudmFsdWUoKSAqIHJhdGlvKSAtIGJvcmRlckFuZFBhZGRp
bmc7CisgICAgcmV0dXJuIExheW91dFVuaXQoY3Jvc3NTaXplLnZhbHVlKCkgLyByYXRpbykgLSBi
b3JkZXJBbmRQYWRkaW5nOwogfQogCiB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpzZXRGbG93QXdh
cmVMb2NhdGlvbkZvckNoaWxkKFJlbmRlckJveCYgY2hpbGQsIGNvbnN0IExheW91dFBvaW50JiBs
b2NhdGlvbikKQEAgLTExOTYsMTcgKzEyMDgsMjIgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJs
ZUJveDo6YWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KGNvbnN0IFJlbmRlckJveCYgY2hpbGQK
ICAgICAgICAgY2hpbGRTaXplID0gc3RkOjptaW4oY2hpbGRTaXplLCBtYXhFeHRlbnQudmFsdWVP
cihjaGlsZFNpemUpKTsKICAgICB9CiAKKyAgICBMZW5ndGggY3Jvc3NNYXggPSBjcm9zc1NpemVM
ZW5ndGhGb3JDaGlsZChNYXhTaXplLCBjaGlsZCk7CisgICAgaWYgKCh1c2VDaGlsZEFzcGVjdFJh
dGlvKGNoaWxkKSB8fCBjaGlsZENyb3NzU2l6ZVNob3VsZFVzZUNvbnRhaW5lckNyb3NzU2l6ZShj
aGlsZCkpICYmICFjaGlsZE1haW5TaXplSXNEZWZpbml0ZShjaGlsZCwgZmxleEJhc2lzRm9yQ2hp
bGQoY2hpbGQpKSAmJiBjaGlsZENyb3NzU2l6ZUlzRGVmaW5pdGUoY2hpbGQsIGNyb3NzTWF4KSkg
eworICAgICAgICBtYXhFeHRlbnQgPSBjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2lu
ZyhjaGlsZCwgY3Jvc3NNYXgpOworICAgICAgICBjaGlsZFNpemUgPSBzdGQ6Om1pbihjaGlsZFNp
emUsIG1heEV4dGVudC52YWx1ZU9yKGNoaWxkU2l6ZSkpOworICAgIH0KKwogICAgIExlbmd0aCBt
aW4gPSBtYWluU2l6ZUxlbmd0aEZvckNoaWxkKE1pblNpemUsIGNoaWxkKTsKICAgICAvLyBJbnRy
aW5zaWMgc2l6ZXMgaW4gY2hpbGQncyBibG9jayBheGlzIGFyZSBoYW5kbGVkIGJ5IHRoZSBtaW4t
c2l6ZTphdXRvIGNvZGUgcGF0aC4KICAgICBpZiAobWluLmlzU3BlY2lmaWVkKCkgfHwgKG1pbi5p
c0ludHJpbnNpYygpICYmIG1haW5BeGlzSXNDaGlsZElubGluZUF4aXMoY2hpbGQpKSkKLSAgICAg
ICAgcmV0dXJuIHN0ZDo6bWF4KGNoaWxkU2l6ZSwgc3RkOjptYXgoMF9sdSwgY29tcHV0ZU1haW5B
eGlzRXh0ZW50Rm9yQ2hpbGQoY2hpbGQsIE1pblNpemUsIG1pbikudmFsdWVPcihjaGlsZFNpemUp
KSk7Ci0gICAgCi0gICAgaWYgKHNob3VsZEFwcGx5TWluU2l6ZUF1dG9Gb3JDaGlsZChjaGlsZCkp
IHsKKyAgICAgICAgY2hpbGRTaXplID0gc3RkOjptYXgoY2hpbGRTaXplLCBzdGQ6Om1heCgwX2x1
LCBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjaGlsZCwgTWluU2l6ZSwgbWluKS52YWx1
ZU9yKGNoaWxkU2l6ZSkpKTsKKyAgICBlbHNlIGlmIChzaG91bGRBcHBseU1pblNpemVBdXRvRm9y
Q2hpbGQoY2hpbGQpKSB7CiAgICAgICAgIC8vIEZJWE1FOiBJZiB0aGUgbWluIHZhbHVlIGlzIGV4
cGVjdGVkIHRvIGJlIHZhbGlkIGhlcmUsIHdlIG5lZWQgdG8gY29tZSB1cCB3aXRoIGEgbm9uIG9w
dGlvbmFsIHZlcnNpb24gb2YgY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQgYW5kCiAgICAg
ICAgIC8vIGVuc3VyZSBpdCdzIHZhbGlkIHRocm91Z2ggdGhlIHZpcnR1YWwgY2FsbHMgb2YgY29t
cHV0ZUludHJpbnNpY0xvZ2ljYWxDb250ZW50SGVpZ2h0VXNpbmcuCiAgICAgICAgIExheW91dFVu
aXQgY29udGVudFNpemU7CiAgICAgICAgIExlbmd0aCBjaGlsZENyb3NzU2l6ZUxlbmd0aCA9IGNy
b3NzU2l6ZUxlbmd0aEZvckNoaWxkKE1haW5PclByZWZlcnJlZFNpemUsIGNoaWxkKTsKLSAgICAg
ICAgaWYgKHVzZUNoaWxkQXNwZWN0UmF0aW8oY2hpbGQpKQorICAgICAgICBpZiAodXNlQ2hpbGRB
c3BlY3RSYXRpbyhjaGlsZCkpIC8vIHx8IHdpbGxDaGlsZENyb3NzU2l6ZUJlQ29udGFpbmVyQ3Jv
c3NTaXplKGNoaWxkKSkKICAgICAgICAgICAgIGNvbnRlbnRTaXplID0gY29tcHV0ZU1haW5TaXpl
RnJvbUFzcGVjdFJhdGlvVXNpbmcoY2hpbGQsIGNoaWxkQ3Jvc3NTaXplTGVuZ3RoKTsKICAgICAg
ICAgZWxzZQogICAgICAgICAgICAgY29udGVudFNpemUgPSBjb21wdXRlTWFpbkF4aXNFeHRlbnRG
b3JDaGlsZChjaGlsZCwgTWluU2l6ZSwgTGVuZ3RoKExlbmd0aFR5cGU6Ok1pbkNvbnRlbnQpKS52
YWx1ZU9yKDApOwpAQCAtMTIyMCwyMCArMTIzNywxNyBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhp
YmxlQm94OjphZGp1c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgoY29uc3QgUmVuZGVyQm94JiBjaGls
ZAogICAgICAgICAgICAgTGF5b3V0VW5pdCByZXNvbHZlZE1haW5TaXplID0gY29tcHV0ZU1haW5B
eGlzRXh0ZW50Rm9yQ2hpbGQoY2hpbGQsIE1haW5PclByZWZlcnJlZFNpemUsIG1haW5TaXplKS52
YWx1ZU9yKDApOwogICAgICAgICAgICAgQVNTRVJUKHJlc29sdmVkTWFpblNpemUgPj0gMCk7CiAg
ICAgICAgICAgICBMYXlvdXRVbml0IHNwZWNpZmllZFNpemUgPSBzdGQ6Om1pbihyZXNvbHZlZE1h
aW5TaXplLCBtYXhFeHRlbnQudmFsdWVPcihyZXNvbHZlZE1haW5TaXplKSk7Ci0gICAgICAgICAg
ICByZXR1cm4gc3RkOjptYXgoY2hpbGRTaXplLCBzdGQ6Om1pbihzcGVjaWZpZWRTaXplLCBjb250
ZW50U2l6ZSkpOwotICAgICAgICB9Ci0KLSAgICAgICAgaWYgKHVzZUNoaWxkQXNwZWN0UmF0aW8o
Y2hpbGQpIHx8IGNoaWxkQ3Jvc3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NTaXplKGNoaWxk
KSkgewotICAgICAgICAgICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gdHJhbnNmZXJyZWRTaXplID0g
Y29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoY2hpbGQsIGNoaWxkQ3Jvc3NTaXpl
TGVuZ3RoKTsKLSAgICAgICAgICAgIGlmICh0cmFuc2ZlcnJlZFNpemUpIHsKLSAgICAgICAgICAg
ICAgICB0cmFuc2ZlcnJlZFNpemUgPSBhZGp1c3RDaGlsZFNpemVGb3JBc3BlY3RSYXRpb0Nyb3Nz
QXhpc01pbkFuZE1heChjaGlsZCwgdHJhbnNmZXJyZWRTaXplLnZhbHVlKCkpOwotICAgICAgICAg
ICAgICAgIHJldHVybiBzdGQ6Om1heChjaGlsZFNpemUsIHN0ZDo6bWluKHRyYW5zZmVycmVkU2l6
ZS52YWx1ZSgpLCBjb250ZW50U2l6ZSkpOwotICAgICAgICAgICAgfQotICAgICAgICB9Ci0KLSAg
ICAgICAgcmV0dXJuIHN0ZDo6bWF4KGNoaWxkU2l6ZSwgY29udGVudFNpemUpOworICAgICAgICAg
ICAgY2hpbGRTaXplID0gc3RkOjptYXgoY2hpbGRTaXplLCBzdGQ6Om1pbihzcGVjaWZpZWRTaXpl
LCBjb250ZW50U2l6ZSkpOworICAgICAgICB9IGVsc2UgaWYgKHVzZUNoaWxkQXNwZWN0UmF0aW8o
Y2hpbGQpIHx8IHdpbGxDaGlsZENyb3NzU2l6ZUJlQ29udGFpbmVyQ3Jvc3NTaXplKGNoaWxkKSkg
eworICAgICAgICAgICAgTGF5b3V0VW5pdCB0cmFuc2ZlcnJlZFNpemUgPSBjb21wdXRlTWFpblNp
emVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjaGlsZCwgY2hpbGRDcm9zc1NpemVMZW5ndGgpOworICAg
ICAgICAgICAgdHJhbnNmZXJyZWRTaXplID0gYWRqdXN0Q2hpbGRTaXplRm9yQXNwZWN0UmF0aW9D
cm9zc0F4aXNNaW5BbmRNYXgoY2hpbGQsIHRyYW5zZmVycmVkU2l6ZSk7CisgICAgICAgICAgICBj
aGlsZFNpemUgPSBzdGQ6Om1heChjaGlsZFNpemUsIHN0ZDo6bWluKHRyYW5zZmVycmVkU2l6ZSwg
Y29udGVudFNpemUpKTsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICBjaGlsZFNpemUgPSBz
dGQ6Om1heChjaGlsZFNpemUsIGNvbnRlbnRTaXplKTsKICAgICB9Ci0KKyAgICBMZW5ndGggY3Jv
c3NNaW4gPSBjcm9zc1NpemVMZW5ndGhGb3JDaGlsZChNaW5TaXplLCBjaGlsZCk7CisgICAgaWYg
KGNoaWxkLnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSAmJiAhY2hpbGRNYWluU2l6ZUlzRGVmaW5p
dGUoY2hpbGQsIGZsZXhCYXNpc0ZvckNoaWxkKGNoaWxkKSkgJiYgY2hpbGRDcm9zc1NpemVJc0Rl
ZmluaXRlKGNoaWxkLCBjcm9zc01pbikpCisgICAgICAgIHJldHVybiBzdGQ6Om1heChjaGlsZFNp
emUsIGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNoaWxkLCBjcm9zc01pbikp
OwogICAgIHJldHVybiBzdGQ6Om1heCgwX2x1LCBjaGlsZFNpemUpOwogfQogICAgIApkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmggYi9Tb3Vy
Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaAppbmRleCA2ODBkY2Q3YzAz
ODA0NzJiNDk5YWQ3NDRkZWEyMWQ2OGM3ZjRlOTQ5Li5iMTczZTJiYTVlMGE2YTYwZjU3OWY5OGNm
N2NjOTNhYmQ2MTM2NDc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu
ZGVyRmxleGlibGVCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxl
eGlibGVCb3guaApAQCAtMTQyLDYgKzE0Miw3IEBAIHByaXZhdGU6CiAgICAgTGF5b3V0VW5pdCBj
cm9zc0F4aXNTY3JvbGxiYXJFeHRlbnQoKSBjb25zdDsKICAgICBMYXlvdXRVbml0IGNyb3NzQXhp
c1Njcm9sbGJhckV4dGVudEZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0Owog
ICAgIExheW91dFBvaW50IGZsb3dBd2FyZUxvY2F0aW9uRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94
JiBjaGlsZCkgY29uc3Q7CisgICAgYm9vbCB3aWxsQ2hpbGRDcm9zc1NpemVCZUNvbnRhaW5lckNy
b3NzU2l6ZShjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdDsKICAgICBib29sIHVzZUNoaWxk
QXNwZWN0UmF0aW8oY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3Q7CiAgICAgYm9vbCBjaGls
ZENyb3NzU2l6ZVNob3VsZFVzZUNvbnRhaW5lckNyb3NzU2l6ZShjb25zdCBSZW5kZXJCb3gmIGNo
aWxkKSBjb25zdDsKICAgICBMYXlvdXRVbml0IGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRp
b1VzaW5nKGNvbnN0IFJlbmRlckJveCYgY2hpbGQsIExlbmd0aCBjcm9zc1NpemVMZW5ndGgpIGNv
bnN0OwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh
bmdlTG9nCmluZGV4IGQ0NmVlNGRjNGJmOTU5Y2FmMTU1ZjEzZWNkYjgwOTU5NWMxZTgyYjIuLmQx
MWZjMjgyY2ViYmRkYmJkOGMyOGIxMTUxYjlkYmE5ZTM2YzYzOGIgMTAwNjQ0Ci0tLSBhL0xheW91
dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx
NCBAQAorMjAyMS0wMy0wNyAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAg
IFN1cHBvcnQgYXNwZWN0LXJhdGlvIGluIGludHJpbnNpYyBzaXppbmcKKyAgICAgICAgaHR0cHM6
Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDg2MQorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuYWJsZSB0ZXN0cyB0aGF0IHBhc3Mg
bm93LgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0wMy0wNiAgWmFsYW4g
QnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIE9ubHkgcG9zaXRpdmUgaW50ZWdl
cnMgYXJlIGFsbG93ZWQgYXMgdmFsdWVzIG9mIG9ycGhhbnMgYW5kIHdpZG93cwpkaWZmIC0tZ2l0
IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3Rh
dGlvbnMKaW5kZXggNDRkMDk1YzkwNDNiMGE0YTY5MTE5M2Q5NjNiYmQwMTM3ZGNiNTAyZC4uNDkz
ZmJiYjg4MmFkOWMzMDM4MDc4NDU4MjkzMGIxM2FhYzgyNTU5YyAxMDA2NDQKLS0tIGEvTGF5b3V0
VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25z
CkBAIC00MDU2LDcgKzQwNTYsNiBAQCB3ZWJraXQub3JnL2IvMjIxNDgwIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2ZsZXhib3gtYnJlYQogIyBtaW4tc2l6
ZTphdXRvIGluIGZsZXhib3guCiB3ZWJraXQub3JnL2IvMjIxNDgxIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2ZsZXgtbWluaW11bS1oZWlnaHQtZmxleC1p
dGVtcy0wMjYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIyMTQ4MSBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9mbGV4LW1pbmlt
dW0taGVpZ2h0LWZsZXgtaXRlbXMtMDI5Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtp
dC5vcmcvYi8yMjE0ODEgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZs
ZXhib3gvZmxleC1taW5pbXVtLXdpZHRoLWZsZXgtaXRlbXMtMDE1Lmh0bWwgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KIAogIyB2aXNpYmlsaXR5OmNvbGxhcHNlIGluIGZsZXggaXRlbXMuCiB3ZWJraXQu
b3JnL2IvMjIxNDgyIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4
Ym94L2ZsZXhib3gtY29sbGFwc2VkLWl0ZW0tYmFzZWxpbmUtMDAxLmh0bWwgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KQEAgLTQ1NTAsMjkgKzQ1NDksMTUgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zaGFkb3ctZGlyZWMK
IHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXNjb3Bpbmcvc2hhZG93LWRpcmVjdGlvbmFsaXR5LTAwMi50ZW50YXRpdmUuaHRtbCBbIElt
YWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zbG90dGVkLXBsYWNlaG9sZGVyLmh0bWwgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KIAorIyAgY29udGFpbi1pbnRyaW5zaWMtc2l6ZQogd2Via2l0Lm9y
Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n
L2FzcGVjdC1yYXRpby9hYnNwb3MtMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtp
dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp
emluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyNC5odG1sIFsgSW1hZ2VPbmx5
RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMjgu
aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogIyBmbGV4LWJhc2lzOmNvbnRlbnQKIHdlYmtpdC5v
cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu
Zy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDIxLmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDIyLmh0bWwg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3Qt
cmF0aW8tMDI1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMg
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0
aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtp
dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp
emluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE1Lmh0bWwgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE2Lmh0
bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3Bl
Y3QtcmF0aW8tMDE3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0
NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt
cmF0aW8vaW50cmluc2ljLXNpemUtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtp
dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp
emluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDA0Lmh0bWwgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUt
MDA1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50
cmluc2ljLXNpemUtMDA2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8y
MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl
Y3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDA4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdl
YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDEwLmh0bWwgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDExLmh0bWwg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNp
emUtMDEyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v
aW50cmluc2ljLXNpemUtMDEzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcv
Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h
c3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
LXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDE1Lmh0bWwgWyBJbWFnZU9u
bHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vdGFibGUtZWxlbWVudC0wMDEuaHRt
bCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2NvbnRhaW4taW50cmluc2ljLXNpemUv
Y29udGFpbi1pbnRyaW5zaWMtc2l6ZS0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Vi
a2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
c2l6aW5nL2NvbnRhaW4taW50cmluc2ljLXNpemUvY29udGFpbi1pbnRyaW5zaWMtc2l6ZS0wMDIu
aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxl
eC1hc3BlY3QtcmF0aW8tMDI3LWV4cGVjdGVkLnhodCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNw
ZWN0LXJhdGlvLTAyNy1leHBlY3RlZC54aHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMDVhMTM3OTQ0ODJhOTRmNmMx
MGJkOWQ0Yzk4NzA0ZTYzZWY2MDMzMQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2lt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv
L2ZsZXgtYXNwZWN0LXJhdGlvLTAyNy1leHBlY3RlZC54aHQKQEAgLTAsMCArMSwxOSBAQAorPCFE
T0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBYSFRNTCAxLjAgU3RyaWN0Ly9FTiIgImh0
dHA6Ly93d3cudzMub3JnL1RSL3hodG1sMS9EVEQveGh0bWwxLXN0cmljdC5kdGQiPgorPGh0bWwg
eG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGh0bWwiPgorIDxoZWFkPgorICA8dGl0bGU+
Q1NTIFJlZnRlc3QgUmVmZXJlbmNlPC90aXRsZT4KKyAgPGxpbmsgcmVsPSJhdXRob3IiIHRpdGxl
PSJHw6lyYXJkIFRhbGJvdCIgaHJlZj0iaHR0cDovL3d3dy5ndGFsYm90Lm9yZy9Ccm93c2VyQnVn
c1NlY3Rpb24vY3NzMjF0ZXN0c3VpdGUvIiAvPgorICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPjwh
W0NEQVRBWworICBkaXYKKyAgeworICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgaGVpZ2h0
OiAxMDBweDsKKyAgd2lkdGg6IDEwMHB4OworICB9CisgIF1dPjwvc3R5bGU+CisgPC9oZWFkPgor
IDxib2R5PgorICA8cD5UZXN0IHBhc3NlcyBpZiB0aGVyZSBpcyBhIGZpbGxlZCBncmVlbiBzcXVh
cmUgYW5kIDxzdHJvbmc+bm8gcmVkPC9zdHJvbmc+LjwvcD4KKyAgPGRpdj48L2Rpdj4KKyA8L2Jv
ZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRp
by0wMjcuaHRtbCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNy5odG1sCm5l
dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAuLmMxMGYxZjNmNzA0OGJjODkxZWM4ZDczYTcwMzQyYTk5NDIxM2I1NjUKLS0tIC9k
ZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjcuaHRtbApA
QCAtMCwwICsxLDE2IEBACis8IURPQ1RZUEUgaHRtbD4KKzx0aXRsZT5DU1MgYXNwZWN0LXJhdGlv
OiBSb3cgZmxleGJveCBhbmQgdHJhbnNmZXJyZWQgbWluL21heC1zaXplPC90aXRsZT4KKzxsaW5r
IHJlbD0iYXV0aG9yIiB0aXRsZT0iR29vZ2xlIExMQyIgaHJlZj0iaHR0cHM6Ly93d3cuZ29vZ2xl
LmNvbS8iPgorPGxpbmsgcmVsPSJoZWxwIiBocmVmPSJodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcv
Y3NzLXNpemluZy00LyNhc3BlY3QtcmF0aW8iPgorPGxpbmsgcmVsPSJtYXRjaCIgaHJlZj0iLi4v
Li4vcmVmZXJlbmNlL3JlZi1maWxsZWQtZ3JlZW4tMTAwcHgtc3F1YXJlLnhodCIgLz4KKworPHA+
VGVzdCBwYXNzZXMgaWYgdGhlcmUgaXMgYSBmaWxsZWQgZ3JlZW4gc3F1YXJlIGFuZCA8c3Ryb25n
Pm5vIHJlZDwvc3Ryb25nPi48L3A+CisKKzxkaXYgc3R5bGU9ImRpc3BsYXk6IGZsZXg7IGZsZXgt
ZGlyZWN0aW9uOiByb3c7Ij4KKyAgPGRpdiBzdHlsZT0iYmFja2dyb3VuZDogZ3JlZW47IHdpZHRo
OiA0MHB4OyBoZWlnaHQ6IDUwcHg7IiA+PC9kaXY+CisgIDxkaXYgc3R5bGU9ImJhY2tncm91bmQ6
IGdyZWVuOyB3aWR0aDogNjBweDsgbWF4LWhlaWdodDogNTBweDsgYXNwZWN0LXJhdGlvOiAxLzE7
Ij48L2Rpdj4KKzwvZGl2PgorPGRpdiBzdHlsZT0iZGlzcGxheTogZmxleDsgZmxleC1kaXJlY3Rp
b246IHJvdzsiPgorICA8ZGl2IHN0eWxlPSJiYWNrZ3JvdW5kOiBncmVlbjsgd2lkdGg6IDQwcHg7
IGhlaWdodDogNTBweDsiID48L2Rpdj4KKyAgPGRpdiBzdHlsZT0iYmFja2dyb3VuZDogZ3JlZW47
IHdpZHRoOiA2MHB4OyBoZWlnaHQ6IDYwcHg7IG1heC1oZWlnaHQ6IDUwcHg7IGFzcGVjdC1yYXRp
bzogMS8xOyI+PC9kaXY+Cis8L2Rpdj4K
</data>
<flag name="commit-queue"
          id="441633"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>422525</attachid>
            <date>2021-03-07 05:16:08 -0800</date>
            <delta_ts>2021-03-08 06:34:39 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210307141607.patch</filename>
            <type>text/plain</type>
            <size>27902</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MDUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjI4OTQ5Y2FiYmNjZmE0
YzNlY2M0ZGFhODE3ZTJkNzRlNGZiMTFkMC4uNzQyNzQ1N2NjNDJiYTU2ZmNhM2RmZjVmNmQxY2Q1
ZTIzOTQ5ZDg3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAzLTA3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBXSVAuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OndpbGxDaGlsZENyb3NzU2l6ZUJl
Q29udGFpbmVyQ3Jvc3NTaXplIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhp
YmxlQm94Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyBjb25zdCk6CisgICAg
ICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94Lmg6CisKIDIwMjEtMDMtMDYgIFphbGFu
IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBPbmx5IHBvc2l0aXZlIGludGVn
ZXJzIGFyZSBhbGxvd2VkIGFzIHZhbHVlcyBvZiBvcnBoYW5zIGFuZCB3aWRvd3MKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XVEYvU2NyaXB0cy9QcmVmZXJlbmNlcy9XZWJQcmVmZXJlbmNlc0V4cGVyaW1l
bnRhbC55YW1sIGIvU291cmNlL1dURi9TY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2Vz
RXhwZXJpbWVudGFsLnlhbWwKaW5kZXggNGIwMDQ0NzdmZTU1MThiZjJmNjJjYjQ5NzAyMzAzNDcz
NjI1YmUxZC4uNzQyYjY1MGNjNzRmNjgyZDVhZTRkNTJhZmViMWQwZDc5ZjAyMTgyZSAxMDA2NDQK
LS0tIGEvU291cmNlL1dURi9TY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzRXhwZXJp
bWVudGFsLnlhbWwKKysrIGIvU291cmNlL1dURi9TY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZl
cmVuY2VzRXhwZXJpbWVudGFsLnlhbWwKQEAgLTQzLDExICs0MywxMSBAQCBBc3BlY3RSYXRpb0Vu
YWJsZWQ6CiAgIGh1bWFuUmVhZGFibGVEZXNjcmlwdGlvbjogIkVuYWJsZSBhc3BlY3QtcmF0aW8g
Q1NTIHByb3BlcnR5IgogICBkZWZhdWx0VmFsdWU6CiAgICAgV2ViS2l0TGVnYWN5OgotICAgICAg
ZGVmYXVsdDogZmFsc2UKKyAgICAgIGRlZmF1bHQ6IHRydWUKICAgICBXZWJLaXQ6Ci0gICAgICBk
ZWZhdWx0OiBmYWxzZQorICAgICAgZGVmYXVsdDogdHJ1ZQogICAgIFdlYkNvcmU6Ci0gICAgICBk
ZWZhdWx0OiBmYWxzZQorICAgICAgZGVmYXVsdDogdHJ1ZQogCiAjIEZJWE1FOiBUaGlzIGlzIG9u
IGJ5IGRlZmF1bHQgaW4gV2ViS2l0Mi4gUGVyaGFwcyB3ZSBzaG91bGQgY29uc2lkZXIgdHVybmlu
ZyBpdCBvbiBmb3IgV2ViS2l0TGVnYWN5IGFzIHdlbGwuCiBBc3BlY3RSYXRpb09mSW1nRnJvbVdp
ZHRoQW5kSGVpZ2h0RW5hYmxlZDoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu
Zy9SZW5kZXJCbG9jay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2su
Y3BwCmluZGV4IGMwNDc5ODdmYjllNDYzZGIwYmVjY2YyMTc2ZTViNmE5ODhlZDNlOWMuLjQ2YjVj
NjlmZDRkNDliZDkwZDZkNTNkODg4N2Q5ZDg5YjNhNDBlNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL1JlbmRlckJsb2NrLmNwcApAQCAtMjI4Miw2ICsyMjgyLDggQEAgdm9pZCBSZW5kZXJC
bG9jazo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoKQogICAgIGlmICghaXNUYWJsZUNl
bGwoKSAmJiBzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLmlzRml4ZWQoKSAmJiBzdHlsZVRvVXNl
LmxvZ2ljYWxXaWR0aCgpLnZhbHVlKCkgPj0gMAogICAgICAgICAmJiAhKGlzRGVwcmVjYXRlZEZs
ZXhJdGVtKCkgJiYgIXN0eWxlVG9Vc2UubG9naWNhbFdpZHRoKCkuaW50VmFsdWUoKSkpCiAgICAg
ICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoID0gbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lk
dGggPSBhZGp1c3RDb250ZW50Qm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKHN0eWxlVG9Vc2Uu
bG9naWNhbFdpZHRoKCkpOworICAgIGVsc2UgaWYgKHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhG
cm9tQXNwZWN0UmF0aW8oKSkKKyAgICAgICAgbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBt
X21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IGNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0
UmF0aW8oKTsKICAgICBlbHNlCiAgICAgICAgIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhz
KG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoLCBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCk7
CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIv
U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggZjU4MmI1NjdhZGFl
OTBjZDRkNGEwY2VmMmM5YjhkNjExYjMwMjgzMy4uNjJhM2QzZmJmNzkyYzA4MjUwYzg4NmJhNTM4
ZjcwZjRhMzI1MjIyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl
ckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAg
LTY1MSw3ICs2NTEsNyBAQCB2b2lkIFJlbmRlckJveDo6dXBkYXRlTGF5ZXJUcmFuc2Zvcm0oKQog
ICAgICAgICBsYXllcigpLT51cGRhdGVUcmFuc2Zvcm0oKTsKIH0KIAotTGF5b3V0VW5pdCBSZW5k
ZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChMYXlvdXRVbml0
IGxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCwgUmVuZGVyQmxvY2smIGNi
LCBSZW5kZXJGcmFnbWVudENvbnRhaW5lciogZnJhZ21lbnQpIGNvbnN0CitMYXlvdXRVbml0IFJl
bmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KExheW91dFVu
aXQgbG9naWNhbFdpZHRoLCBMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoLCBSZW5kZXJCbG9jayYg
Y2IsIFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiBmcmFnbWVudCwgYm9vbCBhbGxvd0ludHJpbnNp
YykgY29uc3QKIHsKICAgICBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGVUb1VzZSA9IHN0eWxlKCk7
CiAKQEAgLTY2MCwxMyArNjYwLDE1IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb25zdHJhaW5M
b2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgoTGF5b3V0VW5pdCBsb2dpY2FsCiAgICAgICAg
IGxvZ2ljYWxXaWR0aCA9IHN0ZDo6Y2xhbXAobG9naWNhbFdpZHRoLCBsb2dpY2FsTWluV2lkdGgs
IGxvZ2ljYWxNYXhXaWR0aCk7CiAgICAgfQogCi0gICAgaWYgKCFzdHlsZVRvVXNlLmxvZ2ljYWxN
YXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkpCisgICAgaWYgKCFzdHlsZVRvVXNlLmxvZ2ljYWxNYXhX
aWR0aCgpLmlzVW5kZWZpbmVkKCkgJiYgKGFsbG93SW50cmluc2ljIHx8ICFzdHlsZVRvVXNlLmxv
Z2ljYWxNYXhXaWR0aCgpLmlzSW50cmluc2ljKCkpKQogICAgICAgICBsb2dpY2FsV2lkdGggPSBz
dGQ6Om1pbihsb2dpY2FsV2lkdGgsIGNvbXB1dGVMb2dpY2FsV2lkdGhJbkZyYWdtZW50VXNpbmco
TWF4U2l6ZSwgc3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lkdGgoKSwgYXZhaWxhYmxlV2lkdGgsIGNi
LCBmcmFnbWVudCkpOworICAgIGlmICghYWxsb3dJbnRyaW5zaWMgJiYgc3R5bGVUb1VzZS5sb2dp
Y2FsTWluV2lkdGgoKS5pc0ludHJpbnNpYygpKQorICAgICAgICByZXR1cm4gbG9naWNhbFdpZHRo
OwogICAgIGF1dG8gbWluTGVuZ3RoID0gc3R5bGVUb1VzZS5sb2dpY2FsTWluV2lkdGgoKTsKLSAg
ICBpZiAoc3R5bGVUb1VzZS5oYXNBc3BlY3RSYXRpbygpICYmIHN0eWxlVG9Vc2UubG9naWNhbFdp
ZHRoKCkuaXNBdXRvKCkgJiYgbWluTGVuZ3RoLmlzQXV0bygpICYmIHN0eWxlVG9Vc2Uub3ZlcmZs
b3dJbmxpbmVEaXJlY3Rpb24oKSA9PSBPdmVyZmxvdzo6VmlzaWJsZSkgeworICAgIGlmIChzdHls
ZVRvVXNlLmhhc0FzcGVjdFJhdGlvKCkgJiYgbWluTGVuZ3RoLmlzQXV0bygpICYmIChzdHlsZVRv
VXNlLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpIHx8IHN0eWxlVG9Vc2UubG9naWNhbFdpZHRoKCku
aXNNaW5Db250ZW50KCkgfHwgc3R5bGVUb1VzZS5sb2dpY2FsV2lkdGgoKS5pc01heENvbnRlbnQo
KSkgJiYgc3R5bGVUb1VzZS5vdmVyZmxvd0lubGluZURpcmVjdGlvbigpID09IE92ZXJmbG93OjpW
aXNpYmxlKSB7CiAgICAgICAgIC8vIE1ha2Ugc3VyZSB3ZSBhY3R1YWxseSB1c2VkIHRoZSBhc3Bl
Y3QgcmF0aW8uCiAgICAgICAgIGlmIChzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVj
dFJhdGlvKCkpCi0gICAgICAgICAgICBtaW5MZW5ndGggPSBMZW5ndGgoTGVuZ3RoVHlwZTo6TWlu
Q29udGVudCk7CisgICAgICAgICAgICBtaW5MZW5ndGggPSBMZW5ndGgoTGVuZ3RoVHlwZTo6TWlu
SW50cmluc2ljKTsKICAgICB9CiAgICAgcmV0dXJuIHN0ZDo6bWF4KGxvZ2ljYWxXaWR0aCwgY29t
cHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyhNaW5TaXplLCBtaW5MZW5ndGgsIGF2YWls
YWJsZVdpZHRoLCBjYiwgZnJhZ21lbnQpKTsKIH0KQEAgLTI2MTIsOSArMjYxNCwxMiBAQCBMYXlv
dXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aFVzaW5nKExlbmd0
aCBsb2dpY2FsV2lkdGhMZW5ndAogCiAgICAgTGF5b3V0VW5pdCBtaW5Mb2dpY2FsV2lkdGg7CiAg
ICAgTGF5b3V0VW5pdCBtYXhMb2dpY2FsV2lkdGg7Ci0gICAgY29tcHV0ZUludHJpbnNpY0xvZ2lj
YWxXaWR0aHMobWluTG9naWNhbFdpZHRoLCBtYXhMb2dpY2FsV2lkdGgpOworICAgIGlmICghbG9n
aWNhbFdpZHRoTGVuZ3RoLmlzTWluSW50cmluc2ljKCkgJiYgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxX
aWR0aEZyb21Bc3BlY3RSYXRpbygpKQorICAgICAgICBtaW5Mb2dpY2FsV2lkdGggPSBtYXhMb2dp
Y2FsV2lkdGggPSBjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCk7CisgICAgZWxz
ZQorICAgICAgICBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhtaW5Mb2dpY2FsV2lkdGgs
IG1heExvZ2ljYWxXaWR0aCk7CiAKLSAgICBpZiAobG9naWNhbFdpZHRoTGVuZ3RoLmlzTWluQ29u
dGVudCgpKQorICAgIGlmIChsb2dpY2FsV2lkdGhMZW5ndGguaXNNaW5Db250ZW50KCkgfHwgbG9n
aWNhbFdpZHRoTGVuZ3RoLmlzTWluSW50cmluc2ljKCkpCiAgICAgICAgIHJldHVybiBtaW5Mb2dp
Y2FsV2lkdGggKyBib3JkZXJBbmRQYWRkaW5nOwogCiAgICAgaWYgKGxvZ2ljYWxXaWR0aExlbmd0
aC5pc01heENvbnRlbnQoKSkKQEAgLTI2NDIsNyArMjY0Nyw3IEBAIExheW91dFVuaXQgUmVuZGVy
Qm94Ojpjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFnbWVudFVzaW5nKFNpemVUeXBlIHdpZHRoVHlw
ZSwgTGVuCiAgICAgICAgIHJldHVybiBhZGp1c3RCb3JkZXJCb3hMb2dpY2FsV2lkdGhGb3JCb3hT
aXppbmcodmFsdWVGb3JMZW5ndGgobG9naWNhbFdpZHRoLCBhdmFpbGFibGVMb2dpY2FsV2lkdGgp
LCBsb2dpY2FsV2lkdGgudHlwZSgpKTsKICAgICB9CiAKLSAgICBpZiAobG9naWNhbFdpZHRoLmlz
SW50cmluc2ljKCkpCisgICAgaWYgKGxvZ2ljYWxXaWR0aC5pc0ludHJpbnNpYygpIHx8IGxvZ2lj
YWxXaWR0aC5pc01pbkludHJpbnNpYygpKQogICAgICAgICByZXR1cm4gY29tcHV0ZUludHJpbnNp
Y0xvZ2ljYWxXaWR0aFVzaW5nKGxvZ2ljYWxXaWR0aCwgYXZhaWxhYmxlTG9naWNhbFdpZHRoLCBi
b3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoKCkpOwogCiAgICAgTGF5b3V0VW5pdCBtYXJnaW5T
dGFydDsKQEAgLTUwOTgsNyArNTEwMyw3IEBAIGJvb2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRl
TG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0CiAgICAgICAgIHJldHVybiBmYWxz
ZTsKIAogICAgIGF1dG8gaCA9IHN0eWxlKCkubG9naWNhbEhlaWdodCgpOwotICAgIHJldHVybiBo
LmlzQXV0bygpIHx8ICghaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgJiYgaC5pc1BlcmNlbnRPckNh
bGN1bGF0ZWQoKSAmJiAhcGVyY2VudGFnZUxvZ2ljYWxIZWlnaHRJc1Jlc29sdmFibGUoKSk7Cisg
ICAgcmV0dXJuIGguaXNBdXRvKCkgfHwgaC5pc0ludHJpbnNpYygpIHx8ICghaXNPdXRPZkZsb3dQ
b3NpdGlvbmVkKCkgJiYgaC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSAmJiAhcGVyY2VudGFnZUxv
Z2ljYWxIZWlnaHRJc1Jlc29sdmFibGUoKSk7CiB9CiAKIGJvb2wgUmVuZGVyQm94OjpzaG91bGRD
b21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkgY29uc3QKQEAgLTUxMzQsNyArNTEz
OSw3IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVj
dFJhdGlvKFJlbmRlckZyYWdtZW50Q29udGFpbmVyCiAgICAgYXV0byBsb2dpY2FsV2lkdGggPSBp
bmxpbmVTaXplRnJvbUFzcGVjdFJhdGlvKGhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50
KCksIHZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpLCBMYXlvdXRVbml0KHN0eWxlKCku
bG9naWNhbEFzcGVjdFJhdGlvKCkpLCBzdHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJhdGlvKCks
IGxvZ2ljYWxIZWlnaHRmb3JBc3BlY3RSYXRpbyk7CiAKICAgICBMYXlvdXRVbml0IGNvbnRhaW5l
cldpZHRoSW5JbmxpbmVEaXJlY3Rpb24gPSBzdGQ6Om1heDxMYXlvdXRVbml0PigwLCBjb250YWlu
aW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JDb250ZW50SW5GcmFnbWVudChmcmFnbWVudCkpOwotICAg
IHJldHVybiBjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgobG9naWNhbFdp
ZHRoLCBjb250YWluZXJXaWR0aEluSW5saW5lRGlyZWN0aW9uLCAqY29udGFpbmluZ0Jsb2NrKCks
IGZyYWdtZW50KTsKKyAgICByZXR1cm4gY29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5
TWluTWF4KGxvZ2ljYWxXaWR0aCwgY29udGFpbmVyV2lkdGhJbklubGluZURpcmVjdGlvbiwgKmNv
bnRhaW5pbmdCbG9jaygpLCBmcmFnbWVudCwgZmFsc2UpOwogfQogCiBzdGQ6OnBhaXI8TGF5b3V0
VW5pdCwgTGF5b3V0VW5pdD4gUmVuZGVyQm94Ojpjb21wdXRlTWluTWF4TG9naWNhbFdpZHRoRnJv
bUFzcGVjdFJhdGlvKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu
Zy9SZW5kZXJCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAppbmRl
eCA2ZGU2ZWQ2YWM2Yjk2ODhmY2IzNjQ4ZGJiNGIyZWM5YTA5YmIxNDI0Li44MGEzYjg5MzFiZTM0
YmIxMDE1MDEyYzUzY2RhN2Q5NDMzOGMxMzI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y
ZW5kZXJpbmcvUmVuZGVyQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl
ckJveC5oCkBAIC04NSw3ICs4NSw3IEBAIHB1YmxpYzoKICAgICBMYXlvdXRVbml0IGxvZ2ljYWxX
aWR0aCgpIGNvbnN0IHsgcmV0dXJuIHN0eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/
IHdpZHRoKCkgOiBoZWlnaHQoKTsgfQogICAgIExheW91dFVuaXQgbG9naWNhbEhlaWdodCgpIGNv
bnN0IHsgcmV0dXJuIHN0eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGhlaWdodCgp
IDogd2lkdGgoKTsgfQogCi0gICAgTGF5b3V0VW5pdCBjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZy
YWdtZW50QnlNaW5NYXgoTGF5b3V0VW5pdCwgTGF5b3V0VW5pdCwgUmVuZGVyQmxvY2smLCBSZW5k
ZXJGcmFnbWVudENvbnRhaW5lciogPSBudWxscHRyKSBjb25zdDsKKyAgICBMYXlvdXRVbml0IGNv
bnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChMYXlvdXRVbml0LCBMYXlvdXRV
bml0LCBSZW5kZXJCbG9jayYsIFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiwgYm9vbCBhbGxvd0lu
dHJpbnNpYyA9IHRydWUpIGNvbnN0OwogICAgIExheW91dFVuaXQgY29uc3RyYWluTG9naWNhbEhl
aWdodEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgT3B0aW9uYWw8TGF5b3V0VW5p
dD4gaW50cmluc2ljQ29udGVudEhlaWdodCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBjb25zdHJh
aW5Db250ZW50Qm94TG9naWNhbEhlaWdodEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbEhlaWdo
dCwgT3B0aW9uYWw8TGF5b3V0VW5pdD4gaW50cmluc2ljQ29udGVudEhlaWdodCkgY29uc3Q7CiAK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5j
cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4
IDliYzYzNjI2MzlmZTEyZDVmNDkyMGVkODdjMjZhNTllYTU0ZWMwZjEuLjhkZGU2Mjk0ZmQwNzhm
NWFiNzE2MzU5NTliZDVlMTVkYTE2MjJhNzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl
bmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy
aW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtNzg1LDE0ICs3ODUsMjMgQEAgYm9vbCBSZW5k
ZXJGbGV4aWJsZUJveDo6dXNlQ2hpbGRBc3BlY3RSYXRpbyhjb25zdCBSZW5kZXJCb3gmIGNoaWxk
KSBjb25zdAogICAgIHJldHVybiBjaGlsZENyb3NzU2l6ZUlzRGVmaW5pdGUoY2hpbGQsIGNyb3Nz
U2l6ZUxlbmd0aEZvckNoaWxkKE1haW5PclByZWZlcnJlZFNpemUsIGNoaWxkKSk7CiB9CiAKK2Jv
b2wgUmVuZGVyRmxleGlibGVCb3g6OndpbGxDaGlsZENyb3NzU2l6ZUJlQ29udGFpbmVyQ3Jvc3NT
aXplKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0Cit7CisgICAgaWYgKCFjaGlsZEhhc0Fz
cGVjdFJhdGlvKGNoaWxkKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmICghY2hpbGQu
aW50cmluc2ljU2l6ZSgpLmhlaWdodCgpICYmICFjaGlsZC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlv
KCkpIHsKKyAgICAgICAgLy8gV2UgY2FuJ3QgY29tcHV0ZSBhIHJhdGlvIGluIHRoaXMgY2FzZS4K
KyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKyAgICBjb25zdCBMZW5ndGgmIGNyb3NzU2l6
ZUxlbmd0aCA9IGlzSG9yaXpvbnRhbEZsb3coKSA/IGNoaWxkLnN0eWxlKCkuaGVpZ2h0KCkgOiBj
aGlsZC5zdHlsZSgpLndpZHRoKCk7CisgICAgcmV0dXJuICFpc011bHRpbGluZSgpICYmIGNoaWxk
Q3Jvc3NTaXplSXNEZWZpbml0ZShjaGlsZCwgTGVuZ3RoKDEwMCwgTGVuZ3RoVHlwZTo6UGVyY2Vu
dCkpICYmIGFsaWdubWVudEZvckNoaWxkKGNoaWxkKSA9PSBJdGVtUG9zaXRpb246OlN0cmV0Y2gg
JiYgY3Jvc3NTaXplTGVuZ3RoLmlzQXV0bygpICYmICFoYXNBdXRvTWFyZ2luc0luQ3Jvc3NBeGlz
KGNoaWxkKTsKK30KICAgICAKIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVN
YWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJveCYgY2hpbGQsIExlbmd0
aCBjcm9zc1NpemVMZW5ndGgpIGNvbnN0CiB7CiAgICAgQVNTRVJUKGNoaWxkSGFzQXNwZWN0UmF0
aW8oY2hpbGQpKTsKIAotICAgIGF1dG8gYWRqdXN0Rm9yQm94U2l6aW5nID0gW3RoaXNdIChjb25z
dCBSZW5kZXJCb3gmIGJveCwgTGVuZ3RoIGxlbmd0aCkgLT4gTGF5b3V0VW5pdCB7Ci0gICAgICAg
IEFTU0VSVChsZW5ndGguaXNGaXhlZCgpKTsKLSAgICAgICAgYXV0byB2YWx1ZSA9IExheW91dFVu
aXQobGVuZ3RoLnZhbHVlKCkpOworICAgIGF1dG8gYWRqdXN0Rm9yQm94U2l6aW5nID0gW3RoaXNd
IChjb25zdCBSZW5kZXJCb3gmIGJveCwgTGF5b3V0VW5pdCB2YWx1ZSkgLT4gTGF5b3V0VW5pdCB7
CiAgICAgICAgIC8vIFdlIG5lZWQgdG8gc3Vic3RyYWN0IHRoZSBib3JkZXIgYW5kIHBhZGRpbmcg
ZXh0ZW50IGZyb20gdGhlIGNyb3NzIGF4aXMuCiAgICAgICAgIC8vIEZ1cnRoZXJtb3JlLCB0aGUg
c2l6aW5nIGNhbGN1bGF0aW9ucyB0aGF0IGZsb29yIHRoZSBjb250ZW50IGJveCBzaXplIGF0IHpl
cm8gd2hlbiBhcHBseWluZyBib3gtc2l6aW5nIGFyZSBhbHNvIGlnbm9yZWQuCiAgICAgICAgIC8v
IGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZmxleGJveC8jYWxnby1tYWluLWl0ZW0uCkBA
IC04MDEsMzMgKzgxMCwzNiBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRl
TWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjb25zdCBSZW5kZXJCbwogICAgICAgICByZXR1
cm4gdmFsdWU7CiAgICAgfTsKIAorICAgIGlmIChjcm9zc1NpemVMZW5ndGguaXNBdXRvKCkgJiYg
d2lsbENoaWxkQ3Jvc3NTaXplQmVDb250YWluZXJDcm9zc1NpemUoY2hpbGQpKQorICAgICAgICBj
cm9zc1NpemVMZW5ndGggPSBMZW5ndGgoMTAwLCBMZW5ndGhUeXBlOjpQZXJjZW50KTsKKwogICAg
IE9wdGlvbmFsPExheW91dFVuaXQ+IGNyb3NzU2l6ZTsKLSAgICBpZiAoY3Jvc3NTaXplTGVuZ3Ro
LmlzRml4ZWQoKSkKLSAgICAgICAgY3Jvc3NTaXplID0gYWRqdXN0Rm9yQm94U2l6aW5nKGNoaWxk
LCBjcm9zc1NpemVMZW5ndGgpOwotICAgIGVsc2UgaWYgKGNyb3NzU2l6ZUxlbmd0aC5pc0F1dG8o
KSkgewotICAgICAgICBBU1NFUlQoY2hpbGRDcm9zc1NpemVTaG91bGRVc2VDb250YWluZXJDcm9z
c1NpemUoY2hpbGQpKTsKLSAgICAgICAgYXV0byBjb250YWluZXJDcm9zc1NpemVMZW5ndGggPSBp
c0hvcml6b250YWxGbG93KCkgPyBzdHlsZSgpLmhlaWdodCgpIDogc3R5bGUoKS53aWR0aCgpOwot
ICAgICAgICAvLyBLZWVwIHRoaXMgc3luYydlZCB3aXRoIGNoaWxkQ3Jvc3NTaXplU2hvdWxkVXNl
Q29udGFpbmVyQ3Jvc3NTaXplKCkuCi0gICAgICAgIEFTU0VSVChjb250YWluZXJDcm9zc1NpemVM
ZW5ndGguaXNGaXhlZCgpKTsKLSAgICAgICAgY3Jvc3NTaXplID0gdmFsdWVGb3JMZW5ndGgoY29u
dGFpbmVyQ3Jvc3NTaXplTGVuZ3RoLCAtMV9sdSk7CisgICAgaWYgKGNyb3NzU2l6ZUxlbmd0aC5p
c0ZpeGVkKCkpIHsKKyAgICAgICAgY3Jvc3NTaXplID0gTGF5b3V0VW5pdChjcm9zc1NpemVMZW5n
dGgudmFsdWUoKSk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgQVNTRVJUKGNyb3NzU2l6ZUxlbmd0
aC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSk7Ci0gICAgICAgIGNyb3NzU2l6ZSA9IG1haW5BeGlz
SXNDaGlsZElubGluZUF4aXMoY2hpbGQpID8gY2hpbGQuY29tcHV0ZVBlcmNlbnRhZ2VMb2dpY2Fs
SGVpZ2h0KGNyb3NzU2l6ZUxlbmd0aCkgOiBhZGp1c3RCb3JkZXJCb3hMb2dpY2FsV2lkdGhGb3JC
b3hTaXppbmcodmFsdWVGb3JMZW5ndGgoY3Jvc3NTaXplTGVuZ3RoLCBjb250ZW50V2lkdGgoKSks
IGNyb3NzU2l6ZUxlbmd0aC50eXBlKCkpOworICAgICAgICBjcm9zc1NpemUgPSBtYWluQXhpc0lz
Q2hpbGRJbmxpbmVBeGlzKGNoaWxkKSA/IGNoaWxkLmNvbXB1dGVQZXJjZW50YWdlTG9naWNhbEhl
aWdodChjcm9zc1NpemVMZW5ndGgpIDogdmFsdWVGb3JMZW5ndGgoY3Jvc3NTaXplTGVuZ3RoLCBj
b250ZW50V2lkdGgoKSk7CiAgICAgICAgIGlmICghY3Jvc3NTaXplKQogICAgICAgICAgICAgcmV0
dXJuIDBfbHU7CiAgICAgfQogCiAgICAgY29uc3QgTGF5b3V0U2l6ZSYgY2hpbGRJbnRyaW5zaWNT
aXplID0gY2hpbGQuaW50cmluc2ljU2l6ZSgpOwogICAgIGRvdWJsZSByYXRpbzsKLSAgICBpZiAo
Y2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OlJhdGlv
IHx8IChjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6
QXV0b0FuZFJhdGlvICYmIGNoaWxkSW50cmluc2ljU2l6ZS5pc0VtcHR5KCkpKQorICAgIExheW91
dFVuaXQgYm9yZGVyQW5kUGFkZGluZzsKKyAgICBpZiAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRp
b1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OlJhdGlvIHx8IChjaGlsZC5zdHlsZSgpLmFzcGVj
dFJhdGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6QXV0b0FuZFJhdGlvICYmIGNoaWxkSW50
cmluc2ljU2l6ZS5pc0VtcHR5KCkpKSB7CiAgICAgICAgIHJhdGlvID0gY2hpbGQuc3R5bGUoKS5h
c3BlY3RSYXRpb1dpZHRoKCkgLyBjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvSGVpZ2h0KCk7Ci0g
ICAgZWxzZSB7CisgICAgICAgIGlmIChjaGlsZC5zdHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJh
dGlvKCkgPT0gQm94U2l6aW5nOjpDb250ZW50Qm94KQorICAgICAgICAgICAgKmNyb3NzU2l6ZSAt
PSBpc0hvcml6b250YWxGbG93KCkgPyBjaGlsZC52ZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmdFeHRl
bnQoKSA6IGNoaWxkLmhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCk7CisgICAgICAg
IGVsc2UKKyAgICAgICAgICAgIGJvcmRlckFuZFBhZGRpbmcgPSBpc0hvcml6b250YWxGbG93KCkg
PyBjaGlsZC5ob3Jpem9udGFsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpIDogY2hpbGQudmVydGlj
YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCk7CisgICAgfSBlbHNlIHsKICAgICAgICAgQVNTRVJU
KGNoaWxkSW50cmluc2ljU2l6ZS5oZWlnaHQoKSk7CiAgICAgICAgIHJhdGlvID0gY2hpbGRJbnRy
aW5zaWNTaXplLndpZHRoKCkudG9GbG9hdCgpIC8gY2hpbGRJbnRyaW5zaWNTaXplLmhlaWdodCgp
LnRvRmxvYXQoKTsKKyAgICAgICAgKmNyb3NzU2l6ZSA9IGFkanVzdEZvckJveFNpemluZyhjaGls
ZCwgKmNyb3NzU2l6ZSk7CiAgICAgfQogICAgIGlmIChpc0hvcml6b250YWxGbG93KCkpCi0gICAg
ICAgIHJldHVybiBMYXlvdXRVbml0KGNyb3NzU2l6ZS52YWx1ZSgpICogcmF0aW8pOwotICAgIHJl
dHVybiBMYXlvdXRVbml0KGNyb3NzU2l6ZS52YWx1ZSgpIC8gcmF0aW8pOworICAgICAgICByZXR1
cm4gTGF5b3V0VW5pdChjcm9zc1NpemUudmFsdWUoKSAqIHJhdGlvKSAtIGJvcmRlckFuZFBhZGRp
bmc7CisgICAgcmV0dXJuIExheW91dFVuaXQoY3Jvc3NTaXplLnZhbHVlKCkgLyByYXRpbykgLSBi
b3JkZXJBbmRQYWRkaW5nOwogfQogCiB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpzZXRGbG93QXdh
cmVMb2NhdGlvbkZvckNoaWxkKFJlbmRlckJveCYgY2hpbGQsIGNvbnN0IExheW91dFBvaW50JiBs
b2NhdGlvbikKQEAgLTg2MSwyOCArODczLDYgQEAgYm9vbCBSZW5kZXJGbGV4aWJsZUJveDo6Y2hp
bGRNYWluU2l6ZUlzRGVmaW5pdGUoY29uc3QgUmVuZGVyQm94JiBjaGlsZCwgY29uc3QgTGUKICAg
ICByZXR1cm4gdHJ1ZTsKIH0KIAotYm9vbCBSZW5kZXJGbGV4aWJsZUJveDo6Y2hpbGRDcm9zc1Np
emVTaG91bGRVc2VDb250YWluZXJDcm9zc1NpemUoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29u
c3QKLXsKLSAgICBpZiAoIWNoaWxkSGFzQXNwZWN0UmF0aW8oY2hpbGQpKQotICAgICAgICByZXR1
cm4gZmFsc2U7Ci0gICAgaWYgKCFjaGlsZC5pbnRyaW5zaWNTaXplKCkuaGVpZ2h0KCkgJiYgIWNo
aWxkLnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSkgewotICAgICAgICAvLyBXZSBjYW4ndCBjb21w
dXRlIGEgcmF0aW8gaW4gdGhpcyBjYXNlLgotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgfQot
Ci0gICAgLy8gOS44IGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZmxleGJveC8jZGVmaW5p
dGUtc2l6ZXMKLSAgICAvLyAxLiBJZiBhIHNpbmdsZS1saW5lIGZsZXggY29udGFpbmVyIGhhcyBh
IGRlZmluaXRlIGNyb3NzIHNpemUsIHRoZSBhdXRvbWF0aWMgcHJlZmVycmVkIG91dGVyIGNyb3Nz
IHNpemUgb2YgYW55Ci0gICAgLy8gc3RyZXRjaGVkIGZsZXggaXRlbXMgaXMgdGhlIGZsZXggY29u
dGFpbmVyJ3MgaW5uZXIgY3Jvc3Mgc2l6ZSAoY2xhbXBlZCB0byB0aGUgZmxleCBpdGVtJ3MgbWlu
IGFuZCBtYXggY3Jvc3Mgc2l6ZSkKLSAgICAvLyBhbmQgaXMgY29uc2lkZXJlZCBkZWZpbml0ZS4K
LSAgICBpZiAoIWlzTXVsdGlsaW5lKCkgJiYgYWxpZ25tZW50Rm9yQ2hpbGQoY2hpbGQpID09IEl0
ZW1Qb3NpdGlvbjo6U3RyZXRjaCAmJiAhaGFzQXV0b01hcmdpbnNJbkNyb3NzQXhpcyhjaGlsZCkp
IHsKLSAgICAgICAgLy8gVGhpcyBtdXN0IGJlIGtlcHQgaW4gc3luYyB3aXRoIGNvbXB1dGVNYWlu
U2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKCkuCi0gICAgICAgIC8vIEZJWE1FOiBzbyBmYXIgd2Un
cmUgb25seSBjb25zaWRlcmVkIGZpeGVkIHNpemVzIGJ1dCB3ZSBzaG91bGQgZXh0ZW5kIGl0IHRv
IG90aGVyIGRlZmluaXRlIHNpemVzLgotICAgICAgICBhdXRvJiBjcm9zc1NpemUgPSBpc0hvcml6
b250YWxGbG93KCkgPyBzdHlsZSgpLmhlaWdodCgpIDogc3R5bGUoKS53aWR0aCgpOwotICAgICAg
ICByZXR1cm4gY3Jvc3NTaXplLmlzRml4ZWQoKTsKLSAgICB9Ci0gICAgcmV0dXJuIGZhbHNlOwot
fQotCiBib29sIFJlbmRlckZsZXhpYmxlQm94OjpjaGlsZENyb3NzU2l6ZUlzRGVmaW5pdGUoY29u
c3QgUmVuZGVyQm94JiBjaGlsZCwgY29uc3QgTGVuZ3RoJiBsZW5ndGgpIGNvbnN0CiB7CiAgICAg
aWYgKGxlbmd0aC5pc0F1dG8oKSkKQEAgLTkzMiw3ICs5MjIsNyBAQCBMYXlvdXRVbml0IFJlbmRl
ckZsZXhpYmxlQm94Ojpjb21wdXRlSW5uZXJGbGV4QmFzZVNpemVGb3JDaGlsZChSZW5kZXJCb3gm
IGNoaWxkLAogICAgIGlmIChjaGlsZE1haW5TaXplSXNEZWZpbml0ZShjaGlsZCwgZmxleEJhc2lz
KSkKICAgICAgICAgcmV0dXJuIHN0ZDo6bWF4KDBfbHUsIGNvbXB1dGVNYWluQXhpc0V4dGVudEZv
ckNoaWxkKGNoaWxkLCBNYWluT3JQcmVmZXJyZWRTaXplLCBmbGV4QmFzaXMpLnZhbHVlKCkpOwog
Ci0gICAgaWYgKHVzZUNoaWxkQXNwZWN0UmF0aW8oY2hpbGQpIHx8IGNoaWxkQ3Jvc3NTaXplU2hv
dWxkVXNlQ29udGFpbmVyQ3Jvc3NTaXplKGNoaWxkKSkgeworICAgIGlmICh1c2VDaGlsZEFzcGVj
dFJhdGlvKGNoaWxkKSB8fCB3aWxsQ2hpbGRDcm9zc1NpemVCZUNvbnRhaW5lckNyb3NzU2l6ZShj
aGlsZCkpIHsKICAgICAgICAgY29uc3QgTGVuZ3RoJiBjcm9zc1NpemVMZW5ndGggPSBjcm9zc1Np
emVMZW5ndGhGb3JDaGlsZChNYWluT3JQcmVmZXJyZWRTaXplLCBjaGlsZCk7CiAgICAgICAgIHJl
dHVybiBhZGp1c3RDaGlsZFNpemVGb3JBc3BlY3RSYXRpb0Nyb3NzQXhpc01pbkFuZE1heChjaGls
ZCwgY29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoY2hpbGQsIGNyb3NzU2l6ZUxl
bmd0aCkpOwogICAgIH0KQEAgLTExOTYsMTcgKzExODYsMjIgQEAgTGF5b3V0VW5pdCBSZW5kZXJG
bGV4aWJsZUJveDo6YWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KGNvbnN0IFJlbmRlckJveCYg
Y2hpbGQKICAgICAgICAgY2hpbGRTaXplID0gc3RkOjptaW4oY2hpbGRTaXplLCBtYXhFeHRlbnQu
dmFsdWVPcihjaGlsZFNpemUpKTsKICAgICB9CiAKKyAgICBMZW5ndGggY3Jvc3NNYXggPSBjcm9z
c1NpemVMZW5ndGhGb3JDaGlsZChNYXhTaXplLCBjaGlsZCk7CisgICAgaWYgKCh1c2VDaGlsZEFz
cGVjdFJhdGlvKGNoaWxkKSB8fCB3aWxsQ2hpbGRDcm9zc1NpemVCZUNvbnRhaW5lckNyb3NzU2l6
ZShjaGlsZCkpICYmICFjaGlsZE1haW5TaXplSXNEZWZpbml0ZShjaGlsZCwgZmxleEJhc2lzRm9y
Q2hpbGQoY2hpbGQpKSAmJiBjaGlsZENyb3NzU2l6ZUlzRGVmaW5pdGUoY2hpbGQsIGNyb3NzTWF4
KSkgeworICAgICAgICBtYXhFeHRlbnQgPSBjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9V
c2luZyhjaGlsZCwgY3Jvc3NNYXgpOworICAgICAgICBjaGlsZFNpemUgPSBzdGQ6Om1pbihjaGls
ZFNpemUsIG1heEV4dGVudC52YWx1ZU9yKGNoaWxkU2l6ZSkpOworICAgIH0KKwogICAgIExlbmd0
aCBtaW4gPSBtYWluU2l6ZUxlbmd0aEZvckNoaWxkKE1pblNpemUsIGNoaWxkKTsKICAgICAvLyBJ
bnRyaW5zaWMgc2l6ZXMgaW4gY2hpbGQncyBibG9jayBheGlzIGFyZSBoYW5kbGVkIGJ5IHRoZSBt
aW4tc2l6ZTphdXRvIGNvZGUgcGF0aC4KICAgICBpZiAobWluLmlzU3BlY2lmaWVkKCkgfHwgKG1p
bi5pc0ludHJpbnNpYygpICYmIG1haW5BeGlzSXNDaGlsZElubGluZUF4aXMoY2hpbGQpKSkKLSAg
ICAgICAgcmV0dXJuIHN0ZDo6bWF4KGNoaWxkU2l6ZSwgc3RkOjptYXgoMF9sdSwgY29tcHV0ZU1h
aW5BeGlzRXh0ZW50Rm9yQ2hpbGQoY2hpbGQsIE1pblNpemUsIG1pbikudmFsdWVPcihjaGlsZFNp
emUpKSk7Ci0gICAgCi0gICAgaWYgKHNob3VsZEFwcGx5TWluU2l6ZUF1dG9Gb3JDaGlsZChjaGls
ZCkpIHsKKyAgICAgICAgY2hpbGRTaXplID0gc3RkOjptYXgoY2hpbGRTaXplLCBzdGQ6Om1heCgw
X2x1LCBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjaGlsZCwgTWluU2l6ZSwgbWluKS52
YWx1ZU9yKGNoaWxkU2l6ZSkpKTsKKyAgICBlbHNlIGlmIChzaG91bGRBcHBseU1pblNpemVBdXRv
Rm9yQ2hpbGQoY2hpbGQpKSB7CiAgICAgICAgIC8vIEZJWE1FOiBJZiB0aGUgbWluIHZhbHVlIGlz
IGV4cGVjdGVkIHRvIGJlIHZhbGlkIGhlcmUsIHdlIG5lZWQgdG8gY29tZSB1cCB3aXRoIGEgbm9u
IG9wdGlvbmFsIHZlcnNpb24gb2YgY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQgYW5kCiAg
ICAgICAgIC8vIGVuc3VyZSBpdCdzIHZhbGlkIHRocm91Z2ggdGhlIHZpcnR1YWwgY2FsbHMgb2Yg
Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxDb250ZW50SGVpZ2h0VXNpbmcuCiAgICAgICAgIExheW91
dFVuaXQgY29udGVudFNpemU7CiAgICAgICAgIExlbmd0aCBjaGlsZENyb3NzU2l6ZUxlbmd0aCA9
IGNyb3NzU2l6ZUxlbmd0aEZvckNoaWxkKE1haW5PclByZWZlcnJlZFNpemUsIGNoaWxkKTsKLSAg
ICAgICAgaWYgKHVzZUNoaWxkQXNwZWN0UmF0aW8oY2hpbGQpKQorICAgICAgICBpZiAodXNlQ2hp
bGRBc3BlY3RSYXRpbyhjaGlsZCkpIC8vIHx8IHdpbGxDaGlsZENyb3NzU2l6ZUJlQ29udGFpbmVy
Q3Jvc3NTaXplKGNoaWxkKSkKICAgICAgICAgICAgIGNvbnRlbnRTaXplID0gY29tcHV0ZU1haW5T
aXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoY2hpbGQsIGNoaWxkQ3Jvc3NTaXplTGVuZ3RoKTsKICAg
ICAgICAgZWxzZQogICAgICAgICAgICAgY29udGVudFNpemUgPSBjb21wdXRlTWFpbkF4aXNFeHRl
bnRGb3JDaGlsZChjaGlsZCwgTWluU2l6ZSwgTGVuZ3RoKExlbmd0aFR5cGU6Ok1pbkNvbnRlbnQp
KS52YWx1ZU9yKDApOwpAQCAtMTIyMCwyMCArMTIxNSwxNyBAQCBMYXlvdXRVbml0IFJlbmRlckZs
ZXhpYmxlQm94OjphZGp1c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgoY29uc3QgUmVuZGVyQm94JiBj
aGlsZAogICAgICAgICAgICAgTGF5b3V0VW5pdCByZXNvbHZlZE1haW5TaXplID0gY29tcHV0ZU1h
aW5BeGlzRXh0ZW50Rm9yQ2hpbGQoY2hpbGQsIE1haW5PclByZWZlcnJlZFNpemUsIG1haW5TaXpl
KS52YWx1ZU9yKDApOwogICAgICAgICAgICAgQVNTRVJUKHJlc29sdmVkTWFpblNpemUgPj0gMCk7
CiAgICAgICAgICAgICBMYXlvdXRVbml0IHNwZWNpZmllZFNpemUgPSBzdGQ6Om1pbihyZXNvbHZl
ZE1haW5TaXplLCBtYXhFeHRlbnQudmFsdWVPcihyZXNvbHZlZE1haW5TaXplKSk7Ci0gICAgICAg
ICAgICByZXR1cm4gc3RkOjptYXgoY2hpbGRTaXplLCBzdGQ6Om1pbihzcGVjaWZpZWRTaXplLCBj
b250ZW50U2l6ZSkpOwotICAgICAgICB9Ci0KLSAgICAgICAgaWYgKHVzZUNoaWxkQXNwZWN0UmF0
aW8oY2hpbGQpIHx8IGNoaWxkQ3Jvc3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NTaXplKGNo
aWxkKSkgewotICAgICAgICAgICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gdHJhbnNmZXJyZWRTaXpl
ID0gY29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoY2hpbGQsIGNoaWxkQ3Jvc3NT
aXplTGVuZ3RoKTsKLSAgICAgICAgICAgIGlmICh0cmFuc2ZlcnJlZFNpemUpIHsKLSAgICAgICAg
ICAgICAgICB0cmFuc2ZlcnJlZFNpemUgPSBhZGp1c3RDaGlsZFNpemVGb3JBc3BlY3RSYXRpb0Ny
b3NzQXhpc01pbkFuZE1heChjaGlsZCwgdHJhbnNmZXJyZWRTaXplLnZhbHVlKCkpOwotICAgICAg
ICAgICAgICAgIHJldHVybiBzdGQ6Om1heChjaGlsZFNpemUsIHN0ZDo6bWluKHRyYW5zZmVycmVk
U2l6ZS52YWx1ZSgpLCBjb250ZW50U2l6ZSkpOwotICAgICAgICAgICAgfQotICAgICAgICB9Ci0K
LSAgICAgICAgcmV0dXJuIHN0ZDo6bWF4KGNoaWxkU2l6ZSwgY29udGVudFNpemUpOworICAgICAg
ICAgICAgY2hpbGRTaXplID0gc3RkOjptYXgoY2hpbGRTaXplLCBzdGQ6Om1pbihzcGVjaWZpZWRT
aXplLCBjb250ZW50U2l6ZSkpOworICAgICAgICB9IGVsc2UgaWYgKHVzZUNoaWxkQXNwZWN0UmF0
aW8oY2hpbGQpIHx8IHdpbGxDaGlsZENyb3NzU2l6ZUJlQ29udGFpbmVyQ3Jvc3NTaXplKGNoaWxk
KSkgeworICAgICAgICAgICAgTGF5b3V0VW5pdCB0cmFuc2ZlcnJlZFNpemUgPSBjb21wdXRlTWFp
blNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjaGlsZCwgY2hpbGRDcm9zc1NpemVMZW5ndGgpOwor
ICAgICAgICAgICAgdHJhbnNmZXJyZWRTaXplID0gYWRqdXN0Q2hpbGRTaXplRm9yQXNwZWN0UmF0
aW9Dcm9zc0F4aXNNaW5BbmRNYXgoY2hpbGQsIHRyYW5zZmVycmVkU2l6ZSk7CisgICAgICAgICAg
ICBjaGlsZFNpemUgPSBzdGQ6Om1heChjaGlsZFNpemUsIHN0ZDo6bWluKHRyYW5zZmVycmVkU2l6
ZSwgY29udGVudFNpemUpKTsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICBjaGlsZFNpemUg
PSBzdGQ6Om1heChjaGlsZFNpemUsIGNvbnRlbnRTaXplKTsKICAgICB9Ci0KKyAgICBMZW5ndGgg
Y3Jvc3NNaW4gPSBjcm9zc1NpemVMZW5ndGhGb3JDaGlsZChNaW5TaXplLCBjaGlsZCk7CisgICAg
aWYgKCh1c2VDaGlsZEFzcGVjdFJhdGlvKGNoaWxkKSB8fCB3aWxsQ2hpbGRDcm9zc1NpemVCZUNv
bnRhaW5lckNyb3NzU2l6ZShjaGlsZCkpICYmICFjaGlsZE1haW5TaXplSXNEZWZpbml0ZShjaGls
ZCwgZmxleEJhc2lzRm9yQ2hpbGQoY2hpbGQpKSAmJiBjaGlsZENyb3NzU2l6ZUlzRGVmaW5pdGUo
Y2hpbGQsIGNyb3NzTWluKSkKKyAgICAgICAgcmV0dXJuIHN0ZDo6bWF4KGNoaWxkU2l6ZSwgY29t
cHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoY2hpbGQsIGNyb3NzTWluKSk7CiAgICAg
cmV0dXJuIHN0ZDo6bWF4KDBfbHUsIGNoaWxkU2l6ZSk7CiB9CiAgICAgCmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaCBiL1NvdXJjZS9XZWJD
b3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCmluZGV4IDY4MGRjZDdjMDM4MDQ3MmI0
OTlhZDc0NGRlYTIxZDY4YzdmNGU5NDkuLmE2ZDg0YTVmNmY5NjA1ODA5MDg5YzE5ZDYxZmU5NDhj
NGJkYTI4YzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4
aWJsZUJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJv
eC5oCkBAIC0xNDIsOCArMTQyLDggQEAgcHJpdmF0ZToKICAgICBMYXlvdXRVbml0IGNyb3NzQXhp
c1Njcm9sbGJhckV4dGVudCgpIGNvbnN0OwogICAgIExheW91dFVuaXQgY3Jvc3NBeGlzU2Nyb2xs
YmFyRXh0ZW50Rm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3Q7CiAgICAgTGF5
b3V0UG9pbnQgZmxvd0F3YXJlTG9jYXRpb25Gb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmIGNoaWxk
KSBjb25zdDsKKyAgICBib29sIHdpbGxDaGlsZENyb3NzU2l6ZUJlQ29udGFpbmVyQ3Jvc3NTaXpl
KGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0OwogICAgIGJvb2wgdXNlQ2hpbGRBc3BlY3RS
YXRpbyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdDsKLSAgICBib29sIGNoaWxkQ3Jvc3NT
aXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NTaXplKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNv
bnN0OwogICAgIExheW91dFVuaXQgY29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmco
Y29uc3QgUmVuZGVyQm94JiBjaGlsZCwgTGVuZ3RoIGNyb3NzU2l6ZUxlbmd0aCkgY29uc3Q7CiAg
ICAgdm9pZCBzZXRGbG93QXdhcmVMb2NhdGlvbkZvckNoaWxkKFJlbmRlckJveCYgY2hpbGQsIGNv
bnN0IExheW91dFBvaW50Jik7CiAgICAgTGF5b3V0VW5pdCBjb21wdXRlSW5uZXJGbGV4QmFzZVNp
emVGb3JDaGlsZChSZW5kZXJCb3gmIGNoaWxkLCBMYXlvdXRVbml0IG1haW5BeGlzQm9yZGVyQW5k
UGFkZGluZyk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0
cy9DaGFuZ2VMb2cKaW5kZXggZDQ2ZWU0ZGM0YmY5NTljYWYxNTVmMTNlY2RiODA5NTk1YzFlODJi
Mi4uZDExZmMyODJjZWJiZGRiYmQ4YzI4YjExNTFiOWRiYTllMzZjNjM4YiAxMDA2NDQKLS0tIGEv
TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwz
ICsxLDE0IEBACisyMDIxLTAzLTA3ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAg
ICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gaW4gaW50cmluc2ljIHNpemluZworICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwODYxCisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRW5hYmxlIHRlc3RzIHRoYXQg
cGFzcyBub3cuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTAzLTA2ICBa
YWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgT25seSBwb3NpdGl2ZSBp
bnRlZ2VycyBhcmUgYWxsb3dlZCBhcyB2YWx1ZXMgb2Ygb3JwaGFucyBhbmQgd2lkb3dzCmRpZmYg
LS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4
cGVjdGF0aW9ucwppbmRleCA0NGQwOTVjOTA0M2IwYTRhNjkxMTkzZDk2M2JiZDAxMzdkY2I1MDJk
Li40OTNmYmJiODgyYWQ5YzMwMzgwNzg0NTgyOTMwYjEzYWFjODI1NTljIDEwMDY0NAotLS0gYS9M
YXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3Rh
dGlvbnMKQEAgLTQwNTYsNyArNDA1Niw2IEBAIHdlYmtpdC5vcmcvYi8yMjE0ODAgaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvZmxleGJveC1icmVhCiAjIG1p
bi1zaXplOmF1dG8gaW4gZmxleGJveC4KIHdlYmtpdC5vcmcvYi8yMjE0ODEgaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvZmxleC1taW5pbXVtLWhlaWdodC1m
bGV4LWl0ZW1zLTAyNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjIx
NDgxIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2ZsZXgt
bWluaW11bS1oZWlnaHQtZmxleC1pdGVtcy0wMjkuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQot
d2Via2l0Lm9yZy9iLzIyMTQ4MSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3MtZmxleGJveC9mbGV4LW1pbmltdW0td2lkdGgtZmxleC1pdGVtcy0wMTUuaHRtbCBbIEltYWdl
T25seUZhaWx1cmUgXQogCiAjIHZpc2liaWxpdHk6Y29sbGFwc2UgaW4gZmxleCBpdGVtcy4KIHdl
YmtpdC5vcmcvYi8yMjE0ODIgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LWZsZXhib3gvZmxleGJveC1jb2xsYXBzZWQtaXRlbS1iYXNlbGluZS0wMDEuaHRtbCBbIEltYWdl
T25seUZhaWx1cmUgXQpAQCAtNDU1MCwyOSArNDU0OSwxNSBAQCB3ZWJraXQub3JnL2IvMjE0NDYy
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zY29waW5nL3NoYWRvdy1k
aXJlYwogd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtc2NvcGluZy9zaGFkb3ctZGlyZWN0aW9uYWxpdHktMDAyLnRlbnRhdGl2ZS5odG1s
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYyIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zY29waW5nL3Nsb3R0ZWQtcGxhY2Vob2xkZXIuaHRt
bCBbIEltYWdlT25seUZhaWx1cmUgXQogCisjICBjb250YWluLWludHJpbnNpYy1zaXplCiB3ZWJr
aXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z
aXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMTQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQog
d2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDI0Lmh0bWwgWyBJbWFn
ZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlv
LTAyOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAjIGZsZXgtYmFzaXM6Y29udGVudAogd2Vi
a2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
c2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjEuaHRtbCBbIEltYWdlT25s
eUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjIu
aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFz
cGVjdC1yYXRpby0wMjUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIx
NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj
dC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQot
d2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTUuaHRtbCBbIEltYWdl
T25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0w
MTYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlk
LWFzcGVjdC1yYXRpby0wMTcuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9i
LzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz
cGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQot
d2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMDIuaHRtbCBbIEltYWdlT25s
eUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMDQuaHRt
bCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMt
c2l6ZS0wMDUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp
by9pbnRyaW5zaWMtc2l6ZS0wMDYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9y
Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n
L2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMDguaHRtbCBbIEltYWdlT25seUZhaWx1cmUg
XQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMTAuaHRtbCBbIEltYWdl
T25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMTEu
aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5z
aWMtc2l6ZS0wMTIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2
MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y
YXRpby9pbnRyaW5zaWMtc2l6ZS0wMTMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0
Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6
aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMTQuaHRtbCBbIEltYWdlT25seUZhaWx1
cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMTUuaHRtbCBbIElt
YWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby90YWJsZS1lbGVtZW50LTAw
MS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvY29udGFpbi1pbnRyaW5zaWMt
c2l6ZS9jb250YWluLWludHJpbnNpYy1zaXplLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd
CiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy1zaXppbmcvY29udGFpbi1pbnRyaW5zaWMtc2l6ZS9jb250YWluLWludHJpbnNpYy1zaXpl
LTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9p
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp
by9mbGV4LWFzcGVjdC1yYXRpby0wMjctZXhwZWN0ZWQueGh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxl
eC1hc3BlY3QtcmF0aW8tMDI3LWV4cGVjdGVkLnhodApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl
eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wNWExMzc5NDQ4MmE5
NGY2YzEwYmQ5ZDRjOTg3MDRlNjNlZjYwMzMxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz
dHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt
cmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI3LWV4cGVjdGVkLnhodApAQCAtMCwwICsxLDE5IEBA
Cis8IURPQ1RZUEUgaHRtbCBQVUJMSUMgIi0vL1czQy8vRFREIFhIVE1MIDEuMCBTdHJpY3QvL0VO
IiAiaHR0cDovL3d3dy53My5vcmcvVFIveGh0bWwxL0RURC94aHRtbDEtc3RyaWN0LmR0ZCI+Cis8
aHRtbCB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94aHRtbCI+CisgPGhlYWQ+CisgIDx0
aXRsZT5DU1MgUmVmdGVzdCBSZWZlcmVuY2U8L3RpdGxlPgorICA8bGluayByZWw9ImF1dGhvciIg
dGl0bGU9IkfDqXJhcmQgVGFsYm90IiBocmVmPSJodHRwOi8vd3d3Lmd0YWxib3Qub3JnL0Jyb3dz
ZXJCdWdzU2VjdGlvbi9jc3MyMXRlc3RzdWl0ZS8iIC8+CisgIDxzdHlsZSB0eXBlPSJ0ZXh0L2Nz
cyI+PCFbQ0RBVEFbCisgIGRpdgorICB7CisgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworICBo
ZWlnaHQ6IDEwMHB4OworICB3aWR0aDogMTAwcHg7CisgIH0KKyAgXV0+PC9zdHlsZT4KKyA8L2hl
YWQ+CisgPGJvZHk+CisgIDxwPlRlc3QgcGFzc2VzIGlmIHRoZXJlIGlzIGEgZmlsbGVkIGdyZWVu
IHNxdWFyZSBhbmQgPHN0cm9uZz5ubyByZWQ8L3N0cm9uZz4uPC9wPgorICA8ZGl2PjwvZGl2Pgor
IDwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0
LXJhdGlvLTAyNy5odG1sIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI3Lmh0
bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMC4uYzEwZjFmM2Y3MDQ4YmM4OTFlYzhkNzNhNzAzNDJhOTk0MjEzYjU2NQot
LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNy5o
dG1sCkBAIC0wLDAgKzEsMTYgQEAKKzwhRE9DVFlQRSBodG1sPgorPHRpdGxlPkNTUyBhc3BlY3Qt
cmF0aW86IFJvdyBmbGV4Ym94IGFuZCB0cmFuc2ZlcnJlZCBtaW4vbWF4LXNpemU8L3RpdGxlPgor
PGxpbmsgcmVsPSJhdXRob3IiIHRpdGxlPSJHb29nbGUgTExDIiBocmVmPSJodHRwczovL3d3dy5n
b29nbGUuY29tLyI+Cis8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHBzOi8vZHJhZnRzLmNzc3dn
Lm9yZy9jc3Mtc2l6aW5nLTQvI2FzcGVjdC1yYXRpbyI+Cis8bGluayByZWw9Im1hdGNoIiBocmVm
PSIuLi8uLi9yZWZlcmVuY2UvcmVmLWZpbGxlZC1ncmVlbi0xMDBweC1zcXVhcmUueGh0IiAvPgor
Cis8cD5UZXN0IHBhc3NlcyBpZiB0aGVyZSBpcyBhIGZpbGxlZCBncmVlbiBzcXVhcmUgYW5kIDxz
dHJvbmc+bm8gcmVkPC9zdHJvbmc+LjwvcD4KKworPGRpdiBzdHlsZT0iZGlzcGxheTogZmxleDsg
ZmxleC1kaXJlY3Rpb246IHJvdzsiPgorICA8ZGl2IHN0eWxlPSJiYWNrZ3JvdW5kOiBncmVlbjsg
d2lkdGg6IDQwcHg7IGhlaWdodDogNTBweDsiID48L2Rpdj4KKyAgPGRpdiBzdHlsZT0iYmFja2dy
b3VuZDogZ3JlZW47IHdpZHRoOiA2MHB4OyBtYXgtaGVpZ2h0OiA1MHB4OyBhc3BlY3QtcmF0aW86
IDEvMTsiPjwvZGl2PgorPC9kaXY+Cis8ZGl2IHN0eWxlPSJkaXNwbGF5OiBmbGV4OyBmbGV4LWRp
cmVjdGlvbjogcm93OyI+CisgIDxkaXYgc3R5bGU9ImJhY2tncm91bmQ6IGdyZWVuOyB3aWR0aDog
NDBweDsgaGVpZ2h0OiA1MHB4OyIgPjwvZGl2PgorICA8ZGl2IHN0eWxlPSJiYWNrZ3JvdW5kOiBn
cmVlbjsgd2lkdGg6IDYwcHg7IGhlaWdodDogNjBweDsgbWF4LWhlaWdodDogNTBweDsgYXNwZWN0
LXJhdGlvOiAxLzE7Ij48L2Rpdj4KKzwvZGl2Pgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>422560</attachid>
            <date>2021-03-08 06:34:44 -0800</date>
            <delta_ts>2021-03-10 01:38:49 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210308153443.patch</filename>
            <type>text/plain</type>
            <size>16190</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MDY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGE0Mzk5ZDAxMmMzMmMw
ZjgzOWI3M2RjMzlkMmU5NzA4YzIzNzMyOC4uM2IyZGJjZTZhNDIyZjc3NjExYTE1OWM0MmYxNjI2
MWI1ZTM4MzliOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAzLTA4ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBXSVAuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OndpbGxDaGlsZENyb3NzU2l6ZUJl
Q29udGFpbmVyQ3Jvc3NTaXplIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhp
YmxlQm94Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyBjb25zdCk6CisgICAg
ICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94Lmg6CisKIDIwMjEtMDMtMDggIENocmlz
IExvcmQgIDxjbG9yZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIEFsbG93IGNyZWF0aW9uIG9mIGEg
Q1NTRm9udFNlbGVjdG9yIHdpdGggYSBub24tRG9jdW1lbnQgU2NyaXB0RXhlY3V0aW9uQ29udGV4
dApkaWZmIC0tZ2l0IGEvU291cmNlL1dURi9TY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVu
Y2VzRXhwZXJpbWVudGFsLnlhbWwgYi9Tb3VyY2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2Vi
UHJlZmVyZW5jZXNFeHBlcmltZW50YWwueWFtbAppbmRleCA0NzNhYmM2Y2I1MDBjZTc0NjBiMTI2
MTRkY2VhYzE0YWMwZGU3ZjRiLi5kNzYzMjgzNjBiNzBmOTI2ZGMzZTJmZTc1OTY3NGJkYjkzMGU2
ZTBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVy
ZW5jZXNFeHBlcmltZW50YWwueWFtbAorKysgYi9Tb3VyY2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5j
ZXMvV2ViUHJlZmVyZW5jZXNFeHBlcmltZW50YWwueWFtbApAQCAtNDMsMTEgKzQzLDExIEBAIEFz
cGVjdFJhdGlvRW5hYmxlZDoKICAgaHVtYW5SZWFkYWJsZURlc2NyaXB0aW9uOiAiRW5hYmxlIGFz
cGVjdC1yYXRpbyBDU1MgcHJvcGVydHkiCiAgIGRlZmF1bHRWYWx1ZToKICAgICBXZWJLaXRMZWdh
Y3k6Ci0gICAgICBkZWZhdWx0OiBmYWxzZQorICAgICAgZGVmYXVsdDogdHJ1ZQogICAgIFdlYktp
dDoKLSAgICAgIGRlZmF1bHQ6IGZhbHNlCisgICAgICBkZWZhdWx0OiB0cnVlCiAgICAgV2ViQ29y
ZToKLSAgICAgIGRlZmF1bHQ6IGZhbHNlCisgICAgICBkZWZhdWx0OiB0cnVlCiAKICMgRklYTUU6
IFRoaXMgaXMgb24gYnkgZGVmYXVsdCBpbiBXZWJLaXQyLiBQZXJoYXBzIHdlIHNob3VsZCBjb25z
aWRlciB0dXJuaW5nIGl0IG9uIGZvciBXZWJLaXRMZWdhY3kgYXMgd2VsbC4KIEFzcGVjdFJhdGlv
T2ZJbWdGcm9tV2lkdGhBbmRIZWlnaHRFbmFibGVkOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl
cmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKaW5kZXggOWJjNjM2MjYzOWZlMTJkNWY0OTIwZWQ4
N2MyNmE1OWVhNTRlYzBmMS4uZGUyOTJlNmE5OTA4MTdkYWZjZjhlOWE0NTI0NTNlNTVjNWNjZWY2
NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94
LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3Bw
CkBAIC03ODUsMTQgKzc4NSwyMyBAQCBib29sIFJlbmRlckZsZXhpYmxlQm94Ojp1c2VDaGlsZEFz
cGVjdFJhdGlvKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0CiAgICAgcmV0dXJuIGNoaWxk
Q3Jvc3NTaXplSXNEZWZpbml0ZShjaGlsZCwgY3Jvc3NTaXplTGVuZ3RoRm9yQ2hpbGQoTWFpbk9y
UHJlZmVycmVkU2l6ZSwgY2hpbGQpKTsKIH0KIAorYm9vbCBSZW5kZXJGbGV4aWJsZUJveDo6d2ls
bENoaWxkQ3Jvc3NTaXplQmVDb250YWluZXJDcm9zc1NpemUoY29uc3QgUmVuZGVyQm94JiBjaGls
ZCkgY29uc3QKK3sKKyAgICBpZiAoIWNoaWxkSGFzQXNwZWN0UmF0aW8oY2hpbGQpKQorICAgICAg
ICByZXR1cm4gZmFsc2U7CisgICAgaWYgKCFjaGlsZC5pbnRyaW5zaWNTaXplKCkuaGVpZ2h0KCkg
JiYgIWNoaWxkLnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSkgeworICAgICAgICAvLyBXZSBjYW4n
dCBjb21wdXRlIGEgcmF0aW8gaW4gdGhpcyBjYXNlLgorICAgICAgICByZXR1cm4gZmFsc2U7Cisg
ICAgfQorICAgIGNvbnN0IExlbmd0aCYgY3Jvc3NTaXplTGVuZ3RoID0gaXNIb3Jpem9udGFsRmxv
dygpID8gY2hpbGQuc3R5bGUoKS5oZWlnaHQoKSA6IGNoaWxkLnN0eWxlKCkud2lkdGgoKTsKKyAg
ICByZXR1cm4gIWlzTXVsdGlsaW5lKCkgJiYgY2hpbGRDcm9zc1NpemVJc0RlZmluaXRlKGNoaWxk
LCBMZW5ndGgoMTAwLCBMZW5ndGhUeXBlOjpQZXJjZW50KSkgJiYgYWxpZ25tZW50Rm9yQ2hpbGQo
Y2hpbGQpID09IEl0ZW1Qb3NpdGlvbjo6U3RyZXRjaCAmJiBjcm9zc1NpemVMZW5ndGguaXNBdXRv
KCkgJiYgIWhhc0F1dG9NYXJnaW5zSW5Dcm9zc0F4aXMoY2hpbGQpOworfQogICAgIAogTGF5b3V0
VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNp
bmcoY29uc3QgUmVuZGVyQm94JiBjaGlsZCwgTGVuZ3RoIGNyb3NzU2l6ZUxlbmd0aCkgY29uc3QK
IHsKICAgICBBU1NFUlQoY2hpbGRIYXNBc3BlY3RSYXRpbyhjaGlsZCkpOwogCi0gICAgYXV0byBh
ZGp1c3RGb3JCb3hTaXppbmcgPSBbdGhpc10gKGNvbnN0IFJlbmRlckJveCYgYm94LCBMZW5ndGgg
bGVuZ3RoKSAtPiBMYXlvdXRVbml0IHsKLSAgICAgICAgQVNTRVJUKGxlbmd0aC5pc0ZpeGVkKCkp
OwotICAgICAgICBhdXRvIHZhbHVlID0gTGF5b3V0VW5pdChsZW5ndGgudmFsdWUoKSk7CisgICAg
YXV0byBhZGp1c3RGb3JCb3hTaXppbmcgPSBbdGhpc10gKGNvbnN0IFJlbmRlckJveCYgYm94LCBM
YXlvdXRVbml0IHZhbHVlKSAtPiBMYXlvdXRVbml0IHsKICAgICAgICAgLy8gV2UgbmVlZCB0byBz
dWJzdHJhY3QgdGhlIGJvcmRlciBhbmQgcGFkZGluZyBleHRlbnQgZnJvbSB0aGUgY3Jvc3MgYXhp
cy4KICAgICAgICAgLy8gRnVydGhlcm1vcmUsIHRoZSBzaXppbmcgY2FsY3VsYXRpb25zIHRoYXQg
Zmxvb3IgdGhlIGNvbnRlbnQgYm94IHNpemUgYXQgemVybyB3aGVuIGFwcGx5aW5nIGJveC1zaXpp
bmcgYXJlIGFsc28gaWdub3JlZC4KICAgICAgICAgLy8gaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3Jn
L2Nzcy1mbGV4Ym94LyNhbGdvLW1haW4taXRlbS4KQEAgLTgwMSwzMyArODEwLDM2IEBAIExheW91
dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1Vz
aW5nKGNvbnN0IFJlbmRlckJvCiAgICAgICAgIHJldHVybiB2YWx1ZTsKICAgICB9OwogCisgICAg
aWYgKGNyb3NzU2l6ZUxlbmd0aC5pc0F1dG8oKSAmJiB3aWxsQ2hpbGRDcm9zc1NpemVCZUNvbnRh
aW5lckNyb3NzU2l6ZShjaGlsZCkpCisgICAgICAgIGNyb3NzU2l6ZUxlbmd0aCA9IExlbmd0aCgx
MDAsIExlbmd0aFR5cGU6OlBlcmNlbnQpOworCiAgICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gY3Jv
c3NTaXplOwotICAgIGlmIChjcm9zc1NpemVMZW5ndGguaXNGaXhlZCgpKQotICAgICAgICBjcm9z
c1NpemUgPSBhZGp1c3RGb3JCb3hTaXppbmcoY2hpbGQsIGNyb3NzU2l6ZUxlbmd0aCk7Ci0gICAg
ZWxzZSBpZiAoY3Jvc3NTaXplTGVuZ3RoLmlzQXV0bygpKSB7Ci0gICAgICAgIEFTU0VSVChjaGls
ZENyb3NzU2l6ZVNob3VsZFVzZUNvbnRhaW5lckNyb3NzU2l6ZShjaGlsZCkpOwotICAgICAgICBh
dXRvIGNvbnRhaW5lckNyb3NzU2l6ZUxlbmd0aCA9IGlzSG9yaXpvbnRhbEZsb3coKSA/IHN0eWxl
KCkuaGVpZ2h0KCkgOiBzdHlsZSgpLndpZHRoKCk7Ci0gICAgICAgIC8vIEtlZXAgdGhpcyBzeW5j
J2VkIHdpdGggY2hpbGRDcm9zc1NpemVTaG91bGRVc2VDb250YWluZXJDcm9zc1NpemUoKS4KLSAg
ICAgICAgQVNTRVJUKGNvbnRhaW5lckNyb3NzU2l6ZUxlbmd0aC5pc0ZpeGVkKCkpOwotICAgICAg
ICBjcm9zc1NpemUgPSB2YWx1ZUZvckxlbmd0aChjb250YWluZXJDcm9zc1NpemVMZW5ndGgsIC0x
X2x1KTsKKyAgICBpZiAoY3Jvc3NTaXplTGVuZ3RoLmlzRml4ZWQoKSkgeworICAgICAgICBjcm9z
c1NpemUgPSBMYXlvdXRVbml0KGNyb3NzU2l6ZUxlbmd0aC52YWx1ZSgpKTsKICAgICB9IGVsc2Ug
ewogICAgICAgICBBU1NFUlQoY3Jvc3NTaXplTGVuZ3RoLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgp
KTsKLSAgICAgICAgY3Jvc3NTaXplID0gbWFpbkF4aXNJc0NoaWxkSW5saW5lQXhpcyhjaGlsZCkg
PyBjaGlsZC5jb21wdXRlUGVyY2VudGFnZUxvZ2ljYWxIZWlnaHQoY3Jvc3NTaXplTGVuZ3RoKSA6
IGFkanVzdEJvcmRlckJveExvZ2ljYWxXaWR0aEZvckJveFNpemluZyh2YWx1ZUZvckxlbmd0aChj
cm9zc1NpemVMZW5ndGgsIGNvbnRlbnRXaWR0aCgpKSwgY3Jvc3NTaXplTGVuZ3RoLnR5cGUoKSk7
CisgICAgICAgIGNyb3NzU2l6ZSA9IG1haW5BeGlzSXNDaGlsZElubGluZUF4aXMoY2hpbGQpID8g
Y2hpbGQuY29tcHV0ZVBlcmNlbnRhZ2VMb2dpY2FsSGVpZ2h0KGNyb3NzU2l6ZUxlbmd0aCkgOiB2
YWx1ZUZvckxlbmd0aChjcm9zc1NpemVMZW5ndGgsIGNvbnRlbnRXaWR0aCgpKTsKICAgICAgICAg
aWYgKCFjcm9zc1NpemUpCiAgICAgICAgICAgICByZXR1cm4gMF9sdTsKICAgICB9CiAKICAgICBj
b25zdCBMYXlvdXRTaXplJiBjaGlsZEludHJpbnNpY1NpemUgPSBjaGlsZC5pbnRyaW5zaWNTaXpl
KCk7CiAgICAgZG91YmxlIHJhdGlvOwotICAgIGlmIChjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlv
VHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6UmF0aW8gfHwgKGNoaWxkLnN0eWxlKCkuYXNwZWN0
UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpBdXRvQW5kUmF0aW8gJiYgY2hpbGRJbnRy
aW5zaWNTaXplLmlzRW1wdHkoKSkpCisgICAgTGF5b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5nOwor
ICAgIGlmIChjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlw
ZTo6UmF0aW8gfHwgKGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0
aW9UeXBlOjpBdXRvQW5kUmF0aW8gJiYgY2hpbGRJbnRyaW5zaWNTaXplLmlzRW1wdHkoKSkpIHsK
ICAgICAgICAgcmF0aW8gPSBjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvV2lkdGgoKSAvIGNoaWxk
LnN0eWxlKCkuYXNwZWN0UmF0aW9IZWlnaHQoKTsKLSAgICBlbHNlIHsKKyAgICAgICAgaWYgKGNo
aWxkLnN0eWxlKCkuYm94U2l6aW5nRm9yQXNwZWN0UmF0aW8oKSA9PSBCb3hTaXppbmc6OkNvbnRl
bnRCb3gpCisgICAgICAgICAgICAqY3Jvc3NTaXplIC09IGlzSG9yaXpvbnRhbEZsb3coKSA/IGNo
aWxkLnZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpIDogY2hpbGQuaG9yaXpvbnRhbEJv
cmRlckFuZFBhZGRpbmdFeHRlbnQoKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgYm9yZGVy
QW5kUGFkZGluZyA9IGlzSG9yaXpvbnRhbEZsb3coKSA/IGNoaWxkLmhvcml6b250YWxCb3JkZXJB
bmRQYWRkaW5nRXh0ZW50KCkgOiBjaGlsZC52ZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQo
KTsKKyAgICB9IGVsc2UgewogICAgICAgICBBU1NFUlQoY2hpbGRJbnRyaW5zaWNTaXplLmhlaWdo
dCgpKTsKICAgICAgICAgcmF0aW8gPSBjaGlsZEludHJpbnNpY1NpemUud2lkdGgoKS50b0Zsb2F0
KCkgLyBjaGlsZEludHJpbnNpY1NpemUuaGVpZ2h0KCkudG9GbG9hdCgpOworICAgICAgICAqY3Jv
c3NTaXplID0gYWRqdXN0Rm9yQm94U2l6aW5nKGNoaWxkLCAqY3Jvc3NTaXplKTsKICAgICB9CiAg
ICAgaWYgKGlzSG9yaXpvbnRhbEZsb3coKSkKLSAgICAgICAgcmV0dXJuIExheW91dFVuaXQoY3Jv
c3NTaXplLnZhbHVlKCkgKiByYXRpbyk7Ci0gICAgcmV0dXJuIExheW91dFVuaXQoY3Jvc3NTaXpl
LnZhbHVlKCkgLyByYXRpbyk7CisgICAgICAgIHJldHVybiBMYXlvdXRVbml0KGNyb3NzU2l6ZS52
YWx1ZSgpICogcmF0aW8pIC0gYm9yZGVyQW5kUGFkZGluZzsKKyAgICByZXR1cm4gTGF5b3V0VW5p
dChjcm9zc1NpemUudmFsdWUoKSAvIHJhdGlvKSAtIGJvcmRlckFuZFBhZGRpbmc7CiB9CiAKIHZv
aWQgUmVuZGVyRmxleGlibGVCb3g6OnNldEZsb3dBd2FyZUxvY2F0aW9uRm9yQ2hpbGQoUmVuZGVy
Qm94JiBjaGlsZCwgY29uc3QgTGF5b3V0UG9pbnQmIGxvY2F0aW9uKQpAQCAtMTE5NiwxNyArMTIw
OCwyMiBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjphZGp1c3RDaGlsZFNpemVGb3JN
aW5BbmRNYXgoY29uc3QgUmVuZGVyQm94JiBjaGlsZAogICAgICAgICBjaGlsZFNpemUgPSBzdGQ6
Om1pbihjaGlsZFNpemUsIG1heEV4dGVudC52YWx1ZU9yKGNoaWxkU2l6ZSkpOwogICAgIH0KIAor
ICAgIExlbmd0aCBjcm9zc01heCA9IGNyb3NzU2l6ZUxlbmd0aEZvckNoaWxkKE1heFNpemUsIGNo
aWxkKTsKKyAgICBpZiAoKHVzZUNoaWxkQXNwZWN0UmF0aW8oY2hpbGQpIHx8IGNoaWxkQ3Jvc3NT
aXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NTaXplKGNoaWxkKSkgJiYgIWNoaWxkTWFpblNpemVJ
c0RlZmluaXRlKGNoaWxkLCBmbGV4QmFzaXNGb3JDaGlsZChjaGlsZCkpICYmIGNoaWxkQ3Jvc3NT
aXplSXNEZWZpbml0ZShjaGlsZCwgY3Jvc3NNYXgpKSB7CisgICAgICAgIG1heEV4dGVudCA9IGNv
bXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNoaWxkLCBjcm9zc01heCk7CisgICAg
ICAgIGNoaWxkU2l6ZSA9IHN0ZDo6bWluKGNoaWxkU2l6ZSwgbWF4RXh0ZW50LnZhbHVlT3IoY2hp
bGRTaXplKSk7CisgICAgfQorCiAgICAgTGVuZ3RoIG1pbiA9IG1haW5TaXplTGVuZ3RoRm9yQ2hp
bGQoTWluU2l6ZSwgY2hpbGQpOwogICAgIC8vIEludHJpbnNpYyBzaXplcyBpbiBjaGlsZCdzIGJs
b2NrIGF4aXMgYXJlIGhhbmRsZWQgYnkgdGhlIG1pbi1zaXplOmF1dG8gY29kZSBwYXRoLgogICAg
IGlmIChtaW4uaXNTcGVjaWZpZWQoKSB8fCAobWluLmlzSW50cmluc2ljKCkgJiYgbWFpbkF4aXNJ
c0NoaWxkSW5saW5lQXhpcyhjaGlsZCkpKQotICAgICAgICByZXR1cm4gc3RkOjptYXgoY2hpbGRT
aXplLCBzdGQ6Om1heCgwX2x1LCBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjaGlsZCwg
TWluU2l6ZSwgbWluKS52YWx1ZU9yKGNoaWxkU2l6ZSkpKTsKLSAgICAKLSAgICBpZiAoc2hvdWxk
QXBwbHlNaW5TaXplQXV0b0ZvckNoaWxkKGNoaWxkKSkgeworICAgICAgICBjaGlsZFNpemUgPSBz
dGQ6Om1heChjaGlsZFNpemUsIHN0ZDo6bWF4KDBfbHUsIGNvbXB1dGVNYWluQXhpc0V4dGVudEZv
ckNoaWxkKGNoaWxkLCBNaW5TaXplLCBtaW4pLnZhbHVlT3IoY2hpbGRTaXplKSkpOworICAgIGVs
c2UgaWYgKHNob3VsZEFwcGx5TWluU2l6ZUF1dG9Gb3JDaGlsZChjaGlsZCkpIHsKICAgICAgICAg
Ly8gRklYTUU6IElmIHRoZSBtaW4gdmFsdWUgaXMgZXhwZWN0ZWQgdG8gYmUgdmFsaWQgaGVyZSwg
d2UgbmVlZCB0byBjb21lIHVwIHdpdGggYSBub24gb3B0aW9uYWwgdmVyc2lvbiBvZiBjb21wdXRl
TWFpbkF4aXNFeHRlbnRGb3JDaGlsZCBhbmQKICAgICAgICAgLy8gZW5zdXJlIGl0J3MgdmFsaWQg
dGhyb3VnaCB0aGUgdmlydHVhbCBjYWxscyBvZiBjb21wdXRlSW50cmluc2ljTG9naWNhbENvbnRl
bnRIZWlnaHRVc2luZy4KICAgICAgICAgTGF5b3V0VW5pdCBjb250ZW50U2l6ZTsKICAgICAgICAg
TGVuZ3RoIGNoaWxkQ3Jvc3NTaXplTGVuZ3RoID0gY3Jvc3NTaXplTGVuZ3RoRm9yQ2hpbGQoTWFp
bk9yUHJlZmVycmVkU2l6ZSwgY2hpbGQpOwotICAgICAgICBpZiAodXNlQ2hpbGRBc3BlY3RSYXRp
byhjaGlsZCkpCisgICAgICAgIGlmICh1c2VDaGlsZEFzcGVjdFJhdGlvKGNoaWxkKSkgLy8gfHwg
d2lsbENoaWxkQ3Jvc3NTaXplQmVDb250YWluZXJDcm9zc1NpemUoY2hpbGQpKQogICAgICAgICAg
ICAgY29udGVudFNpemUgPSBjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjaGls
ZCwgY2hpbGRDcm9zc1NpemVMZW5ndGgpOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICBjb250
ZW50U2l6ZSA9IGNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNoaWxkLCBNaW5TaXplLCBM
ZW5ndGgoTGVuZ3RoVHlwZTo6TWluQ29udGVudCkpLnZhbHVlT3IoMCk7CkBAIC0xMjIwLDIwICsx
MjM3LDE3IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmFkanVzdENoaWxkU2l6ZUZv
ck1pbkFuZE1heChjb25zdCBSZW5kZXJCb3gmIGNoaWxkCiAgICAgICAgICAgICBMYXlvdXRVbml0
IHJlc29sdmVkTWFpblNpemUgPSBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjaGlsZCwg
TWFpbk9yUHJlZmVycmVkU2l6ZSwgbWFpblNpemUpLnZhbHVlT3IoMCk7CiAgICAgICAgICAgICBB
U1NFUlQocmVzb2x2ZWRNYWluU2l6ZSA+PSAwKTsKICAgICAgICAgICAgIExheW91dFVuaXQgc3Bl
Y2lmaWVkU2l6ZSA9IHN0ZDo6bWluKHJlc29sdmVkTWFpblNpemUsIG1heEV4dGVudC52YWx1ZU9y
KHJlc29sdmVkTWFpblNpemUpKTsKLSAgICAgICAgICAgIHJldHVybiBzdGQ6Om1heChjaGlsZFNp
emUsIHN0ZDo6bWluKHNwZWNpZmllZFNpemUsIGNvbnRlbnRTaXplKSk7Ci0gICAgICAgIH0KLQot
ICAgICAgICBpZiAodXNlQ2hpbGRBc3BlY3RSYXRpbyhjaGlsZCkgfHwgY2hpbGRDcm9zc1NpemVT
aG91bGRVc2VDb250YWluZXJDcm9zc1NpemUoY2hpbGQpKSB7Ci0gICAgICAgICAgICBPcHRpb25h
bDxMYXlvdXRVbml0PiB0cmFuc2ZlcnJlZFNpemUgPSBjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0
UmF0aW9Vc2luZyhjaGlsZCwgY2hpbGRDcm9zc1NpemVMZW5ndGgpOwotICAgICAgICAgICAgaWYg
KHRyYW5zZmVycmVkU2l6ZSkgewotICAgICAgICAgICAgICAgIHRyYW5zZmVycmVkU2l6ZSA9IGFk
anVzdENoaWxkU2l6ZUZvckFzcGVjdFJhdGlvQ3Jvc3NBeGlzTWluQW5kTWF4KGNoaWxkLCB0cmFu
c2ZlcnJlZFNpemUudmFsdWUoKSk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHN0ZDo6bWF4KGNo
aWxkU2l6ZSwgc3RkOjptaW4odHJhbnNmZXJyZWRTaXplLnZhbHVlKCksIGNvbnRlbnRTaXplKSk7
Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KLQotICAgICAgICByZXR1cm4gc3RkOjptYXgoY2hp
bGRTaXplLCBjb250ZW50U2l6ZSk7CisgICAgICAgICAgICBjaGlsZFNpemUgPSBzdGQ6Om1heChj
aGlsZFNpemUsIHN0ZDo6bWluKHNwZWNpZmllZFNpemUsIGNvbnRlbnRTaXplKSk7CisgICAgICAg
IH0gZWxzZSBpZiAodXNlQ2hpbGRBc3BlY3RSYXRpbyhjaGlsZCkgfHwgd2lsbENoaWxkQ3Jvc3NT
aXplQmVDb250YWluZXJDcm9zc1NpemUoY2hpbGQpKSB7CisgICAgICAgICAgICBMYXlvdXRVbml0
IHRyYW5zZmVycmVkU2l6ZSA9IGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNo
aWxkLCBjaGlsZENyb3NzU2l6ZUxlbmd0aCk7CisgICAgICAgICAgICB0cmFuc2ZlcnJlZFNpemUg
PSBhZGp1c3RDaGlsZFNpemVGb3JBc3BlY3RSYXRpb0Nyb3NzQXhpc01pbkFuZE1heChjaGlsZCwg
dHJhbnNmZXJyZWRTaXplKTsKKyAgICAgICAgICAgIGNoaWxkU2l6ZSA9IHN0ZDo6bWF4KGNoaWxk
U2l6ZSwgc3RkOjptaW4odHJhbnNmZXJyZWRTaXplLCBjb250ZW50U2l6ZSkpOworICAgICAgICB9
IGVsc2UKKyAgICAgICAgICAgIGNoaWxkU2l6ZSA9IHN0ZDo6bWF4KGNoaWxkU2l6ZSwgY29udGVu
dFNpemUpOwogICAgIH0KLQorICAgIExlbmd0aCBjcm9zc01pbiA9IGNyb3NzU2l6ZUxlbmd0aEZv
ckNoaWxkKE1pblNpemUsIGNoaWxkKTsKKyAgICBpZiAoY2hpbGQuc3R5bGUoKS5oYXNBc3BlY3RS
YXRpbygpICYmICFjaGlsZE1haW5TaXplSXNEZWZpbml0ZShjaGlsZCwgZmxleEJhc2lzRm9yQ2hp
bGQoY2hpbGQpKSAmJiBjaGlsZENyb3NzU2l6ZUlzRGVmaW5pdGUoY2hpbGQsIGNyb3NzTWluKSkK
KyAgICAgICAgcmV0dXJuIHN0ZDo6bWF4KGNoaWxkU2l6ZSwgY29tcHV0ZU1haW5TaXplRnJvbUFz
cGVjdFJhdGlvVXNpbmcoY2hpbGQsIGNyb3NzTWluKSk7CiAgICAgcmV0dXJuIHN0ZDo6bWF4KDBf
bHUsIGNoaWxkU2l6ZSk7CiB9CiAgICAgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k
ZXJGbGV4aWJsZUJveC5oCmluZGV4IDY4MGRjZDdjMDM4MDQ3MmI0OTlhZDc0NGRlYTIxZDY4Yzdm
NGU5NDkuLmIxNzNlMmJhNWUwYTZhNjBmNTc5Zjk4Y2Y3Y2M5M2FiZDYxMzY0NzggMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCkBAIC0xNDIsNiArMTQy
LDcgQEAgcHJpdmF0ZToKICAgICBMYXlvdXRVbml0IGNyb3NzQXhpc1Njcm9sbGJhckV4dGVudCgp
IGNvbnN0OwogICAgIExheW91dFVuaXQgY3Jvc3NBeGlzU2Nyb2xsYmFyRXh0ZW50Rm9yQ2hpbGQo
Y29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3Q7CiAgICAgTGF5b3V0UG9pbnQgZmxvd0F3YXJl
TG9jYXRpb25Gb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdDsKKyAgICBib29s
IHdpbGxDaGlsZENyb3NzU2l6ZUJlQ29udGFpbmVyQ3Jvc3NTaXplKGNvbnN0IFJlbmRlckJveCYg
Y2hpbGQpIGNvbnN0OwogICAgIGJvb2wgdXNlQ2hpbGRBc3BlY3RSYXRpbyhjb25zdCBSZW5kZXJC
b3gmIGNoaWxkKSBjb25zdDsKICAgICBib29sIGNoaWxkQ3Jvc3NTaXplU2hvdWxkVXNlQ29udGFp
bmVyQ3Jvc3NTaXplKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0OwogICAgIExheW91dFVu
aXQgY29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoY29uc3QgUmVuZGVyQm94JiBj
aGlsZCwgTGVuZ3RoIGNyb3NzU2l6ZUxlbmd0aCkgY29uc3Q7CmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMWQzNWNmMTE1YTBj
NjlmMjg3MDdhZDkzYWEyYTUxNWY4N2RkMjkxYi4uNDBhM2EyMmU0MzU0NzI0NTkyMzJjZWJkNThj
MjEwMWI2YmIyOTU2NyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh
eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAzLTA4ICBSb2IgQnVp
cyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gaW4g
aW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1
Zy5jZ2k/aWQ9MjIwODYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK
KyAgICAgICAgRW5hYmxlIHRlc3RzIHRoYXQgcGFzcyBub3cuCisKKyAgICAgICAgKiBUZXN0RXhw
ZWN0YXRpb25zOgorCiAyMDIxLTAzLTA4ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CiAK
ICAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gaW4gaW50cmluc2ljIHNpemluZwpkaWZmIC0t
Z2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBl
Y3RhdGlvbnMKaW5kZXggN2FjY2MwNmM1NjI5OTA4ZmM0MGE0MTc5ZWZiOGVlODI4YWFiZTliMC4u
Y2IyZmFlOTY1ZWI2YTg3MGU4NGJlMmYxMmNlMzFlYjEzNzU0Mjc4YiAxMDA2NDQKLS0tIGEvTGF5
b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRp
b25zCkBAIC00MDYwLDcgKzQwNjAsNiBAQCB3ZWJraXQub3JnL2IvMjIxNDgwIGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2ZsZXhib3gtYnJlYQogIyBtaW4t
c2l6ZTphdXRvIGluIGZsZXhib3guCiB3ZWJraXQub3JnL2IvMjIxNDgxIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2ZsZXgtbWluaW11bS1oZWlnaHQtZmxl
eC1pdGVtcy0wMjYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIyMTQ4
MSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9mbGV4LW1p
bmltdW0taGVpZ2h0LWZsZXgtaXRlbXMtMDI5Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdl
YmtpdC5vcmcvYi8yMjE0ODEgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LWZsZXhib3gvZmxleC1taW5pbXVtLXdpZHRoLWZsZXgtaXRlbXMtMDE1Lmh0bWwgWyBJbWFnZU9u
bHlGYWlsdXJlIF0KIAogIyB2aXNpYmlsaXR5OmNvbGxhcHNlIGluIGZsZXggaXRlbXMuCiB3ZWJr
aXQub3JnL2IvMjIxNDgyIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1m
bGV4Ym94L2ZsZXhib3gtY29sbGFwc2VkLWl0ZW0tYmFzZWxpbmUtMDAxLmh0bWwgWyBJbWFnZU9u
bHlGYWlsdXJlIF0KQEAgLTQ1NjEsOCArNDU2MCw2IEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v
CiAjIGZsZXgtYmFzaXM6Y29udGVudAogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVj
dC1yYXRpby0wMjEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2
MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y
YXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Vi
a2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
c2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbCBbIEltYWdlT25s
eUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjYu
aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5z
aWMtc2l6ZS0wMDUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2
MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y
YXRpby9pbnRyaW5zaWMtc2l6ZS0wMDguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0
Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6
aW5nL2FzcGVjdC1yYXRpby90YWJsZS1lbGVtZW50LTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjctZXhw
ZWN0ZWQueGh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI3LWV4cGVjdGVk
LnhodApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwLi4wNWExMzc5NDQ4MmE5NGY2YzEwYmQ5ZDRjOTg3MDRlNjNlZjYwMzMx
Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI3
LWV4cGVjdGVkLnhodApAQCAtMCwwICsxLDE5IEBACis8IURPQ1RZUEUgaHRtbCBQVUJMSUMgIi0v
L1czQy8vRFREIFhIVE1MIDEuMCBTdHJpY3QvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvVFIveGh0
bWwxL0RURC94aHRtbDEtc3RyaWN0LmR0ZCI+Cis8aHRtbCB4bWxucz0iaHR0cDovL3d3dy53My5v
cmcvMTk5OS94aHRtbCI+CisgPGhlYWQ+CisgIDx0aXRsZT5DU1MgUmVmdGVzdCBSZWZlcmVuY2U8
L3RpdGxlPgorICA8bGluayByZWw9ImF1dGhvciIgdGl0bGU9IkfDqXJhcmQgVGFsYm90IiBocmVm
PSJodHRwOi8vd3d3Lmd0YWxib3Qub3JnL0Jyb3dzZXJCdWdzU2VjdGlvbi9jc3MyMXRlc3RzdWl0
ZS8iIC8+CisgIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+PCFbQ0RBVEFbCisgIGRpdgorICB7Cisg
IGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworICBoZWlnaHQ6IDEwMHB4OworICB3aWR0aDogMTAw
cHg7CisgIH0KKyAgXV0+PC9zdHlsZT4KKyA8L2hlYWQ+CisgPGJvZHk+CisgIDxwPlRlc3QgcGFz
c2VzIGlmIHRoZXJlIGlzIGEgZmlsbGVkIGdyZWVuIHNxdWFyZSBhbmQgPHN0cm9uZz5ubyByZWQ8
L3N0cm9uZz4uPC9wPgorICA8ZGl2PjwvZGl2PgorIDwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdp
dCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z
aXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNy5odG1sIGIvTGF5b3V0VGVz
dHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt
cmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI3Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k
ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYzEwZjFmM2Y3MDQ4
YmM4OTFlYzhkNzNhNzAzNDJhOTk0MjEzYjU2NQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl
c3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0
LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNy5odG1sCkBAIC0wLDAgKzEsMTYgQEAKKzwhRE9D
VFlQRSBodG1sPgorPHRpdGxlPkNTUyBhc3BlY3QtcmF0aW86IFJvdyBmbGV4Ym94IGFuZCB0cmFu
c2ZlcnJlZCBtaW4vbWF4LXNpemU8L3RpdGxlPgorPGxpbmsgcmVsPSJhdXRob3IiIHRpdGxlPSJH
b29nbGUgTExDIiBocmVmPSJodHRwczovL3d3dy5nb29nbGUuY29tLyI+Cis8bGluayByZWw9Imhl
bHAiIGhyZWY9Imh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3Mtc2l6aW5nLTQvI2FzcGVjdC1y
YXRpbyI+Cis8bGluayByZWw9Im1hdGNoIiBocmVmPSIuLi8uLi9yZWZlcmVuY2UvcmVmLWZpbGxl
ZC1ncmVlbi0xMDBweC1zcXVhcmUueGh0IiAvPgorCis8cD5UZXN0IHBhc3NlcyBpZiB0aGVyZSBp
cyBhIGZpbGxlZCBncmVlbiBzcXVhcmUgYW5kIDxzdHJvbmc+bm8gcmVkPC9zdHJvbmc+LjwvcD4K
KworPGRpdiBzdHlsZT0iZGlzcGxheTogZmxleDsgZmxleC1kaXJlY3Rpb246IHJvdzsiPgorICA8
ZGl2IHN0eWxlPSJiYWNrZ3JvdW5kOiBncmVlbjsgd2lkdGg6IDQwcHg7IGhlaWdodDogNTBweDsi
ID48L2Rpdj4KKyAgPGRpdiBzdHlsZT0iYmFja2dyb3VuZDogZ3JlZW47IHdpZHRoOiA2MHB4OyBt
YXgtaGVpZ2h0OiA1MHB4OyBhc3BlY3QtcmF0aW86IDEvMTsiPjwvZGl2PgorPC9kaXY+Cis8ZGl2
IHN0eWxlPSJkaXNwbGF5OiBmbGV4OyBmbGV4LWRpcmVjdGlvbjogcm93OyI+CisgIDxkaXYgc3R5
bGU9ImJhY2tncm91bmQ6IGdyZWVuOyB3aWR0aDogNDBweDsgaGVpZ2h0OiA1MHB4OyIgPjwvZGl2
PgorICA8ZGl2IHN0eWxlPSJiYWNrZ3JvdW5kOiBncmVlbjsgd2lkdGg6IDYwcHg7IGhlaWdodDog
NjBweDsgbWF4LWhlaWdodDogNTBweDsgYXNwZWN0LXJhdGlvOiAxLzE7Ij48L2Rpdj4KKzwvZGl2
Pgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>422809</attachid>
            <date>2021-03-10 01:38:55 -0800</date>
            <delta_ts>2021-03-10 03:00:03 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210310103854.patch</filename>
            <type>text/plain</type>
            <size>4821</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MjAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGE2MzEyNWRmMTQzNDc3
MTAwNmRlNDcyMmI1MWM3YjZiMjgxMjY5Yi4uMDYyOTQwYmMxMzA4Zjk4MDJhMDAxMjU1ZjFkNzIw
Njc4NTZjMzNhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTAzLTEwICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBNYWtlIGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nIHRha2UgaW50byBh
Y2NvdW50CisgICAgICAgIGJveC1zaXppbmcgZm9yIHRoZSBjYXNlIHdoZXJlIENTUyBhc3BlY3Qt
cmF0aW8gaXMgYXBwbGllZC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJv
eC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5T
aXplRnJvbUFzcGVjdFJhdGlvVXNpbmcgY29uc3QpOgorCiAyMDIxLTAzLTEwICBUaW0gSG9ydG9u
ICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbGVhc2UgYXNzZXJ0aW9u
IGZhaWx1cmVzIHVuZGVyIEVkaXRvcjo6c2NhblNlbGVjdGlvbkZvclRlbGVwaG9uZU51bWJlcnMK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5j
cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4
IDliYzYzNjI2MzlmZTEyZDVmNDkyMGVkODdjMjZhNTllYTU0ZWMwZjEuLmNjY2I4OTgyMTY5YmM1
NTcxODU5ZDk4MjViMjE0ZWE2ODNhYzg2ZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl
bmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy
aW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtNzkwLDkgKzc5MCw3IEBAIExheW91dFVuaXQg
UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNv
bnN0IFJlbmRlckJvCiB7CiAgICAgQVNTRVJUKGNoaWxkSGFzQXNwZWN0UmF0aW8oY2hpbGQpKTsK
IAotICAgIGF1dG8gYWRqdXN0Rm9yQm94U2l6aW5nID0gW3RoaXNdIChjb25zdCBSZW5kZXJCb3gm
IGJveCwgTGVuZ3RoIGxlbmd0aCkgLT4gTGF5b3V0VW5pdCB7Ci0gICAgICAgIEFTU0VSVChsZW5n
dGguaXNGaXhlZCgpKTsKLSAgICAgICAgYXV0byB2YWx1ZSA9IExheW91dFVuaXQobGVuZ3RoLnZh
bHVlKCkpOworICAgIGF1dG8gYWRqdXN0Rm9yQm94U2l6aW5nID0gW3RoaXNdIChjb25zdCBSZW5k
ZXJCb3gmIGJveCwgTGF5b3V0VW5pdCB2YWx1ZSkgLT4gTGF5b3V0VW5pdCB7CiAgICAgICAgIC8v
IFdlIG5lZWQgdG8gc3Vic3RyYWN0IHRoZSBib3JkZXIgYW5kIHBhZGRpbmcgZXh0ZW50IGZyb20g
dGhlIGNyb3NzIGF4aXMuCiAgICAgICAgIC8vIEZ1cnRoZXJtb3JlLCB0aGUgc2l6aW5nIGNhbGN1
bGF0aW9ucyB0aGF0IGZsb29yIHRoZSBjb250ZW50IGJveCBzaXplIGF0IHplcm8gd2hlbiBhcHBs
eWluZyBib3gtc2l6aW5nIGFyZSBhbHNvIGlnbm9yZWQuCiAgICAgICAgIC8vIGh0dHBzOi8vZHJh
ZnRzLmNzc3dnLm9yZy9jc3MtZmxleGJveC8jYWxnby1tYWluLWl0ZW0uCkBAIC04MDEsOSArNzk5
LDExIEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21B
c3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJvCiAgICAgICAgIHJldHVybiB2YWx1ZTsKICAg
ICB9OwogCi0gICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gY3Jvc3NTaXplOworICAgIC8vIGNyb3Nz
U2l6ZSBpcyBib3JkZXItYm94IHNpemUgaWYgYm94LXNpemluZyBpcyBib3JkZXItYm94LCBhbmQK
KyAgICAvLyBjb250ZW50LWJveCBvdGhlcndpc2UuCisgICAgTGF5b3V0VW5pdCBjcm9zc1NpemU7
CiAgICAgaWYgKGNyb3NzU2l6ZUxlbmd0aC5pc0ZpeGVkKCkpCi0gICAgICAgIGNyb3NzU2l6ZSA9
IGFkanVzdEZvckJveFNpemluZyhjaGlsZCwgY3Jvc3NTaXplTGVuZ3RoKTsKKyAgICAgICAgY3Jv
c3NTaXplID0gTGF5b3V0VW5pdChjcm9zc1NpemVMZW5ndGgudmFsdWUoKSk7CiAgICAgZWxzZSBp
ZiAoY3Jvc3NTaXplTGVuZ3RoLmlzQXV0bygpKSB7CiAgICAgICAgIEFTU0VSVChjaGlsZENyb3Nz
U2l6ZVNob3VsZFVzZUNvbnRhaW5lckNyb3NzU2l6ZShjaGlsZCkpOwogICAgICAgICBhdXRvIGNv
bnRhaW5lckNyb3NzU2l6ZUxlbmd0aCA9IGlzSG9yaXpvbnRhbEZsb3coKSA/IHN0eWxlKCkuaGVp
Z2h0KCkgOiBzdHlsZSgpLndpZHRoKCk7CkBAIC04MTIsMjIgKzgxMiwyOSBAQCBMYXlvdXRVbml0
IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhj
b25zdCBSZW5kZXJCbwogICAgICAgICBjcm9zc1NpemUgPSB2YWx1ZUZvckxlbmd0aChjb250YWlu
ZXJDcm9zc1NpemVMZW5ndGgsIC0xX2x1KTsKICAgICB9IGVsc2UgewogICAgICAgICBBU1NFUlQo
Y3Jvc3NTaXplTGVuZ3RoLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpKTsKLSAgICAgICAgY3Jvc3NT
aXplID0gbWFpbkF4aXNJc0NoaWxkSW5saW5lQXhpcyhjaGlsZCkgPyBjaGlsZC5jb21wdXRlUGVy
Y2VudGFnZUxvZ2ljYWxIZWlnaHQoY3Jvc3NTaXplTGVuZ3RoKSA6IGFkanVzdEJvcmRlckJveExv
Z2ljYWxXaWR0aEZvckJveFNpemluZyh2YWx1ZUZvckxlbmd0aChjcm9zc1NpemVMZW5ndGgsIGNv
bnRlbnRXaWR0aCgpKSwgY3Jvc3NTaXplTGVuZ3RoLnR5cGUoKSk7Ci0gICAgICAgIGlmICghY3Jv
c3NTaXplKQorICAgICAgICBPcHRpb25hbDxMYXlvdXRVbml0PiBjaGlsZFNpemUgPSBtYWluQXhp
c0lzQ2hpbGRJbmxpbmVBeGlzKGNoaWxkKSA/IGNoaWxkLmNvbXB1dGVQZXJjZW50YWdlTG9naWNh
bEhlaWdodChjcm9zc1NpemVMZW5ndGgpIDogdmFsdWVGb3JMZW5ndGgoY3Jvc3NTaXplTGVuZ3Ro
LCBjb250ZW50V2lkdGgoKSk7CisgICAgICAgIGlmICghY2hpbGRTaXplKQogICAgICAgICAgICAg
cmV0dXJuIDBfbHU7CisgICAgICAgIGNyb3NzU2l6ZSA9IGNoaWxkU2l6ZS52YWx1ZSgpOwogICAg
IH0KIAogICAgIGNvbnN0IExheW91dFNpemUmIGNoaWxkSW50cmluc2ljU2l6ZSA9IGNoaWxkLmlu
dHJpbnNpY1NpemUoKTsKICAgICBkb3VibGUgcmF0aW87Ci0gICAgaWYgKGNoaWxkLnN0eWxlKCku
YXNwZWN0UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpSYXRpbyB8fCAoY2hpbGQuc3R5
bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OkF1dG9BbmRSYXRpbyAm
JiBjaGlsZEludHJpbnNpY1NpemUuaXNFbXB0eSgpKSkKKyAgICBMYXlvdXRVbml0IGJvcmRlckFu
ZFBhZGRpbmc7CisgICAgaWYgKGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9UeXBlKCkgPT0gQXNw
ZWN0UmF0aW9UeXBlOjpSYXRpbyB8fCAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9
PSBBc3BlY3RSYXRpb1R5cGU6OkF1dG9BbmRSYXRpbyAmJiBjaGlsZEludHJpbnNpY1NpemUuaXNF
bXB0eSgpKSkgewogICAgICAgICByYXRpbyA9IGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9XaWR0
aCgpIC8gY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb0hlaWdodCgpOwotICAgIGVsc2UgeworICAg
ICAgICBpZiAoY2hpbGQuc3R5bGUoKS5ib3hTaXppbmdGb3JBc3BlY3RSYXRpbygpID09IEJveFNp
emluZzo6Q29udGVudEJveCkKKyAgICAgICAgICAgIGNyb3NzU2l6ZSAtPSBpc0hvcml6b250YWxG
bG93KCkgPyBjaGlsZC52ZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKSA6IGNoaWxkLmhv
cml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCk7CisgICAgICAgIGVsc2UKKyAgICAgICAg
ICAgIGJvcmRlckFuZFBhZGRpbmcgPSBpc0hvcml6b250YWxGbG93KCkgPyBjaGlsZC5ob3Jpem9u
dGFsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpIDogY2hpbGQudmVydGljYWxCb3JkZXJBbmRQYWRk
aW5nRXh0ZW50KCk7CisgICAgfSBlbHNlIHsKICAgICAgICAgQVNTRVJUKGNoaWxkSW50cmluc2lj
U2l6ZS5oZWlnaHQoKSk7CiAgICAgICAgIHJhdGlvID0gY2hpbGRJbnRyaW5zaWNTaXplLndpZHRo
KCkudG9GbG9hdCgpIC8gY2hpbGRJbnRyaW5zaWNTaXplLmhlaWdodCgpLnRvRmxvYXQoKTsKKyAg
ICAgICAgY3Jvc3NTaXplID0gYWRqdXN0Rm9yQm94U2l6aW5nKGNoaWxkLCBjcm9zc1NpemUpOwog
ICAgIH0KICAgICBpZiAoaXNIb3Jpem9udGFsRmxvdygpKQotICAgICAgICByZXR1cm4gTGF5b3V0
VW5pdChjcm9zc1NpemUudmFsdWUoKSAqIHJhdGlvKTsKLSAgICByZXR1cm4gTGF5b3V0VW5pdChj
cm9zc1NpemUudmFsdWUoKSAvIHJhdGlvKTsKKyAgICAgICAgcmV0dXJuIExheW91dFVuaXQoY3Jv
c3NTaXplICogcmF0aW8pIC0gYm9yZGVyQW5kUGFkZGluZzsKKyAgICByZXR1cm4gTGF5b3V0VW5p
dChjcm9zc1NpemUgLyByYXRpbykgLSBib3JkZXJBbmRQYWRkaW5nOwogfQogCiB2b2lkIFJlbmRl
ckZsZXhpYmxlQm94OjpzZXRGbG93QXdhcmVMb2NhdGlvbkZvckNoaWxkKFJlbmRlckJveCYgY2hp
bGQsIGNvbnN0IExheW91dFBvaW50JiBsb2NhdGlvbikK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>422811</attachid>
            <date>2021-03-10 03:00:09 -0800</date>
            <delta_ts>2021-05-21 02:27:37 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210310120008.patch</filename>
            <type>text/plain</type>
            <size>4886</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MjAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGE2MzEyNWRmMTQzNDc3
MTAwNmRlNDcyMmI1MWM3YjZiMjgxMjY5Yi4uMDYyOTQwYmMxMzA4Zjk4MDJhMDAxMjU1ZjFkNzIw
Njc4NTZjMzNhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTAzLTEwICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBNYWtlIGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nIHRha2UgaW50byBh
Y2NvdW50CisgICAgICAgIGJveC1zaXppbmcgZm9yIHRoZSBjYXNlIHdoZXJlIENTUyBhc3BlY3Qt
cmF0aW8gaXMgYXBwbGllZC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJv
eC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5T
aXplRnJvbUFzcGVjdFJhdGlvVXNpbmcgY29uc3QpOgorCiAyMDIxLTAzLTEwICBUaW0gSG9ydG9u
ICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbGVhc2UgYXNzZXJ0aW9u
IGZhaWx1cmVzIHVuZGVyIEVkaXRvcjo6c2NhblNlbGVjdGlvbkZvclRlbGVwaG9uZU51bWJlcnMK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5j
cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4
IDliYzYzNjI2MzlmZTEyZDVmNDkyMGVkODdjMjZhNTllYTU0ZWMwZjEuLjUzZTFmOGZjZDlmMTg5
YWU4MGJlMjM0Y2EwMTJlMzBlZGU5MzdkOWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl
bmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy
aW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtNzkwLDkgKzc5MCw3IEBAIExheW91dFVuaXQg
UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNv
bnN0IFJlbmRlckJvCiB7CiAgICAgQVNTRVJUKGNoaWxkSGFzQXNwZWN0UmF0aW8oY2hpbGQpKTsK
IAotICAgIGF1dG8gYWRqdXN0Rm9yQm94U2l6aW5nID0gW3RoaXNdIChjb25zdCBSZW5kZXJCb3gm
IGJveCwgTGVuZ3RoIGxlbmd0aCkgLT4gTGF5b3V0VW5pdCB7Ci0gICAgICAgIEFTU0VSVChsZW5n
dGguaXNGaXhlZCgpKTsKLSAgICAgICAgYXV0byB2YWx1ZSA9IExheW91dFVuaXQobGVuZ3RoLnZh
bHVlKCkpOworICAgIGF1dG8gYWRqdXN0Rm9yQm94U2l6aW5nID0gW3RoaXNdIChjb25zdCBSZW5k
ZXJCb3gmIGJveCwgTGF5b3V0VW5pdCB2YWx1ZSkgLT4gTGF5b3V0VW5pdCB7CiAgICAgICAgIC8v
IFdlIG5lZWQgdG8gc3Vic3RyYWN0IHRoZSBib3JkZXIgYW5kIHBhZGRpbmcgZXh0ZW50IGZyb20g
dGhlIGNyb3NzIGF4aXMuCiAgICAgICAgIC8vIEZ1cnRoZXJtb3JlLCB0aGUgc2l6aW5nIGNhbGN1
bGF0aW9ucyB0aGF0IGZsb29yIHRoZSBjb250ZW50IGJveCBzaXplIGF0IHplcm8gd2hlbiBhcHBs
eWluZyBib3gtc2l6aW5nIGFyZSBhbHNvIGlnbm9yZWQuCiAgICAgICAgIC8vIGh0dHBzOi8vZHJh
ZnRzLmNzc3dnLm9yZy9jc3MtZmxleGJveC8jYWxnby1tYWluLWl0ZW0uCkBAIC04MDEsOSArNzk5
LDExIEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21B
c3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJvCiAgICAgICAgIHJldHVybiB2YWx1ZTsKICAg
ICB9OwogCi0gICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gY3Jvc3NTaXplOworICAgIC8vIGNyb3Nz
U2l6ZSBpcyBib3JkZXItYm94IHNpemUgaWYgYm94LXNpemluZyBpcyBib3JkZXItYm94LCBhbmQK
KyAgICAvLyBjb250ZW50LWJveCBvdGhlcndpc2UuCisgICAgTGF5b3V0VW5pdCBjcm9zc1NpemU7
CiAgICAgaWYgKGNyb3NzU2l6ZUxlbmd0aC5pc0ZpeGVkKCkpCi0gICAgICAgIGNyb3NzU2l6ZSA9
IGFkanVzdEZvckJveFNpemluZyhjaGlsZCwgY3Jvc3NTaXplTGVuZ3RoKTsKKyAgICAgICAgY3Jv
c3NTaXplID0gTGF5b3V0VW5pdChjcm9zc1NpemVMZW5ndGgudmFsdWUoKSk7CiAgICAgZWxzZSBp
ZiAoY3Jvc3NTaXplTGVuZ3RoLmlzQXV0bygpKSB7CiAgICAgICAgIEFTU0VSVChjaGlsZENyb3Nz
U2l6ZVNob3VsZFVzZUNvbnRhaW5lckNyb3NzU2l6ZShjaGlsZCkpOwogICAgICAgICBhdXRvIGNv
bnRhaW5lckNyb3NzU2l6ZUxlbmd0aCA9IGlzSG9yaXpvbnRhbEZsb3coKSA/IHN0eWxlKCkuaGVp
Z2h0KCkgOiBzdHlsZSgpLndpZHRoKCk7CkBAIC04MTIsMjIgKzgxMiwyOSBAQCBMYXlvdXRVbml0
IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhj
b25zdCBSZW5kZXJCbwogICAgICAgICBjcm9zc1NpemUgPSB2YWx1ZUZvckxlbmd0aChjb250YWlu
ZXJDcm9zc1NpemVMZW5ndGgsIC0xX2x1KTsKICAgICB9IGVsc2UgewogICAgICAgICBBU1NFUlQo
Y3Jvc3NTaXplTGVuZ3RoLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpKTsKLSAgICAgICAgY3Jvc3NT
aXplID0gbWFpbkF4aXNJc0NoaWxkSW5saW5lQXhpcyhjaGlsZCkgPyBjaGlsZC5jb21wdXRlUGVy
Y2VudGFnZUxvZ2ljYWxIZWlnaHQoY3Jvc3NTaXplTGVuZ3RoKSA6IGFkanVzdEJvcmRlckJveExv
Z2ljYWxXaWR0aEZvckJveFNpemluZyh2YWx1ZUZvckxlbmd0aChjcm9zc1NpemVMZW5ndGgsIGNv
bnRlbnRXaWR0aCgpKSwgY3Jvc3NTaXplTGVuZ3RoLnR5cGUoKSk7Ci0gICAgICAgIGlmICghY3Jv
c3NTaXplKQorICAgICAgICBPcHRpb25hbDxMYXlvdXRVbml0PiBjaGlsZFNpemUgPSBtYWluQXhp
c0lzQ2hpbGRJbmxpbmVBeGlzKGNoaWxkKSA/IGNoaWxkLmNvbXB1dGVQZXJjZW50YWdlTG9naWNh
bEhlaWdodChjcm9zc1NpemVMZW5ndGgpIDogYWRqdXN0Qm9yZGVyQm94TG9naWNhbFdpZHRoRm9y
Qm94U2l6aW5nKHZhbHVlRm9yTGVuZ3RoKGNyb3NzU2l6ZUxlbmd0aCwgY29udGVudFdpZHRoKCkp
LCBjcm9zc1NpemVMZW5ndGgudHlwZSgpKTsKKyAgICAgICAgaWYgKCFjaGlsZFNpemUpCiAgICAg
ICAgICAgICByZXR1cm4gMF9sdTsKKyAgICAgICAgY3Jvc3NTaXplID0gY2hpbGRTaXplLnZhbHVl
KCk7CiAgICAgfQogCiAgICAgY29uc3QgTGF5b3V0U2l6ZSYgY2hpbGRJbnRyaW5zaWNTaXplID0g
Y2hpbGQuaW50cmluc2ljU2l6ZSgpOwogICAgIGRvdWJsZSByYXRpbzsKLSAgICBpZiAoY2hpbGQu
c3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OlJhdGlvIHx8IChj
aGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6QXV0b0Fu
ZFJhdGlvICYmIGNoaWxkSW50cmluc2ljU2l6ZS5pc0VtcHR5KCkpKQorICAgIExheW91dFVuaXQg
Ym9yZGVyQW5kUGFkZGluZzsKKyAgICBpZiAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUo
KSA9PSBBc3BlY3RSYXRpb1R5cGU6OlJhdGlvIHx8IChjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlv
VHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6QXV0b0FuZFJhdGlvICYmIGNoaWxkSW50cmluc2lj
U2l6ZS5pc0VtcHR5KCkpKSB7CiAgICAgICAgIHJhdGlvID0gY2hpbGQuc3R5bGUoKS5hc3BlY3RS
YXRpb1dpZHRoKCkgLyBjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvSGVpZ2h0KCk7Ci0gICAgZWxz
ZSB7CisgICAgICAgIGlmIChjaGlsZC5zdHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJhdGlvKCkg
PT0gQm94U2l6aW5nOjpDb250ZW50Qm94KQorICAgICAgICAgICAgY3Jvc3NTaXplIC09IGlzSG9y
aXpvbnRhbEZsb3coKSA/IGNoaWxkLnZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpIDog
Y2hpbGQuaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKTsKKyAgICAgICAgZWxzZQor
ICAgICAgICAgICAgYm9yZGVyQW5kUGFkZGluZyA9IGlzSG9yaXpvbnRhbEZsb3coKSA/IGNoaWxk
Lmhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCkgOiBjaGlsZC52ZXJ0aWNhbEJvcmRl
ckFuZFBhZGRpbmdFeHRlbnQoKTsKKyAgICB9IGVsc2UgewogICAgICAgICBBU1NFUlQoY2hpbGRJ
bnRyaW5zaWNTaXplLmhlaWdodCgpKTsKICAgICAgICAgcmF0aW8gPSBjaGlsZEludHJpbnNpY1Np
emUud2lkdGgoKS50b0Zsb2F0KCkgLyBjaGlsZEludHJpbnNpY1NpemUuaGVpZ2h0KCkudG9GbG9h
dCgpOworICAgICAgICBjcm9zc1NpemUgPSBhZGp1c3RGb3JCb3hTaXppbmcoY2hpbGQsIGNyb3Nz
U2l6ZSk7CiAgICAgfQogICAgIGlmIChpc0hvcml6b250YWxGbG93KCkpCi0gICAgICAgIHJldHVy
biBMYXlvdXRVbml0KGNyb3NzU2l6ZS52YWx1ZSgpICogcmF0aW8pOwotICAgIHJldHVybiBMYXlv
dXRVbml0KGNyb3NzU2l6ZS52YWx1ZSgpIC8gcmF0aW8pOworICAgICAgICByZXR1cm4gTGF5b3V0
VW5pdChjcm9zc1NpemUgKiByYXRpbykgLSBib3JkZXJBbmRQYWRkaW5nOworICAgIHJldHVybiBM
YXlvdXRVbml0KGNyb3NzU2l6ZSAvIHJhdGlvKSAtIGJvcmRlckFuZFBhZGRpbmc7CiB9CiAKIHZv
aWQgUmVuZGVyRmxleGlibGVCb3g6OnNldEZsb3dBd2FyZUxvY2F0aW9uRm9yQ2hpbGQoUmVuZGVy
Qm94JiBjaGlsZCwgY29uc3QgTGF5b3V0UG9pbnQmIGxvY2F0aW9uKQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>429277</attachid>
            <date>2021-05-21 02:27:42 -0700</date>
            <delta_ts>2021-05-21 04:13:04 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210521112741.patch</filename>
            <type>text/plain</type>
            <size>16741</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3ODUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGYxZTVhYTExM2JmZjY0
ZGQyMTZhZGZkODAxMWNkZjVhMjFlOWExYi4uYjExNDkzY2UzMzg4ZjYzNWM4MjQ0YzY3OGVhNTc1
ZDU4MmYwM2M2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTA1LTIxICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBNYWtlIGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nIHRha2UgaW50byBh
Y2NvdW50CisgICAgICAgIGJveC1zaXppbmcgZm9yIHRoZSBjYXNlIHdoZXJlIENTUyBhc3BlY3Qt
cmF0aW8gaXMgYXBwbGllZC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJv
eC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5T
aXplRnJvbUFzcGVjdFJhdGlvVXNpbmcgY29uc3QpOgorCiAyMDIxLTA1LTIwICBDaHJpcyBEdW1l
eiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IGxvY2tpbmcgaW4gUGxhdGZvcm1D
QUxheWVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGli
bGVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNw
cAppbmRleCBlOTBkYzFhOGFkMmMxMjQwOGQ4MDI2NGZmZDE3YmNhOTBkMmE5MjM5Li40NzdlOGEy
YWFiMWMzMGE1NWE1YmUzMTlkYTc3Y2Q5MGJjOTViZWIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKQEAgLTgwOCw5ICs4MDgsNyBAQCBMYXlv
dXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9V
c2luZyhjb25zdCBSZW5kZXJCbwogewogICAgIEFTU0VSVChjaGlsZEhhc0FzcGVjdFJhdGlvKGNo
aWxkKSk7CiAKLSAgICBhdXRvIGFkanVzdEZvckJveFNpemluZyA9IFt0aGlzXSAoY29uc3QgUmVu
ZGVyQm94JiBib3gsIExlbmd0aCBsZW5ndGgpIC0+IExheW91dFVuaXQgewotICAgICAgICBBU1NF
UlQobGVuZ3RoLmlzRml4ZWQoKSk7Ci0gICAgICAgIGF1dG8gdmFsdWUgPSBMYXlvdXRVbml0KGxl
bmd0aC52YWx1ZSgpKTsKKyAgICBhdXRvIGFkanVzdEZvckJveFNpemluZyA9IFt0aGlzXSAoY29u
c3QgUmVuZGVyQm94JiBib3gsIExheW91dFVuaXQgdmFsdWUpIC0+IExheW91dFVuaXQgewogICAg
ICAgICAvLyBXZSBuZWVkIHRvIHN1YnN0cmFjdCB0aGUgYm9yZGVyIGFuZCBwYWRkaW5nIGV4dGVu
dCBmcm9tIHRoZSBjcm9zcyBheGlzLgogICAgICAgICAvLyBGdXJ0aGVybW9yZSwgdGhlIHNpemlu
ZyBjYWxjdWxhdGlvbnMgdGhhdCBmbG9vciB0aGUgY29udGVudCBib3ggc2l6ZSBhdCB6ZXJvIHdo
ZW4gYXBwbHlpbmcgYm94LXNpemluZyBhcmUgYWxzbyBpZ25vcmVkLgogICAgICAgICAvLyBodHRw
czovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLWZsZXhib3gvI2FsZ28tbWFpbi1pdGVtLgpAQCAtODE5
LDkgKzgxNywxMSBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpblNp
emVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjb25zdCBSZW5kZXJCbwogICAgICAgICByZXR1cm4gdmFs
dWU7CiAgICAgfTsKIAotICAgIE9wdGlvbmFsPExheW91dFVuaXQ+IGNyb3NzU2l6ZTsKKyAgICAv
LyBjcm9zc1NpemUgaXMgYm9yZGVyLWJveCBzaXplIGlmIGJveC1zaXppbmcgaXMgYm9yZGVyLWJv
eCwgYW5kCisgICAgLy8gY29udGVudC1ib3ggb3RoZXJ3aXNlLgorICAgIExheW91dFVuaXQgY3Jv
c3NTaXplOwogICAgIGlmIChjcm9zc1NpemVMZW5ndGguaXNGaXhlZCgpKQotICAgICAgICBjcm9z
c1NpemUgPSBhZGp1c3RGb3JCb3hTaXppbmcoY2hpbGQsIGNyb3NzU2l6ZUxlbmd0aCk7CisgICAg
ICAgIGNyb3NzU2l6ZSA9IExheW91dFVuaXQoY3Jvc3NTaXplTGVuZ3RoLnZhbHVlKCkpOwogICAg
IGVsc2UgaWYgKGNyb3NzU2l6ZUxlbmd0aC5pc0F1dG8oKSkgewogICAgICAgICBBU1NFUlQoY2hp
bGRDcm9zc1NpemVTaG91bGRVc2VDb250YWluZXJDcm9zc1NpemUoY2hpbGQpKTsKICAgICAgICAg
YXV0byBjb250YWluZXJDcm9zc1NpemVMZW5ndGggPSBpc0hvcml6b250YWxGbG93KCkgPyBzdHls
ZSgpLmhlaWdodCgpIDogc3R5bGUoKS53aWR0aCgpOwpAQCAtODMwLDIyICs4MzAsMjkgQEAgTGF5
b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlv
VXNpbmcoY29uc3QgUmVuZGVyQm8KICAgICAgICAgY3Jvc3NTaXplID0gc3RkOjptYXgoMF9sdSwg
dmFsdWVGb3JMZW5ndGgoY29udGFpbmVyQ3Jvc3NTaXplTGVuZ3RoLCAtMV9sdSkgLSBjcm9zc0F4
aXNNYXJnaW5FeHRlbnRGb3JDaGlsZChjaGlsZCkpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIEFT
U0VSVChjcm9zc1NpemVMZW5ndGguaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkpOwotICAgICAgICBj
cm9zc1NpemUgPSBtYWluQXhpc0lzQ2hpbGRJbmxpbmVBeGlzKGNoaWxkKSA/IGNoaWxkLmNvbXB1
dGVQZXJjZW50YWdlTG9naWNhbEhlaWdodChjcm9zc1NpemVMZW5ndGgpIDogYWRqdXN0Qm9yZGVy
Qm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKHZhbHVlRm9yTGVuZ3RoKGNyb3NzU2l6ZUxlbmd0
aCwgY29udGVudFdpZHRoKCkpLCBjcm9zc1NpemVMZW5ndGgudHlwZSgpKTsKLSAgICAgICAgaWYg
KCFjcm9zc1NpemUpCisgICAgICAgIE9wdGlvbmFsPExheW91dFVuaXQ+IGNoaWxkU2l6ZSA9IG1h
aW5BeGlzSXNDaGlsZElubGluZUF4aXMoY2hpbGQpID8gY2hpbGQuY29tcHV0ZVBlcmNlbnRhZ2VM
b2dpY2FsSGVpZ2h0KGNyb3NzU2l6ZUxlbmd0aCkgOiBhZGp1c3RCb3JkZXJCb3hMb2dpY2FsV2lk
dGhGb3JCb3hTaXppbmcodmFsdWVGb3JMZW5ndGgoY3Jvc3NTaXplTGVuZ3RoLCBjb250ZW50V2lk
dGgoKSksIGNyb3NzU2l6ZUxlbmd0aC50eXBlKCkpOworICAgICAgICBpZiAoIWNoaWxkU2l6ZSkK
ICAgICAgICAgICAgIHJldHVybiAwX2x1OworICAgICAgICBjcm9zc1NpemUgPSBjaGlsZFNpemUu
dmFsdWUoKTsKICAgICB9CiAKICAgICBjb25zdCBMYXlvdXRTaXplJiBjaGlsZEludHJpbnNpY1Np
emUgPSBjaGlsZC5pbnRyaW5zaWNTaXplKCk7CiAgICAgZG91YmxlIHJhdGlvOwotICAgIGlmIChj
aGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6UmF0aW8g
fHwgKGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpB
dXRvQW5kUmF0aW8gJiYgY2hpbGRJbnRyaW5zaWNTaXplLmlzRW1wdHkoKSkpCisgICAgTGF5b3V0
VW5pdCBib3JkZXJBbmRQYWRkaW5nOworICAgIGlmIChjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlv
VHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6UmF0aW8gfHwgKGNoaWxkLnN0eWxlKCkuYXNwZWN0
UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpBdXRvQW5kUmF0aW8gJiYgY2hpbGRJbnRy
aW5zaWNTaXplLmlzRW1wdHkoKSkpIHsKICAgICAgICAgcmF0aW8gPSBjaGlsZC5zdHlsZSgpLmFz
cGVjdFJhdGlvV2lkdGgoKSAvIGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9IZWlnaHQoKTsKLSAg
ICBlbHNlIHsKKyAgICAgICAgaWYgKGNoaWxkLnN0eWxlKCkuYm94U2l6aW5nRm9yQXNwZWN0UmF0
aW8oKSA9PSBCb3hTaXppbmc6OkNvbnRlbnRCb3gpCisgICAgICAgICAgICBjcm9zc1NpemUgLT0g
aXNIb3Jpem9udGFsRmxvdygpID8gY2hpbGQudmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50
KCkgOiBjaGlsZC5ob3Jpem9udGFsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpOworICAgICAgICBl
bHNlCisgICAgICAgICAgICBib3JkZXJBbmRQYWRkaW5nID0gaXNIb3Jpem9udGFsRmxvdygpID8g
Y2hpbGQuaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKSA6IGNoaWxkLnZlcnRpY2Fs
Qm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpOworICAgIH0gZWxzZSB7CiAgICAgICAgIEFTU0VSVChj
aGlsZEludHJpbnNpY1NpemUuaGVpZ2h0KCkpOwogICAgICAgICByYXRpbyA9IGNoaWxkSW50cmlu
c2ljU2l6ZS53aWR0aCgpLnRvRmxvYXQoKSAvIGNoaWxkSW50cmluc2ljU2l6ZS5oZWlnaHQoKS50
b0Zsb2F0KCk7CisgICAgICAgIGNyb3NzU2l6ZSA9IGFkanVzdEZvckJveFNpemluZyhjaGlsZCwg
Y3Jvc3NTaXplKTsKICAgICB9CiAgICAgaWYgKGlzSG9yaXpvbnRhbEZsb3coKSkKLSAgICAgICAg
cmV0dXJuIExheW91dFVuaXQoY3Jvc3NTaXplLnZhbHVlKCkgKiByYXRpbyk7Ci0gICAgcmV0dXJu
IExheW91dFVuaXQoY3Jvc3NTaXplLnZhbHVlKCkgLyByYXRpbyk7CisgICAgICAgIHJldHVybiBM
YXlvdXRVbml0KGNyb3NzU2l6ZSAqIHJhdGlvKSAtIGJvcmRlckFuZFBhZGRpbmc7CisgICAgcmV0
dXJuIExheW91dFVuaXQoY3Jvc3NTaXplIC8gcmF0aW8pIC0gYm9yZGVyQW5kUGFkZGluZzsKIH0K
IAogdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6c2V0Rmxvd0F3YXJlTG9jYXRpb25Gb3JDaGlsZChS
ZW5kZXJCb3gmIGNoaWxkLCBjb25zdCBMYXlvdXRQb2ludCYgbG9jYXRpb24pCmRpZmYgLS1naXQg
YS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0
ZWQvdzNjL0NoYW5nZUxvZwppbmRleCAwZTBjMDYwMDcyOWQ1NTFlNjlmOWFlYzE0ZTk0Njc4Yzk3
ZDc4YjQ4Li40ZTM4NTU0N2RjZGRkMjAwZDMxOTAyYWQ5YzY1MjZlOTBmZjJmZjA2IDEwMDY0NAot
LS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz
L2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMS0wNS0yMSAgUm9i
IEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIEZpeCBmbGV4LWFzcGVjdC1yYXRp
by0wMjUrMjYuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MjIyMzU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Zs
ZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1sOgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWw6CisK
IDIwMjEtMDUtMjAgIEFsZXhleSBTaHZheWthICA8c2h2YWlrYWxlc2hAZ21haWwuY29tPgogCiAg
ICAgICAgIFtXZWJJRExdIFJlbW92ZSBbSW1wbGljaXRUaGlzXSBhbmQgW0N1c3RvbVByb3h5VG9K
U09iamVjdF0gZXh0ZW5kZWQgYXR0cmlidXRlcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v
ZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1y
YXRpby0wMjUuaHRtbAppbmRleCBjNGZmODExMGQ3YmVkNzA3OWM4NjRkZGYxOTJmODI0MjkzMmU1
ODhkLi5iZjhkYWFhMzVmMDhhNDEyODIyZGQ0MWU3NDk5MDI1ZTQwNjVlMjg0IDEwMDY0NAotLS0g
YS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6
aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbAorKysgYi9MYXlvdXRU
ZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj
dC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbApAQCAtNCw2ICs0LDggQEAKICAgPGxp
bmsgcmVsPSJhdXRob3IiIHRpdGxlPSJUaW5nLVl1IExpbiIgaHJlZj0ibWFpbHRvOnRsaW5AbW96
aWxsYS5jb20iPgogICA8bGluayByZWw9ImF1dGhvciIgdGl0bGU9Ik1vemlsbGEiIGhyZWY9Imh0
dHBzOi8vd3d3Lm1vemlsbGEub3JnLyI+CiAgIDxsaW5rIHJlbD0iaGVscCIgaHJlZj0iaHR0cHM6
Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1zaXppbmctNC8jYXNwZWN0LXJhdGlvIj4KKyAgPGxpbmsg
cmVsPSJoZWxwIiBocmVmPSJodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLXNpemluZy00LyNh
c3BlY3QtcmF0aW8tbWluaW11bSI+CisgIDxsaW5rIHJlbD0iaGVscCIgaHJlZj0iaHR0cHM6Ly9k
cmFmdHMuY3Nzd2cub3JnL2Nzcy1mbGV4Ym94LTEvI21pbi1zaXplLWF1dG8iPgogICA8bGluayBy
ZWw9Im1hdGNoIiBocmVmPSIuLi8uLi9yZWZlcmVuY2UvcmVmLWZpbGxlZC1ncmVlbi0yMDBweC1z
cXVhcmUuaHRtbCIgLz4KICAgPHN0eWxlPgogICAuZmxleENvbnRhaW5lciB7CkBAIC0yMSwyOCAr
MjMsMzggQEAKIAogICA8cD5UZXN0IHBhc3NlcyBpZiB0aGVyZSBpcyBhIGZpbGxlZCBncmVlbiBz
cXVhcmUgYW5kIDxzdHJvbmc+bm8gcmVkPC9zdHJvbmc+LjwvcD4KIAorICA8IS0tIEluIGFsbCBv
ZiB0aGUgc3VidGVzdHMgaGVyZSwgZWFjaCBmbGV4IGl0ZW0ncyBhdXRvbWF0aWMgbWluaW11bSB3
aWR0aCBpcworICAgICAgIHJlc29sdmVkIGRpcmVjdGx5IGZyb20gaXRzIGNvbnRlbnQgc2l6ZSBz
dWdnZXN0aW9uLiBOb3RhYmx5LCB0aGVzZSBpdGVtcworICAgICAgICpkbyBub3QqIGdldCBhICJ0
cmFuc2ZlcnJlZCBzaXplIHN1Z2dlc3Rpb24iLCBiZWNhdXNlIHRoZXkgYXJlIGFsbAorICAgICAg
ICpub24tcmVwbGFjZWQqIGVsZW1lbnRzOyBhbmQgInRyYW5zZmVycmVkIHNpemUgc3VnZ2VzdGlv
biIgaXMgb25seSB1c2VkCisgICAgICAgZm9yIHJlc29sdmluZyBhdXRvbWF0aWMgbWluaW11bSBz
aXplcyBvbiAqcmVwbGFjZWQqIGVsZW1lbnRzLiBIb3dldmVyLAorICAgICAgIG5vdGUgdGhhdCB3
ZSBkbyAidHJhbnNmZXIiIHNpemVzIHRocm91Z2ggdGhlIGFzcGVjdCByYXRpbywgYXMgcGFydCBv
ZgorICAgICAgIGNvbXB1dGluZyB0aGUgY29udGVudCBzaXplIHN1Z2dlc3Rpb24gYW5kL29yIGZs
ZXggYmFzZSBzaXplLiAtLT4KKwogICA8IS0tIEluIHRoZSBmb2xsb3dpbmcgZm91ciBmbGV4IGNv
bnRhaW5lcnMsIHRoZSBhc3BlY3QtcmF0aW8gd29ya3Mgd2l0aCBib3JkZXItYm94LiAtLT4KICAg
PGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciIgc3R5bGU9IndpZHRoOiBhdXRvOyI+CiAgICAgPCEt
LSBUaGUgYm9yZGVyLWJveCBoZWlnaHQgMjVweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBh
eGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBmbGV4IGJhc2Ugc2l6ZSBvZiAyMDBw
eC4gLS0+CisgICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIGZsZXggYmFzZSBzaXplIChib3Jk
ZXItYm94KSBvZiAyMDBweC4gLS0+CiAgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi13
aWR0aDowOyBoZWlnaHQ6IDI1cHg7IGFzcGVjdC1yYXRpbzogOC8xOyI+PC9kaXY+CiAgIDwvZGl2
PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgotICAgIDwhLS0gVGhlIGJvcmRlci1i
b3ggaGVpZ2h0IDI1cHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAg
IHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLXdpZHRoOmF1dG8gb2YgMjAwcHguIC0tPgorICAgIDwh
LS0gVGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIChib3JkZXItYm94KSBpcyAyMDBweCBiZWNh
dXNlIHRoZQorICAgICAgICAgYm9yZGVyLWJveCBoZWlnaHQgMjVweCBpcyB0cmFuc2ZlcnJlZCB0
byB0aGUgbWFpbiBheGlzLiAtLT4KICAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0iaGVpZ2h0
OiAyNXB4OyBhc3BlY3QtcmF0aW86IDgvMTsiPjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2IGNs
YXNzPSJmbGV4Q29udGFpbmVyIj4KLSAgICA8IS0tIFRoZSBib3JkZXItYm94IG1pbi1oZWlnaHQg
MjVweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcg
YSByZXNvbHZlZCBtaW4td2lkdGg6YXV0byBvZiAyMDBweC4gLS0+CisgICAgPCEtLSBUaGUgY29u
dGVudCBzaXplIHN1Z2dlc3Rpb24gKGJvcmRlci1ib3gpIGlzIDIwMHB4IGJlY2F1c2UgdGhlCisg
ICAgICAgICBib3JkZXItYm94IGhlaWdodCAyNXB4IChlbmZvcmNlZCBieSBtaW4taGVpZ2h0KSBp
cyB0cmFuc2ZlcnJlZCB0byB0aGUKKyAgICAgICAgIG1haW4gYXhpcy4gLS0+CiAgICAgPGRpdiBj
bGFzcz0iaXRlbSIgc3R5bGU9Im1pbi1oZWlnaHQ6IDI1cHg7IGFzcGVjdC1yYXRpbzogOC8xOyI+
PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgotICAgIDwh
LS0gVGhlIGJvcmRlci1ib3ggaGVpZ2h0IDI1cHggKGNsYW1wZWQgYnkgbWF4LWhlaWdodCkgaXMg
dHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2
ZWQgbWluLXdpZHRoOmF1dG8gb2YgMjAwcHguIC0tPgorICAgIDwhLS0gVGhlIGNvbnRlbnQgc2l6
ZSBzdWdnZXN0aW9uIChib3JkZXItYm94KSBpcyAyMDBweCBiZWNhdXNlIHRoZQorICAgICAgICAg
Ym9yZGVyLWJveCBoZWlnaHQgMjVweCAoY2xhbXBlZCBieSBtYXgtaGVpZ2h0KSBpcyB0cmFuc2Zl
cnJlZCB0byB0aGUKKyAgICAgICAgIG1haW4gYXhpcy4gLS0+CiAgICAgPGRpdiBjbGFzcz0iaXRl
bSIgc3R5bGU9Im1heC1oZWlnaHQ6IDI1cHg7IGhlaWdodDogMTAwcHg7IGFzcGVjdC1yYXRpbzog
OC8xOyI+PC9kaXY+CiAgIDwvZGl2PgogCkBAIC01MCwyNSArNjIsMjcgQEAKICAgICAgICBiZWNh
dXNlIGl0cyB2YWx1ZSBjb250YWlucyAnYXV0bycuIC0tPgogICA8ZGl2IGNsYXNzPSJmbGV4Q29u
dGFpbmVyIiBzdHlsZT0id2lkdGg6IGF1dG87Ij4KICAgICA8IS0tIFRoZSBjb250ZW50LWJveCBo
ZWlnaHQgMTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWll
bGRpbmcgYSByZXNvbHZlZCBmbGV4IGJhc2Ugc2l6ZSBvZiAxOTBweC4gLS0+CisgICAgICAgICB5
aWVsZGluZyBhIHJlc29sdmVkIGZsZXggYmFzZSBzaXplIChjb250ZW50LWJveCkgb2YgMTkwcHgu
IC0tPgogICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4td2lkdGg6MDsgaGVpZ2h0OiAy
NXB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMTkvMTsiPjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2
IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAgICA8IS0tIFRoZSBjb250ZW50LWJveCBoZWlnaHQg
MTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcg
YSByZXNvbHZlZCBtaW4td2lkdGg6YXV0byBvZiAxOTBweC4gLS0+CisgICAgPCEtLSBUaGUgY29u
dGVudCBzaXplIHN1Z2dlc3Rpb24gKGNvbnRlbnQtYm94KSBpcyAxOTBweCBiZWNhdXNlIHRoZQor
ICAgICAgICAgY29udGVudC1ib3ggaGVpZ2h0IDEwcHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1h
aW4gYXhpcy4gLS0+CiAgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9ImhlaWdodDogMjVweDsg
YXNwZWN0LXJhdGlvOiBhdXRvIDE5LzE7Ij48L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRpdiBjbGFz
cz0iZmxleENvbnRhaW5lciI+Ci0gICAgPCEtLSBUaGUgY29udGVudC1ib3ggbWluLWhlaWdodCAx
MHB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBh
IHJlc29sdmVkIG1pbi13aWR0aDphdXRvIG9mIDE5MHB4LiAtLT4KKyAgICA8IS0tIFRoZSBjb250
ZW50IHNpemUgc3VnZ2VzdGlvbiAoY29udGVudC1ib3gpIGlzIDE5MHB4IGJlY2F1c2UgdGhlCisg
ICAgICAgICBjb250ZW50LWJveCBoZWlnaHQgMTBweCAoZW5mb3JjZWQgYnkgbWluLWhlaWdodCkg
aXMgdHJhbnNmZXJyZWQgdG8gdGhlCisgICAgICAgICBtYWluIGF4aXMuIC0tPgogICAgIDxkaXYg
Y2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4taGVpZ2h0OiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1dG8g
MTkvMTsiPjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4K
LSAgICA8IS0tIFRoZSBjb250ZW50LWJveCBoZWlnaHQgMTBweCAoY2xhbXBlZCBieSBtYXgtaGVp
Z2h0KSBpcyB0cmFuc2ZlcnJlZAotICAgICAgICAgdG8gdGhlIG1haW4gYXhpcywgeWllbGRpbmcg
YSByZXNvbHZlZCBtaW4td2lkdGg6YXV0byBvZiAxOTBweC4gLS0+CisgICAgPCEtLSBUaGUgY29u
dGVudCBzaXplIHN1Z2dlc3Rpb24gKGNvbnRlbnQtYm94KSBpcyAxOTBweCBiZWNhdXNlIHRoZQor
ICAgICAgICAgY29udGVudC1ib3ggaGVpZ2h0IDEwcHggKGNsYW1wZWQgYnkgbWF4LWhlaWdodCkg
aXMgdHJhbnNmZXJyZWQgdG8gdGhlCisgICAgICAgICBtYWluIGF4aXMuIC0tPgogICAgIDxkaXYg
Y2xhc3M9Iml0ZW0iIHN0eWxlPSJtYXgtaGVpZ2h0OiAyNXB4OyBoZWlnaHQ6IDEwMHB4OyBhc3Bl
Y3QtcmF0aW86IGF1dG8gMTkvMTsiPjwvZGl2PgogICA8L2Rpdj4KIDwvaHRtbD4KZGlmZiAtLWdp
dCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z
aXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sIGIvTGF5b3V0VGVz
dHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt
cmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwKaW5kZXggYzRhMjUwODE4YmI3Nzg2ZTJm
Mzk1OTIyZDI4ZTNjNzUxOWI0ZWEzYS4uZmY2YmYyYWE1NjkwNTUxODA4Yjk4ZTcxMTdlYzY1ZDkx
NzhhMzQyNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2
Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwKQEAg
LTQsNiArNCw4IEBACiAgIDxsaW5rIHJlbD0iYXV0aG9yIiB0aXRsZT0iVGluZy1ZdSBMaW4iIGhy
ZWY9Im1haWx0bzp0bGluQG1vemlsbGEuY29tIj4KICAgPGxpbmsgcmVsPSJhdXRob3IiIHRpdGxl
PSJNb3ppbGxhIiBocmVmPSJodHRwczovL3d3dy5tb3ppbGxhLm9yZy8iPgogICA8bGluayByZWw9
ImhlbHAiIGhyZWY9Imh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3Mtc2l6aW5nLTQvI2FzcGVj
dC1yYXRpbyI+CisgIDxsaW5rIHJlbD0iaGVscCIgaHJlZj0iaHR0cHM6Ly9kcmFmdHMuY3Nzd2cu
b3JnL2Nzcy1zaXppbmctNC8jYXNwZWN0LXJhdGlvLW1pbmltdW0iPgorICA8bGluayByZWw9Imhl
bHAiIGhyZWY9Imh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZmxleGJveC0xLyNtaW4tc2l6
ZS1hdXRvIj4KICAgPGxpbmsgcmVsPSJtYXRjaCIgaHJlZj0iLi4vLi4vcmVmZXJlbmNlL3JlZi1m
aWxsZWQtZ3JlZW4tMjAwcHgtc3F1YXJlLmh0bWwiIC8+CiAgIDxzdHlsZT4KICAgLmZsZXhDb250
YWluZXIgewpAQCAtMTksNjAgKzIxLDc0IEBACiAgICAgYm94LXNpemluZzogYm9yZGVyLWJveDsK
ICAgfQogICAuaXRlbSA+IGRpdiB7Ci0gICAgaGVpZ2h0OiA1MDBweDsgLyogU2V0IGEgbGFyZ2Ug
Y29udGVudCBzaXplIHN1Z2dlc3Rpb24gZm9yIGZsZXggaXRlbS4gKi8KKyAgICBoZWlnaHQ6IDE5
MHB4OyAvKiBTZXQgdGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIGZvciBmbGV4IGl0ZW0uICov
CiAgIH0KICAgPC9zdHlsZT4KIAogICA8cD5UZXN0IHBhc3NlcyBpZiB0aGVyZSBpcyBhIGZpbGxl
ZCBncmVlbiBzcXVhcmUgYW5kIDxzdHJvbmc+bm8gcmVkPC9zdHJvbmc+LjwvcD4KIAorICA8IS0t
IEluIGFsbCBvZiB0aGUgc3VidGVzdHMgaGVyZSwgZWFjaCBmbGV4IGl0ZW0ncyBhdXRvbWF0aWMg
bWluaW11bSBoZWlnaHQgaXMKKyAgICAgICByZXNvbHZlZCBkaXJlY3RseSBmcm9tIGl0cyBjb250
ZW50IHNpemUgc3VnZ2VzdGlvbi4gTm90YWJseSwgdGhlc2UgaXRlbXMKKyAgICAgICAqZG8gbm90
KiBnZXQgYSAidHJhbnNmZXJyZWQgc2l6ZSBzdWdnZXN0aW9uIiwgYmVjYXVzZSB0aGV5IGFyZSBh
bGwKKyAgICAgICAqbm9uLXJlcGxhY2VkKiBlbGVtZW50czsgYW5kICJ0cmFuc2ZlcnJlZCBzaXpl
IHN1Z2dlc3Rpb24iIGlzIG9ubHkgdXNlZAorICAgICAgIGZvciByZXNvbHZpbmcgYXV0b21hdGlj
IG1pbmltdW0gc2l6ZXMgb24gKnJlcGxhY2VkKiBlbGVtZW50cy4gSG93ZXZlciwKKyAgICAgICBu
b3RlIHRoYXQgd2UgZG8gInRyYW5zZmVyIiBzaXplcyB0aHJvdWdoIHRoZSBhc3BlY3QgcmF0aW8s
IGFzIHBhcnQgb2YKKyAgICAgICBjb21wdXRpbmcgdGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9u
IGFuZC9vciBmbGV4IGJhc2Ugc2l6ZS4gLS0+CisKICAgPCEtLSBJbiB0aGUgZm9sbG93aW5nIGZv
dXIgZmxleCBjb250YWluZXJzLCB0aGUgYXNwZWN0LXJhdGlvIHdvcmtzIHdpdGggYm9yZGVyLWJv
eC4gLS0+CiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiIHN0eWxlPSJoZWlnaHQ6IGF1dG87
Ij4KICAgICA8IS0tIFRoZSBib3JkZXItYm94IHdpZHRoIDI1cHggaXMgdHJhbnNmZXJyZWQgdG8g
dGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgZmxleCBiYXNlIHNp
emUgb2YgMjAwcHguIC0tPgorICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBmbGV4IGJhc2Ug
c2l6ZSAoYm9yZGVyLWJveCkgb2YgMjAwcHguIC0tPgogICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0
eWxlPSJtaW4taGVpZ2h0OjA7IHdpZHRoOiAyNXB4OyBhc3BlY3QtcmF0aW86IDEvODsiPjxkaXY+
PC9kaXY+PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgot
ICAgIDwhLS0gVGhlIGJvcmRlci1ib3ggd2lkdGggMjVweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUg
bWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8g
b2YgMjAwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJ3aWR0aDogMjVweDsg
YXNwZWN0LXJhdGlvOiAxLzg7Ij48ZGl2PjwvZGl2PjwvZGl2PgorICAgIDwhLS0gVGhlIGNvbnRl
bnQgc2l6ZSBzdWdnZXN0aW9uIGlzIDE5MHB4LCBpLmUuIHRoZSBoZWlnaHQgb2YgdGhlIGl0ZW0n
cworICAgICAgICAgY2hpbGQgZGl2LiAtLT4KKyAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0i
d2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogMS8xOyI+PGRpdj48L2Rpdj48L2Rpdj4KICAgPC9k
aXY+CiAKICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciI+Ci0gICAgPCEtLSBUaGUgYm9yZGVy
LWJveCBtaW4td2lkdGggMjVweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAg
ICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8gb2YgMjAwcHguIC0tPgot
ICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4td2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRp
bzogMS84OyI+PGRpdj48L2Rpdj48L2Rpdj4KKyAgICA8IS0tIFRoZSBjb250ZW50IHNpemUgc3Vn
Z2VzdGlvbiBpcyAxOTBweCwgaS5lLiB0aGUgaGVpZ2h0IG9mIHRoZSBpdGVtJ3MKKyAgICAgICAg
IGNoaWxkIGRpdi4gLS0+CisgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi13aWR0aDog
MjVweDsgYXNwZWN0LXJhdGlvOiAxLzE7Ij48ZGl2PjwvZGl2PjwvZGl2PgogICA8L2Rpdj4KIAog
ICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAgICA8IS0tIFRoZSBib3JkZXItYm94IHdp
ZHRoIDI1cHggKGNsYW1wZWQgYnkgbWF4LXdpZHRoKSBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFp
biBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8gb2Yg
MjAwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtYXgtd2lkdGg6IDI1cHg7
IHdpZHRoOiAxMDBweDsgYXNwZWN0LXJhdGlvOiAxLzg7Ij48ZGl2PjwvZGl2PjwvZGl2PgorICAg
IDwhLS0gVGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIGlzIDIwMHB4IGJlY2F1c2UgdGhlIGJv
cmRlci1ib3ggbWF4LXdpZHRoCisgICAgICAgICAyNXB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBt
YWluIGF4aXMgYXMgdGhlIHVwcGVyIGJvdW5kIG9mIGl0cworICAgICAgICAgYm9yZGVyLWJveCBo
ZWlnaHQuIC0tPgorICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtYXgtd2lkdGg6IDI1cHg7
IHdpZHRoOiAxMDBweDsgYXNwZWN0LXJhdGlvOiAxLzg7Ij4KKyAgICAgIDxkaXYgc3R5bGU9Imhl
aWdodDogNTAwcHgiPjwvZGl2PgorICAgIDwvZGl2PgogICA8L2Rpdj4KIAogICA8IS0tIEluIHRo
ZSBmb2xsb3dpbmcgZm91ciBmbGV4IGNvbnRhaW5lcnMsIHRoZSBhc3BlY3QtcmF0aW8gd29ya3Mg
d2l0aCBjb250ZW50LWJveAogICAgICAgIGJlY2F1c2UgaXRzIHZhbHVlIGNvbnRhaW5zICdhdXRv
Jy4gLS0+CiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiIHN0eWxlPSJoZWlnaHQ6IGF1dG87
Ij4KICAgICA8IS0tIFRoZSBjb250ZW50LWJveCB3aWR0aCAxMHB4IGlzIHRyYW5zZmVycmVkIHRv
IHRoZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIGZsZXggYmFzZSBz
aXplIG9mIDE5MHB4LiAtLT4KKyAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgZmxleCBiYXNl
IHNpemUgKGNvbnRlbnQtYm94KSBvZiAxOTBweC4gLS0+CiAgICAgPGRpdiBjbGFzcz0iaXRlbSIg
c3R5bGU9Im1pbi1oZWlnaHQ6MDsgd2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE5
OyI+PGRpdj48L2Rpdj48L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRpdiBjbGFzcz0iZmxleENvbnRh
aW5lciI+Ci0gICAgPCEtLSBUaGUgY29udGVudC1ib3ggd2lkdGggMTBweCBpcyB0cmFuc2ZlcnJl
ZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVp
Z2h0OmF1dG8gb2YgMTkwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJ3aWR0
aDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEvMTk7Ij48ZGl2PjwvZGl2PjwvZGl2PgorICAg
IDwhLS0gVGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIGlzIDE5MHB4LCBpLmUuIHRoZSBoZWln
aHQgb2YgdGhlIGl0ZW0ncworICAgICAgICAgY2hpbGQgZGl2LiAtLT4KKyAgICA8ZGl2IGNsYXNz
PSJpdGVtIiBzdHlsZT0id2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE7Ij48ZGl2
PjwvZGl2PjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4K
LSAgICA8IS0tIFRoZSBjb250ZW50LWJveCBtaW4td2lkdGggMTBweCBpcyB0cmFuc2ZlcnJlZCB0
byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0
OmF1dG8gb2YgMTkwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4td2lk
dGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE5OyI+PGRpdj48L2Rpdj48L2Rpdj4KKyAg
ICA8IS0tIFRoZSBjb250ZW50IHNpemUgc3VnZ2VzdGlvbiBpcyAxOTBweCwgaS5lLiB0aGUgaGVp
Z2h0IG9mIHRoZSBpdGVtJ3MKKyAgICAgICAgIGNoaWxkIGRpdi4gLS0+CisgICAgPGRpdiBjbGFz
cz0iaXRlbSIgc3R5bGU9Im1pbi13aWR0aDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEvMTsi
PjxkaXY+PC9kaXY+PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWlu
ZXIiPgotICAgIDwhLS0gVGhlIGNvbnRlbnQtYm94IHdpZHRoIDEwcHggKGNsYW1wZWQgYnkgbWF4
LXdpZHRoKSBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRp
bmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8gb2YgMTkwcHguIC0tPgotICAgIDxkaXYgY2xh
c3M9Iml0ZW0iIHN0eWxlPSJtYXgtd2lkdGg6IDI1cHg7IHdpZHRoOiAxMDBweDsgYXNwZWN0LXJh
dGlvOiBhdXRvIDEvMTk7Ij48ZGl2PjwvZGl2PjwvZGl2PgorICAgIDwhLS0gVGhlIGNvbnRlbnQg
c2l6ZSBzdWdnZXN0aW9uIGlzIDE5MHB4IGJlY2F1c2UgdGhlIGNvbnRlbnQtYm94IG1heC13aWR0
aAorICAgICAgICAgMTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzIGFzIHRoZSB1
cHBlciBib3VuZCBvZiBpdHMKKyAgICAgICAgIGNvbnRlbnQtYm94IGhlaWdodC4tLT4KKyAgICA8
ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWF4LXdpZHRoOiAyNXB4OyB3aWR0aDogMTAwcHg7IGFz
cGVjdC1yYXRpbzogYXV0byAxLzE5OyI+CisgICAgICA8ZGl2IHN0eWxlPSJoZWlnaHQ6IDUwMHB4
Ij48L2Rpdj4KKyAgICA8L2Rpdj4KICAgPC9kaXY+CiA8L2h0bWw+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>429282</attachid>
            <date>2021-05-21 04:13:11 -0700</date>
            <delta_ts>2021-05-21 10:40:42 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210521131309.patch</filename>
            <type>text/plain</type>
            <size>16741</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3ODUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGYxZTVhYTExM2JmZjY0
ZGQyMTZhZGZkODAxMWNkZjVhMjFlOWExYi4uYjExNDkzY2UzMzg4ZjYzNWM4MjQ0YzY3OGVhNTc1
ZDU4MmYwM2M2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTA1LTIxICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBNYWtlIGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nIHRha2UgaW50byBh
Y2NvdW50CisgICAgICAgIGJveC1zaXppbmcgZm9yIHRoZSBjYXNlIHdoZXJlIENTUyBhc3BlY3Qt
cmF0aW8gaXMgYXBwbGllZC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJv
eC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5T
aXplRnJvbUFzcGVjdFJhdGlvVXNpbmcgY29uc3QpOgorCiAyMDIxLTA1LTIwICBDaHJpcyBEdW1l
eiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IGxvY2tpbmcgaW4gUGxhdGZvcm1D
QUxheWVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGli
bGVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNw
cAppbmRleCBlOTBkYzFhOGFkMmMxMjQwOGQ4MDI2NGZmZDE3YmNhOTBkMmE5MjM5Li40NzdlOGEy
YWFiMWMzMGE1NWE1YmUzMTlkYTc3Y2Q5MGJjOTViZWIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKQEAgLTgwOCw5ICs4MDgsNyBAQCBMYXlv
dXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9V
c2luZyhjb25zdCBSZW5kZXJCbwogewogICAgIEFTU0VSVChjaGlsZEhhc0FzcGVjdFJhdGlvKGNo
aWxkKSk7CiAKLSAgICBhdXRvIGFkanVzdEZvckJveFNpemluZyA9IFt0aGlzXSAoY29uc3QgUmVu
ZGVyQm94JiBib3gsIExlbmd0aCBsZW5ndGgpIC0+IExheW91dFVuaXQgewotICAgICAgICBBU1NF
UlQobGVuZ3RoLmlzRml4ZWQoKSk7Ci0gICAgICAgIGF1dG8gdmFsdWUgPSBMYXlvdXRVbml0KGxl
bmd0aC52YWx1ZSgpKTsKKyAgICBhdXRvIGFkanVzdEZvckJveFNpemluZyA9IFt0aGlzXSAoY29u
c3QgUmVuZGVyQm94JiBib3gsIExheW91dFVuaXQgdmFsdWUpIC0+IExheW91dFVuaXQgewogICAg
ICAgICAvLyBXZSBuZWVkIHRvIHN1YnN0cmFjdCB0aGUgYm9yZGVyIGFuZCBwYWRkaW5nIGV4dGVu
dCBmcm9tIHRoZSBjcm9zcyBheGlzLgogICAgICAgICAvLyBGdXJ0aGVybW9yZSwgdGhlIHNpemlu
ZyBjYWxjdWxhdGlvbnMgdGhhdCBmbG9vciB0aGUgY29udGVudCBib3ggc2l6ZSBhdCB6ZXJvIHdo
ZW4gYXBwbHlpbmcgYm94LXNpemluZyBhcmUgYWxzbyBpZ25vcmVkLgogICAgICAgICAvLyBodHRw
czovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLWZsZXhib3gvI2FsZ28tbWFpbi1pdGVtLgpAQCAtODE5
LDkgKzgxNywxMSBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpblNp
emVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjb25zdCBSZW5kZXJCbwogICAgICAgICByZXR1cm4gdmFs
dWU7CiAgICAgfTsKIAotICAgIE9wdGlvbmFsPExheW91dFVuaXQ+IGNyb3NzU2l6ZTsKKyAgICAv
LyBjcm9zc1NpemUgaXMgYm9yZGVyLWJveCBzaXplIGlmIGJveC1zaXppbmcgaXMgYm9yZGVyLWJv
eCwgYW5kCisgICAgLy8gY29udGVudC1ib3ggb3RoZXJ3aXNlLgorICAgIExheW91dFVuaXQgY3Jv
c3NTaXplOwogICAgIGlmIChjcm9zc1NpemVMZW5ndGguaXNGaXhlZCgpKQotICAgICAgICBjcm9z
c1NpemUgPSBhZGp1c3RGb3JCb3hTaXppbmcoY2hpbGQsIGNyb3NzU2l6ZUxlbmd0aCk7CisgICAg
ICAgIGNyb3NzU2l6ZSA9IExheW91dFVuaXQoY3Jvc3NTaXplTGVuZ3RoLnZhbHVlKCkpOwogICAg
IGVsc2UgaWYgKGNyb3NzU2l6ZUxlbmd0aC5pc0F1dG8oKSkgewogICAgICAgICBBU1NFUlQoY2hp
bGRDcm9zc1NpemVTaG91bGRVc2VDb250YWluZXJDcm9zc1NpemUoY2hpbGQpKTsKICAgICAgICAg
YXV0byBjb250YWluZXJDcm9zc1NpemVMZW5ndGggPSBpc0hvcml6b250YWxGbG93KCkgPyBzdHls
ZSgpLmhlaWdodCgpIDogc3R5bGUoKS53aWR0aCgpOwpAQCAtODMwLDIyICs4MzAsMjkgQEAgTGF5
b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlv
VXNpbmcoY29uc3QgUmVuZGVyQm8KICAgICAgICAgY3Jvc3NTaXplID0gc3RkOjptYXgoMF9sdSwg
dmFsdWVGb3JMZW5ndGgoY29udGFpbmVyQ3Jvc3NTaXplTGVuZ3RoLCAtMV9sdSkgLSBjcm9zc0F4
aXNNYXJnaW5FeHRlbnRGb3JDaGlsZChjaGlsZCkpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIEFT
U0VSVChjcm9zc1NpemVMZW5ndGguaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkpOwotICAgICAgICBj
cm9zc1NpemUgPSBtYWluQXhpc0lzQ2hpbGRJbmxpbmVBeGlzKGNoaWxkKSA/IGNoaWxkLmNvbXB1
dGVQZXJjZW50YWdlTG9naWNhbEhlaWdodChjcm9zc1NpemVMZW5ndGgpIDogYWRqdXN0Qm9yZGVy
Qm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKHZhbHVlRm9yTGVuZ3RoKGNyb3NzU2l6ZUxlbmd0
aCwgY29udGVudFdpZHRoKCkpLCBjcm9zc1NpemVMZW5ndGgudHlwZSgpKTsKLSAgICAgICAgaWYg
KCFjcm9zc1NpemUpCisgICAgICAgIE9wdGlvbmFsPExheW91dFVuaXQ+IGNoaWxkU2l6ZSA9IG1h
aW5BeGlzSXNDaGlsZElubGluZUF4aXMoY2hpbGQpID8gY2hpbGQuY29tcHV0ZVBlcmNlbnRhZ2VM
b2dpY2FsSGVpZ2h0KGNyb3NzU2l6ZUxlbmd0aCkgOiBhZGp1c3RCb3JkZXJCb3hMb2dpY2FsV2lk
dGhGb3JCb3hTaXppbmcodmFsdWVGb3JMZW5ndGgoY3Jvc3NTaXplTGVuZ3RoLCBjb250ZW50V2lk
dGgoKSksIGNyb3NzU2l6ZUxlbmd0aC50eXBlKCkpOworICAgICAgICBpZiAoIWNoaWxkU2l6ZSkK
ICAgICAgICAgICAgIHJldHVybiAwX2x1OworICAgICAgICBjcm9zc1NpemUgPSBjaGlsZFNpemUu
dmFsdWUoKTsKICAgICB9CiAKICAgICBjb25zdCBMYXlvdXRTaXplJiBjaGlsZEludHJpbnNpY1Np
emUgPSBjaGlsZC5pbnRyaW5zaWNTaXplKCk7CiAgICAgZG91YmxlIHJhdGlvOwotICAgIGlmIChj
aGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6UmF0aW8g
fHwgKGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpB
dXRvQW5kUmF0aW8gJiYgY2hpbGRJbnRyaW5zaWNTaXplLmlzRW1wdHkoKSkpCisgICAgTGF5b3V0
VW5pdCBib3JkZXJBbmRQYWRkaW5nOworICAgIGlmIChjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlv
VHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6UmF0aW8gfHwgKGNoaWxkLnN0eWxlKCkuYXNwZWN0
UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpBdXRvQW5kUmF0aW8gJiYgY2hpbGRJbnRy
aW5zaWNTaXplLmlzRW1wdHkoKSkpIHsKICAgICAgICAgcmF0aW8gPSBjaGlsZC5zdHlsZSgpLmFz
cGVjdFJhdGlvV2lkdGgoKSAvIGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9IZWlnaHQoKTsKLSAg
ICBlbHNlIHsKKyAgICAgICAgaWYgKGNoaWxkLnN0eWxlKCkuYm94U2l6aW5nRm9yQXNwZWN0UmF0
aW8oKSA9PSBCb3hTaXppbmc6OkNvbnRlbnRCb3gpCisgICAgICAgICAgICBjcm9zc1NpemUgLT0g
aXNIb3Jpem9udGFsRmxvdygpID8gY2hpbGQudmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50
KCkgOiBjaGlsZC5ob3Jpem9udGFsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpOworICAgICAgICBl
bHNlCisgICAgICAgICAgICBib3JkZXJBbmRQYWRkaW5nID0gaXNIb3Jpem9udGFsRmxvdygpID8g
Y2hpbGQuaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKSA6IGNoaWxkLnZlcnRpY2Fs
Qm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpOworICAgIH0gZWxzZSB7CiAgICAgICAgIEFTU0VSVChj
aGlsZEludHJpbnNpY1NpemUuaGVpZ2h0KCkpOwogICAgICAgICByYXRpbyA9IGNoaWxkSW50cmlu
c2ljU2l6ZS53aWR0aCgpLnRvRmxvYXQoKSAvIGNoaWxkSW50cmluc2ljU2l6ZS5oZWlnaHQoKS50
b0Zsb2F0KCk7CisgICAgICAgIGNyb3NzU2l6ZSA9IGFkanVzdEZvckJveFNpemluZyhjaGlsZCwg
Y3Jvc3NTaXplKTsKICAgICB9CiAgICAgaWYgKGlzSG9yaXpvbnRhbEZsb3coKSkKLSAgICAgICAg
cmV0dXJuIExheW91dFVuaXQoY3Jvc3NTaXplLnZhbHVlKCkgKiByYXRpbyk7Ci0gICAgcmV0dXJu
IExheW91dFVuaXQoY3Jvc3NTaXplLnZhbHVlKCkgLyByYXRpbyk7CisgICAgICAgIHJldHVybiBM
YXlvdXRVbml0KGNyb3NzU2l6ZSAqIHJhdGlvKSAtIGJvcmRlckFuZFBhZGRpbmc7CisgICAgcmV0
dXJuIExheW91dFVuaXQoY3Jvc3NTaXplIC8gcmF0aW8pIC0gYm9yZGVyQW5kUGFkZGluZzsKIH0K
IAogdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6c2V0Rmxvd0F3YXJlTG9jYXRpb25Gb3JDaGlsZChS
ZW5kZXJCb3gmIGNoaWxkLCBjb25zdCBMYXlvdXRQb2ludCYgbG9jYXRpb24pCmRpZmYgLS1naXQg
YS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0
ZWQvdzNjL0NoYW5nZUxvZwppbmRleCAwZTBjMDYwMDcyOWQ1NTFlNjlmOWFlYzE0ZTk0Njc4Yzk3
ZDc4YjQ4Li40ZTM4NTU0N2RjZGRkMjAwZDMxOTAyYWQ5YzY1MjZlOTBmZjJmZjA2IDEwMDY0NAot
LS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz
L2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMS0wNS0yMSAgUm9i
IEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIEZpeCBmbGV4LWFzcGVjdC1yYXRp
by0wMjUrMjYuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MjIyMzU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Zs
ZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1sOgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWw6CisK
IDIwMjEtMDUtMjAgIEFsZXhleSBTaHZheWthICA8c2h2YWlrYWxlc2hAZ21haWwuY29tPgogCiAg
ICAgICAgIFtXZWJJRExdIFJlbW92ZSBbSW1wbGljaXRUaGlzXSBhbmQgW0N1c3RvbVByb3h5VG9K
U09iamVjdF0gZXh0ZW5kZWQgYXR0cmlidXRlcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v
ZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1y
YXRpby0wMjUuaHRtbAppbmRleCBjNGZmODExMGQ3YmVkNzA3OWM4NjRkZGYxOTJmODI0MjkzMmU1
ODhkLi5iZjhkYWFhMzVmMDhhNDEyODIyZGQ0MWU3NDk5MDI1ZTQwNjVlMjg0IDEwMDY0NAotLS0g
YS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6
aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbAorKysgYi9MYXlvdXRU
ZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj
dC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbApAQCAtNCw2ICs0LDggQEAKICAgPGxp
bmsgcmVsPSJhdXRob3IiIHRpdGxlPSJUaW5nLVl1IExpbiIgaHJlZj0ibWFpbHRvOnRsaW5AbW96
aWxsYS5jb20iPgogICA8bGluayByZWw9ImF1dGhvciIgdGl0bGU9Ik1vemlsbGEiIGhyZWY9Imh0
dHBzOi8vd3d3Lm1vemlsbGEub3JnLyI+CiAgIDxsaW5rIHJlbD0iaGVscCIgaHJlZj0iaHR0cHM6
Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1zaXppbmctNC8jYXNwZWN0LXJhdGlvIj4KKyAgPGxpbmsg
cmVsPSJoZWxwIiBocmVmPSJodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLXNpemluZy00LyNh
c3BlY3QtcmF0aW8tbWluaW11bSI+CisgIDxsaW5rIHJlbD0iaGVscCIgaHJlZj0iaHR0cHM6Ly9k
cmFmdHMuY3Nzd2cub3JnL2Nzcy1mbGV4Ym94LTEvI21pbi1zaXplLWF1dG8iPgogICA8bGluayBy
ZWw9Im1hdGNoIiBocmVmPSIuLi8uLi9yZWZlcmVuY2UvcmVmLWZpbGxlZC1ncmVlbi0yMDBweC1z
cXVhcmUuaHRtbCIgLz4KICAgPHN0eWxlPgogICAuZmxleENvbnRhaW5lciB7CkBAIC0yMSwyOCAr
MjMsMzggQEAKIAogICA8cD5UZXN0IHBhc3NlcyBpZiB0aGVyZSBpcyBhIGZpbGxlZCBncmVlbiBz
cXVhcmUgYW5kIDxzdHJvbmc+bm8gcmVkPC9zdHJvbmc+LjwvcD4KIAorICA8IS0tIEluIGFsbCBv
ZiB0aGUgc3VidGVzdHMgaGVyZSwgZWFjaCBmbGV4IGl0ZW0ncyBhdXRvbWF0aWMgbWluaW11bSB3
aWR0aCBpcworICAgICAgIHJlc29sdmVkIGRpcmVjdGx5IGZyb20gaXRzIGNvbnRlbnQgc2l6ZSBz
dWdnZXN0aW9uLiBOb3RhYmx5LCB0aGVzZSBpdGVtcworICAgICAgICpkbyBub3QqIGdldCBhICJ0
cmFuc2ZlcnJlZCBzaXplIHN1Z2dlc3Rpb24iLCBiZWNhdXNlIHRoZXkgYXJlIGFsbAorICAgICAg
ICpub24tcmVwbGFjZWQqIGVsZW1lbnRzOyBhbmQgInRyYW5zZmVycmVkIHNpemUgc3VnZ2VzdGlv
biIgaXMgb25seSB1c2VkCisgICAgICAgZm9yIHJlc29sdmluZyBhdXRvbWF0aWMgbWluaW11bSBz
aXplcyBvbiAqcmVwbGFjZWQqIGVsZW1lbnRzLiBIb3dldmVyLAorICAgICAgIG5vdGUgdGhhdCB3
ZSBkbyAidHJhbnNmZXIiIHNpemVzIHRocm91Z2ggdGhlIGFzcGVjdCByYXRpbywgYXMgcGFydCBv
ZgorICAgICAgIGNvbXB1dGluZyB0aGUgY29udGVudCBzaXplIHN1Z2dlc3Rpb24gYW5kL29yIGZs
ZXggYmFzZSBzaXplLiAtLT4KKwogICA8IS0tIEluIHRoZSBmb2xsb3dpbmcgZm91ciBmbGV4IGNv
bnRhaW5lcnMsIHRoZSBhc3BlY3QtcmF0aW8gd29ya3Mgd2l0aCBib3JkZXItYm94LiAtLT4KICAg
PGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciIgc3R5bGU9IndpZHRoOiBhdXRvOyI+CiAgICAgPCEt
LSBUaGUgYm9yZGVyLWJveCBoZWlnaHQgMjVweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBh
eGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBmbGV4IGJhc2Ugc2l6ZSBvZiAyMDBw
eC4gLS0+CisgICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIGZsZXggYmFzZSBzaXplIChib3Jk
ZXItYm94KSBvZiAyMDBweC4gLS0+CiAgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi13
aWR0aDowOyBoZWlnaHQ6IDI1cHg7IGFzcGVjdC1yYXRpbzogOC8xOyI+PC9kaXY+CiAgIDwvZGl2
PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgotICAgIDwhLS0gVGhlIGJvcmRlci1i
b3ggaGVpZ2h0IDI1cHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAg
IHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLXdpZHRoOmF1dG8gb2YgMjAwcHguIC0tPgorICAgIDwh
LS0gVGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIChib3JkZXItYm94KSBpcyAyMDBweCBiZWNh
dXNlIHRoZQorICAgICAgICAgYm9yZGVyLWJveCBoZWlnaHQgMjVweCBpcyB0cmFuc2ZlcnJlZCB0
byB0aGUgbWFpbiBheGlzLiAtLT4KICAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0iaGVpZ2h0
OiAyNXB4OyBhc3BlY3QtcmF0aW86IDgvMTsiPjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2IGNs
YXNzPSJmbGV4Q29udGFpbmVyIj4KLSAgICA8IS0tIFRoZSBib3JkZXItYm94IG1pbi1oZWlnaHQg
MjVweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcg
YSByZXNvbHZlZCBtaW4td2lkdGg6YXV0byBvZiAyMDBweC4gLS0+CisgICAgPCEtLSBUaGUgY29u
dGVudCBzaXplIHN1Z2dlc3Rpb24gKGJvcmRlci1ib3gpIGlzIDIwMHB4IGJlY2F1c2UgdGhlCisg
ICAgICAgICBib3JkZXItYm94IGhlaWdodCAyNXB4IChlbmZvcmNlZCBieSBtaW4taGVpZ2h0KSBp
cyB0cmFuc2ZlcnJlZCB0byB0aGUKKyAgICAgICAgIG1haW4gYXhpcy4gLS0+CiAgICAgPGRpdiBj
bGFzcz0iaXRlbSIgc3R5bGU9Im1pbi1oZWlnaHQ6IDI1cHg7IGFzcGVjdC1yYXRpbzogOC8xOyI+
PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgotICAgIDwh
LS0gVGhlIGJvcmRlci1ib3ggaGVpZ2h0IDI1cHggKGNsYW1wZWQgYnkgbWF4LWhlaWdodCkgaXMg
dHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2
ZWQgbWluLXdpZHRoOmF1dG8gb2YgMjAwcHguIC0tPgorICAgIDwhLS0gVGhlIGNvbnRlbnQgc2l6
ZSBzdWdnZXN0aW9uIChib3JkZXItYm94KSBpcyAyMDBweCBiZWNhdXNlIHRoZQorICAgICAgICAg
Ym9yZGVyLWJveCBoZWlnaHQgMjVweCAoY2xhbXBlZCBieSBtYXgtaGVpZ2h0KSBpcyB0cmFuc2Zl
cnJlZCB0byB0aGUKKyAgICAgICAgIG1haW4gYXhpcy4gLS0+CiAgICAgPGRpdiBjbGFzcz0iaXRl
bSIgc3R5bGU9Im1heC1oZWlnaHQ6IDI1cHg7IGhlaWdodDogMTAwcHg7IGFzcGVjdC1yYXRpbzog
OC8xOyI+PC9kaXY+CiAgIDwvZGl2PgogCkBAIC01MCwyNSArNjIsMjcgQEAKICAgICAgICBiZWNh
dXNlIGl0cyB2YWx1ZSBjb250YWlucyAnYXV0bycuIC0tPgogICA8ZGl2IGNsYXNzPSJmbGV4Q29u
dGFpbmVyIiBzdHlsZT0id2lkdGg6IGF1dG87Ij4KICAgICA8IS0tIFRoZSBjb250ZW50LWJveCBo
ZWlnaHQgMTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWll
bGRpbmcgYSByZXNvbHZlZCBmbGV4IGJhc2Ugc2l6ZSBvZiAxOTBweC4gLS0+CisgICAgICAgICB5
aWVsZGluZyBhIHJlc29sdmVkIGZsZXggYmFzZSBzaXplIChjb250ZW50LWJveCkgb2YgMTkwcHgu
IC0tPgogICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4td2lkdGg6MDsgaGVpZ2h0OiAy
NXB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMTkvMTsiPjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2
IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAgICA8IS0tIFRoZSBjb250ZW50LWJveCBoZWlnaHQg
MTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcg
YSByZXNvbHZlZCBtaW4td2lkdGg6YXV0byBvZiAxOTBweC4gLS0+CisgICAgPCEtLSBUaGUgY29u
dGVudCBzaXplIHN1Z2dlc3Rpb24gKGNvbnRlbnQtYm94KSBpcyAxOTBweCBiZWNhdXNlIHRoZQor
ICAgICAgICAgY29udGVudC1ib3ggaGVpZ2h0IDEwcHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1h
aW4gYXhpcy4gLS0+CiAgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9ImhlaWdodDogMjVweDsg
YXNwZWN0LXJhdGlvOiBhdXRvIDE5LzE7Ij48L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRpdiBjbGFz
cz0iZmxleENvbnRhaW5lciI+Ci0gICAgPCEtLSBUaGUgY29udGVudC1ib3ggbWluLWhlaWdodCAx
MHB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBh
IHJlc29sdmVkIG1pbi13aWR0aDphdXRvIG9mIDE5MHB4LiAtLT4KKyAgICA8IS0tIFRoZSBjb250
ZW50IHNpemUgc3VnZ2VzdGlvbiAoY29udGVudC1ib3gpIGlzIDE5MHB4IGJlY2F1c2UgdGhlCisg
ICAgICAgICBjb250ZW50LWJveCBoZWlnaHQgMTBweCAoZW5mb3JjZWQgYnkgbWluLWhlaWdodCkg
aXMgdHJhbnNmZXJyZWQgdG8gdGhlCisgICAgICAgICBtYWluIGF4aXMuIC0tPgogICAgIDxkaXYg
Y2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4taGVpZ2h0OiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1dG8g
MTkvMTsiPjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4K
LSAgICA8IS0tIFRoZSBjb250ZW50LWJveCBoZWlnaHQgMTBweCAoY2xhbXBlZCBieSBtYXgtaGVp
Z2h0KSBpcyB0cmFuc2ZlcnJlZAotICAgICAgICAgdG8gdGhlIG1haW4gYXhpcywgeWllbGRpbmcg
YSByZXNvbHZlZCBtaW4td2lkdGg6YXV0byBvZiAxOTBweC4gLS0+CisgICAgPCEtLSBUaGUgY29u
dGVudCBzaXplIHN1Z2dlc3Rpb24gKGNvbnRlbnQtYm94KSBpcyAxOTBweCBiZWNhdXNlIHRoZQor
ICAgICAgICAgY29udGVudC1ib3ggaGVpZ2h0IDEwcHggKGNsYW1wZWQgYnkgbWF4LWhlaWdodCkg
aXMgdHJhbnNmZXJyZWQgdG8gdGhlCisgICAgICAgICBtYWluIGF4aXMuIC0tPgogICAgIDxkaXYg
Y2xhc3M9Iml0ZW0iIHN0eWxlPSJtYXgtaGVpZ2h0OiAyNXB4OyBoZWlnaHQ6IDEwMHB4OyBhc3Bl
Y3QtcmF0aW86IGF1dG8gMTkvMTsiPjwvZGl2PgogICA8L2Rpdj4KIDwvaHRtbD4KZGlmZiAtLWdp
dCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z
aXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sIGIvTGF5b3V0VGVz
dHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt
cmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwKaW5kZXggYzRhMjUwODE4YmI3Nzg2ZTJm
Mzk1OTIyZDI4ZTNjNzUxOWI0ZWEzYS4uZmY2YmYyYWE1NjkwNTUxODA4Yjk4ZTcxMTdlYzY1ZDkx
NzhhMzQyNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2
Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwKQEAg
LTQsNiArNCw4IEBACiAgIDxsaW5rIHJlbD0iYXV0aG9yIiB0aXRsZT0iVGluZy1ZdSBMaW4iIGhy
ZWY9Im1haWx0bzp0bGluQG1vemlsbGEuY29tIj4KICAgPGxpbmsgcmVsPSJhdXRob3IiIHRpdGxl
PSJNb3ppbGxhIiBocmVmPSJodHRwczovL3d3dy5tb3ppbGxhLm9yZy8iPgogICA8bGluayByZWw9
ImhlbHAiIGhyZWY9Imh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3Mtc2l6aW5nLTQvI2FzcGVj
dC1yYXRpbyI+CisgIDxsaW5rIHJlbD0iaGVscCIgaHJlZj0iaHR0cHM6Ly9kcmFmdHMuY3Nzd2cu
b3JnL2Nzcy1zaXppbmctNC8jYXNwZWN0LXJhdGlvLW1pbmltdW0iPgorICA8bGluayByZWw9Imhl
bHAiIGhyZWY9Imh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZmxleGJveC0xLyNtaW4tc2l6
ZS1hdXRvIj4KICAgPGxpbmsgcmVsPSJtYXRjaCIgaHJlZj0iLi4vLi4vcmVmZXJlbmNlL3JlZi1m
aWxsZWQtZ3JlZW4tMjAwcHgtc3F1YXJlLmh0bWwiIC8+CiAgIDxzdHlsZT4KICAgLmZsZXhDb250
YWluZXIgewpAQCAtMTksNjAgKzIxLDc0IEBACiAgICAgYm94LXNpemluZzogYm9yZGVyLWJveDsK
ICAgfQogICAuaXRlbSA+IGRpdiB7Ci0gICAgaGVpZ2h0OiA1MDBweDsgLyogU2V0IGEgbGFyZ2Ug
Y29udGVudCBzaXplIHN1Z2dlc3Rpb24gZm9yIGZsZXggaXRlbS4gKi8KKyAgICBoZWlnaHQ6IDE5
MHB4OyAvKiBTZXQgdGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIGZvciBmbGV4IGl0ZW0uICov
CiAgIH0KICAgPC9zdHlsZT4KIAogICA8cD5UZXN0IHBhc3NlcyBpZiB0aGVyZSBpcyBhIGZpbGxl
ZCBncmVlbiBzcXVhcmUgYW5kIDxzdHJvbmc+bm8gcmVkPC9zdHJvbmc+LjwvcD4KIAorICA8IS0t
IEluIGFsbCBvZiB0aGUgc3VidGVzdHMgaGVyZSwgZWFjaCBmbGV4IGl0ZW0ncyBhdXRvbWF0aWMg
bWluaW11bSBoZWlnaHQgaXMKKyAgICAgICByZXNvbHZlZCBkaXJlY3RseSBmcm9tIGl0cyBjb250
ZW50IHNpemUgc3VnZ2VzdGlvbi4gTm90YWJseSwgdGhlc2UgaXRlbXMKKyAgICAgICAqZG8gbm90
KiBnZXQgYSAidHJhbnNmZXJyZWQgc2l6ZSBzdWdnZXN0aW9uIiwgYmVjYXVzZSB0aGV5IGFyZSBh
bGwKKyAgICAgICAqbm9uLXJlcGxhY2VkKiBlbGVtZW50czsgYW5kICJ0cmFuc2ZlcnJlZCBzaXpl
IHN1Z2dlc3Rpb24iIGlzIG9ubHkgdXNlZAorICAgICAgIGZvciByZXNvbHZpbmcgYXV0b21hdGlj
IG1pbmltdW0gc2l6ZXMgb24gKnJlcGxhY2VkKiBlbGVtZW50cy4gSG93ZXZlciwKKyAgICAgICBu
b3RlIHRoYXQgd2UgZG8gInRyYW5zZmVyIiBzaXplcyB0aHJvdWdoIHRoZSBhc3BlY3QgcmF0aW8s
IGFzIHBhcnQgb2YKKyAgICAgICBjb21wdXRpbmcgdGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9u
IGFuZC9vciBmbGV4IGJhc2Ugc2l6ZS4gLS0+CisKICAgPCEtLSBJbiB0aGUgZm9sbG93aW5nIGZv
dXIgZmxleCBjb250YWluZXJzLCB0aGUgYXNwZWN0LXJhdGlvIHdvcmtzIHdpdGggYm9yZGVyLWJv
eC4gLS0+CiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiIHN0eWxlPSJoZWlnaHQ6IGF1dG87
Ij4KICAgICA8IS0tIFRoZSBib3JkZXItYm94IHdpZHRoIDI1cHggaXMgdHJhbnNmZXJyZWQgdG8g
dGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgZmxleCBiYXNlIHNp
emUgb2YgMjAwcHguIC0tPgorICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBmbGV4IGJhc2Ug
c2l6ZSAoYm9yZGVyLWJveCkgb2YgMjAwcHguIC0tPgogICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0
eWxlPSJtaW4taGVpZ2h0OjA7IHdpZHRoOiAyNXB4OyBhc3BlY3QtcmF0aW86IDEvODsiPjxkaXY+
PC9kaXY+PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgot
ICAgIDwhLS0gVGhlIGJvcmRlci1ib3ggd2lkdGggMjVweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUg
bWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8g
b2YgMjAwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJ3aWR0aDogMjVweDsg
YXNwZWN0LXJhdGlvOiAxLzg7Ij48ZGl2PjwvZGl2PjwvZGl2PgorICAgIDwhLS0gVGhlIGNvbnRl
bnQgc2l6ZSBzdWdnZXN0aW9uIGlzIDE5MHB4LCBpLmUuIHRoZSBoZWlnaHQgb2YgdGhlIGl0ZW0n
cworICAgICAgICAgY2hpbGQgZGl2LiAtLT4KKyAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0i
d2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogMS8xOyI+PGRpdj48L2Rpdj48L2Rpdj4KICAgPC9k
aXY+CiAKICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciI+Ci0gICAgPCEtLSBUaGUgYm9yZGVy
LWJveCBtaW4td2lkdGggMjVweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAg
ICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8gb2YgMjAwcHguIC0tPgot
ICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4td2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRp
bzogMS84OyI+PGRpdj48L2Rpdj48L2Rpdj4KKyAgICA8IS0tIFRoZSBjb250ZW50IHNpemUgc3Vn
Z2VzdGlvbiBpcyAxOTBweCwgaS5lLiB0aGUgaGVpZ2h0IG9mIHRoZSBpdGVtJ3MKKyAgICAgICAg
IGNoaWxkIGRpdi4gLS0+CisgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi13aWR0aDog
MjVweDsgYXNwZWN0LXJhdGlvOiAxLzE7Ij48ZGl2PjwvZGl2PjwvZGl2PgogICA8L2Rpdj4KIAog
ICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAgICA8IS0tIFRoZSBib3JkZXItYm94IHdp
ZHRoIDI1cHggKGNsYW1wZWQgYnkgbWF4LXdpZHRoKSBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFp
biBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8gb2Yg
MjAwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtYXgtd2lkdGg6IDI1cHg7
IHdpZHRoOiAxMDBweDsgYXNwZWN0LXJhdGlvOiAxLzg7Ij48ZGl2PjwvZGl2PjwvZGl2PgorICAg
IDwhLS0gVGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIGlzIDIwMHB4IGJlY2F1c2UgdGhlIGJv
cmRlci1ib3ggbWF4LXdpZHRoCisgICAgICAgICAyNXB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBt
YWluIGF4aXMgYXMgdGhlIHVwcGVyIGJvdW5kIG9mIGl0cworICAgICAgICAgYm9yZGVyLWJveCBo
ZWlnaHQuIC0tPgorICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtYXgtd2lkdGg6IDI1cHg7
IHdpZHRoOiAxMDBweDsgYXNwZWN0LXJhdGlvOiAxLzg7Ij4KKyAgICAgIDxkaXYgc3R5bGU9Imhl
aWdodDogNTAwcHgiPjwvZGl2PgorICAgIDwvZGl2PgogICA8L2Rpdj4KIAogICA8IS0tIEluIHRo
ZSBmb2xsb3dpbmcgZm91ciBmbGV4IGNvbnRhaW5lcnMsIHRoZSBhc3BlY3QtcmF0aW8gd29ya3Mg
d2l0aCBjb250ZW50LWJveAogICAgICAgIGJlY2F1c2UgaXRzIHZhbHVlIGNvbnRhaW5zICdhdXRv
Jy4gLS0+CiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiIHN0eWxlPSJoZWlnaHQ6IGF1dG87
Ij4KICAgICA8IS0tIFRoZSBjb250ZW50LWJveCB3aWR0aCAxMHB4IGlzIHRyYW5zZmVycmVkIHRv
IHRoZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIGZsZXggYmFzZSBz
aXplIG9mIDE5MHB4LiAtLT4KKyAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgZmxleCBiYXNl
IHNpemUgKGNvbnRlbnQtYm94KSBvZiAxOTBweC4gLS0+CiAgICAgPGRpdiBjbGFzcz0iaXRlbSIg
c3R5bGU9Im1pbi1oZWlnaHQ6MDsgd2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE5
OyI+PGRpdj48L2Rpdj48L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRpdiBjbGFzcz0iZmxleENvbnRh
aW5lciI+Ci0gICAgPCEtLSBUaGUgY29udGVudC1ib3ggd2lkdGggMTBweCBpcyB0cmFuc2ZlcnJl
ZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVp
Z2h0OmF1dG8gb2YgMTkwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJ3aWR0
aDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEvMTk7Ij48ZGl2PjwvZGl2PjwvZGl2PgorICAg
IDwhLS0gVGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIGlzIDE5MHB4LCBpLmUuIHRoZSBoZWln
aHQgb2YgdGhlIGl0ZW0ncworICAgICAgICAgY2hpbGQgZGl2LiAtLT4KKyAgICA8ZGl2IGNsYXNz
PSJpdGVtIiBzdHlsZT0id2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE7Ij48ZGl2
PjwvZGl2PjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4K
LSAgICA8IS0tIFRoZSBjb250ZW50LWJveCBtaW4td2lkdGggMTBweCBpcyB0cmFuc2ZlcnJlZCB0
byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0
OmF1dG8gb2YgMTkwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4td2lk
dGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE5OyI+PGRpdj48L2Rpdj48L2Rpdj4KKyAg
ICA8IS0tIFRoZSBjb250ZW50IHNpemUgc3VnZ2VzdGlvbiBpcyAxOTBweCwgaS5lLiB0aGUgaGVp
Z2h0IG9mIHRoZSBpdGVtJ3MKKyAgICAgICAgIGNoaWxkIGRpdi4gLS0+CisgICAgPGRpdiBjbGFz
cz0iaXRlbSIgc3R5bGU9Im1pbi13aWR0aDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEvMTsi
PjxkaXY+PC9kaXY+PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWlu
ZXIiPgotICAgIDwhLS0gVGhlIGNvbnRlbnQtYm94IHdpZHRoIDEwcHggKGNsYW1wZWQgYnkgbWF4
LXdpZHRoKSBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRp
bmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8gb2YgMTkwcHguIC0tPgotICAgIDxkaXYgY2xh
c3M9Iml0ZW0iIHN0eWxlPSJtYXgtd2lkdGg6IDI1cHg7IHdpZHRoOiAxMDBweDsgYXNwZWN0LXJh
dGlvOiBhdXRvIDEvMTk7Ij48ZGl2PjwvZGl2PjwvZGl2PgorICAgIDwhLS0gVGhlIGNvbnRlbnQg
c2l6ZSBzdWdnZXN0aW9uIGlzIDE5MHB4IGJlY2F1c2UgdGhlIGNvbnRlbnQtYm94IG1heC13aWR0
aAorICAgICAgICAgMTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzIGFzIHRoZSB1
cHBlciBib3VuZCBvZiBpdHMKKyAgICAgICAgIGNvbnRlbnQtYm94IGhlaWdodC4tLT4KKyAgICA8
ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWF4LXdpZHRoOiAyNXB4OyB3aWR0aDogMTAwcHg7IGFz
cGVjdC1yYXRpbzogYXV0byAxLzE5OyI+CisgICAgICA8ZGl2IHN0eWxlPSJoZWlnaHQ6IDUwMHB4
Ij48L2Rpdj4KKyAgICA8L2Rpdj4KICAgPC9kaXY+CiA8L2h0bWw+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>429309</attachid>
            <date>2021-05-21 10:40:50 -0700</date>
            <delta_ts>2021-05-27 07:01:00 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210521194047.patch</filename>
            <type>text/plain</type>
            <size>12544</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3ODUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGYxZTVhYTExM2JmZjY0
ZGQyMTZhZGZkODAxMWNkZjVhMjFlOWExYi4uYjExNDkzY2UzMzg4ZjYzNWM4MjQ0YzY3OGVhNTc1
ZDU4MmYwM2M2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTA1LTIxICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBNYWtlIGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nIHRha2UgaW50byBh
Y2NvdW50CisgICAgICAgIGJveC1zaXppbmcgZm9yIHRoZSBjYXNlIHdoZXJlIENTUyBhc3BlY3Qt
cmF0aW8gaXMgYXBwbGllZC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJv
eC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5T
aXplRnJvbUFzcGVjdFJhdGlvVXNpbmcgY29uc3QpOgorCiAyMDIxLTA1LTIwICBDaHJpcyBEdW1l
eiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IGxvY2tpbmcgaW4gUGxhdGZvcm1D
QUxheWVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNw
cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IDM4MjU5Mjc3
NzNjY2ZhY2NlNTc4ZjVmNjk4YTdjNmJmZWIzZTNhZDguLjI5MzBiMzFjNWZiNzNiOTE4OWU2NTEx
ZWMyZDdhZTdjMTVlNzI1YjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S
ZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3Bw
CkBAIC0yNTk4LDkgKzI1OTgsMTAgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbXB1dGVJbnRy
aW5zaWNMb2dpY2FsV2lkdGhVc2luZyhMZW5ndGggbG9naWNhbFdpZHRoTGVuZ3QKIAogICAgIExh
eW91dFVuaXQgbWluTG9naWNhbFdpZHRoOwogICAgIExheW91dFVuaXQgbWF4TG9naWNhbFdpZHRo
OwotICAgIGlmICghbG9naWNhbFdpZHRoTGVuZ3RoLmlzTWluSW50cmluc2ljKCkgJiYgc2hvdWxk
Q29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpKQorICAgIGlmICghbG9naWNhbFdp
ZHRoTGVuZ3RoLmlzTWluSW50cmluc2ljKCkgJiYgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZy
b21Bc3BlY3RSYXRpbygpKSB7CiAgICAgICAgIG1pbkxvZ2ljYWxXaWR0aCA9IG1heExvZ2ljYWxX
aWR0aCA9IGNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKTsKLSAgICBlbHNlCisg
ICAgICAgIGJvcmRlckFuZFBhZGRpbmcgPSBMYXlvdXRVbml0KCk7CisgICAgfSBlbHNlCiAgICAg
ICAgIGNvbXB1dGVJbnRyaW5zaWNLZXl3b3JkTG9naWNhbFdpZHRocyhtaW5Mb2dpY2FsV2lkdGgs
IG1heExvZ2ljYWxXaWR0aCk7CiAKICAgICBpZiAobG9naWNhbFdpZHRoTGVuZ3RoLmlzTWluQ29u
dGVudCgpIHx8IGxvZ2ljYWxXaWR0aExlbmd0aC5pc01pbkludHJpbnNpYygpKQpkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJj
ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKaW5kZXggZTkwZGMxYThh
ZDJjMTI0MDhkODAyNjRmZmQxN2JjYTkwZDJhOTIzOS4uNDc3ZThhMmFhYjFjMzBhNTVhNWJlMzE5
ZGE3N2NkOTBiYzk1YmViMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl
bmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy
RmxleGlibGVCb3guY3BwCkBAIC04MDgsOSArODA4LDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4
aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoY29uc3QgUmVuZGVy
Qm8KIHsKICAgICBBU1NFUlQoY2hpbGRIYXNBc3BlY3RSYXRpbyhjaGlsZCkpOwogCi0gICAgYXV0
byBhZGp1c3RGb3JCb3hTaXppbmcgPSBbdGhpc10gKGNvbnN0IFJlbmRlckJveCYgYm94LCBMZW5n
dGggbGVuZ3RoKSAtPiBMYXlvdXRVbml0IHsKLSAgICAgICAgQVNTRVJUKGxlbmd0aC5pc0ZpeGVk
KCkpOwotICAgICAgICBhdXRvIHZhbHVlID0gTGF5b3V0VW5pdChsZW5ndGgudmFsdWUoKSk7Cisg
ICAgYXV0byBhZGp1c3RGb3JCb3hTaXppbmcgPSBbdGhpc10gKGNvbnN0IFJlbmRlckJveCYgYm94
LCBMYXlvdXRVbml0IHZhbHVlKSAtPiBMYXlvdXRVbml0IHsKICAgICAgICAgLy8gV2UgbmVlZCB0
byBzdWJzdHJhY3QgdGhlIGJvcmRlciBhbmQgcGFkZGluZyBleHRlbnQgZnJvbSB0aGUgY3Jvc3Mg
YXhpcy4KICAgICAgICAgLy8gRnVydGhlcm1vcmUsIHRoZSBzaXppbmcgY2FsY3VsYXRpb25zIHRo
YXQgZmxvb3IgdGhlIGNvbnRlbnQgYm94IHNpemUgYXQgemVybyB3aGVuIGFwcGx5aW5nIGJveC1z
aXppbmcgYXJlIGFsc28gaWdub3JlZC4KICAgICAgICAgLy8gaHR0cHM6Ly9kcmFmdHMuY3Nzd2cu
b3JnL2Nzcy1mbGV4Ym94LyNhbGdvLW1haW4taXRlbS4KQEAgLTgxOSw5ICs4MTcsMTEgQEAgTGF5
b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlv
VXNpbmcoY29uc3QgUmVuZGVyQm8KICAgICAgICAgcmV0dXJuIHZhbHVlOwogICAgIH07CiAKLSAg
ICBPcHRpb25hbDxMYXlvdXRVbml0PiBjcm9zc1NpemU7CisgICAgLy8gY3Jvc3NTaXplIGlzIGJv
cmRlci1ib3ggc2l6ZSBpZiBib3gtc2l6aW5nIGlzIGJvcmRlci1ib3gsIGFuZAorICAgIC8vIGNv
bnRlbnQtYm94IG90aGVyd2lzZS4KKyAgICBMYXlvdXRVbml0IGNyb3NzU2l6ZTsKICAgICBpZiAo
Y3Jvc3NTaXplTGVuZ3RoLmlzRml4ZWQoKSkKLSAgICAgICAgY3Jvc3NTaXplID0gYWRqdXN0Rm9y
Qm94U2l6aW5nKGNoaWxkLCBjcm9zc1NpemVMZW5ndGgpOworICAgICAgICBjcm9zc1NpemUgPSBM
YXlvdXRVbml0KGNyb3NzU2l6ZUxlbmd0aC52YWx1ZSgpKTsKICAgICBlbHNlIGlmIChjcm9zc1Np
emVMZW5ndGguaXNBdXRvKCkpIHsKICAgICAgICAgQVNTRVJUKGNoaWxkQ3Jvc3NTaXplU2hvdWxk
VXNlQ29udGFpbmVyQ3Jvc3NTaXplKGNoaWxkKSk7CiAgICAgICAgIGF1dG8gY29udGFpbmVyQ3Jv
c3NTaXplTGVuZ3RoID0gaXNIb3Jpem9udGFsRmxvdygpID8gc3R5bGUoKS5oZWlnaHQoKSA6IHN0
eWxlKCkud2lkdGgoKTsKQEAgLTgzMCwyMiArODMwLDI5IEBAIExheW91dFVuaXQgUmVuZGVyRmxl
eGlibGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRl
ckJvCiAgICAgICAgIGNyb3NzU2l6ZSA9IHN0ZDo6bWF4KDBfbHUsIHZhbHVlRm9yTGVuZ3RoKGNv
bnRhaW5lckNyb3NzU2l6ZUxlbmd0aCwgLTFfbHUpIC0gY3Jvc3NBeGlzTWFyZ2luRXh0ZW50Rm9y
Q2hpbGQoY2hpbGQpKTsKICAgICB9IGVsc2UgewogICAgICAgICBBU1NFUlQoY3Jvc3NTaXplTGVu
Z3RoLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpKTsKLSAgICAgICAgY3Jvc3NTaXplID0gbWFpbkF4
aXNJc0NoaWxkSW5saW5lQXhpcyhjaGlsZCkgPyBjaGlsZC5jb21wdXRlUGVyY2VudGFnZUxvZ2lj
YWxIZWlnaHQoY3Jvc3NTaXplTGVuZ3RoKSA6IGFkanVzdEJvcmRlckJveExvZ2ljYWxXaWR0aEZv
ckJveFNpemluZyh2YWx1ZUZvckxlbmd0aChjcm9zc1NpemVMZW5ndGgsIGNvbnRlbnRXaWR0aCgp
KSwgY3Jvc3NTaXplTGVuZ3RoLnR5cGUoKSk7Ci0gICAgICAgIGlmICghY3Jvc3NTaXplKQorICAg
ICAgICBPcHRpb25hbDxMYXlvdXRVbml0PiBjaGlsZFNpemUgPSBtYWluQXhpc0lzQ2hpbGRJbmxp
bmVBeGlzKGNoaWxkKSA/IGNoaWxkLmNvbXB1dGVQZXJjZW50YWdlTG9naWNhbEhlaWdodChjcm9z
c1NpemVMZW5ndGgpIDogYWRqdXN0Qm9yZGVyQm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKHZh
bHVlRm9yTGVuZ3RoKGNyb3NzU2l6ZUxlbmd0aCwgY29udGVudFdpZHRoKCkpLCBjcm9zc1NpemVM
ZW5ndGgudHlwZSgpKTsKKyAgICAgICAgaWYgKCFjaGlsZFNpemUpCiAgICAgICAgICAgICByZXR1
cm4gMF9sdTsKKyAgICAgICAgY3Jvc3NTaXplID0gY2hpbGRTaXplLnZhbHVlKCk7CiAgICAgfQog
CiAgICAgY29uc3QgTGF5b3V0U2l6ZSYgY2hpbGRJbnRyaW5zaWNTaXplID0gY2hpbGQuaW50cmlu
c2ljU2l6ZSgpOwogICAgIGRvdWJsZSByYXRpbzsKLSAgICBpZiAoY2hpbGQuc3R5bGUoKS5hc3Bl
Y3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OlJhdGlvIHx8IChjaGlsZC5zdHlsZSgp
LmFzcGVjdFJhdGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6QXV0b0FuZFJhdGlvICYmIGNo
aWxkSW50cmluc2ljU2l6ZS5pc0VtcHR5KCkpKQorICAgIExheW91dFVuaXQgYm9yZGVyQW5kUGFk
ZGluZzsKKyAgICBpZiAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RS
YXRpb1R5cGU6OlJhdGlvIHx8IChjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvVHlwZSgpID09IEFz
cGVjdFJhdGlvVHlwZTo6QXV0b0FuZFJhdGlvICYmIGNoaWxkSW50cmluc2ljU2l6ZS5pc0VtcHR5
KCkpKSB7CiAgICAgICAgIHJhdGlvID0gY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1dpZHRoKCkg
LyBjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvSGVpZ2h0KCk7Ci0gICAgZWxzZSB7CisgICAgICAg
IGlmIChjaGlsZC5zdHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJhdGlvKCkgPT0gQm94U2l6aW5n
OjpDb250ZW50Qm94KQorICAgICAgICAgICAgY3Jvc3NTaXplIC09IGlzSG9yaXpvbnRhbEZsb3co
KSA/IGNoaWxkLnZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpIDogY2hpbGQuaG9yaXpv
bnRhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAg
Ym9yZGVyQW5kUGFkZGluZyA9IGlzSG9yaXpvbnRhbEZsb3coKSA/IGNoaWxkLmhvcml6b250YWxC
b3JkZXJBbmRQYWRkaW5nRXh0ZW50KCkgOiBjaGlsZC52ZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmdF
eHRlbnQoKTsKKyAgICB9IGVsc2UgewogICAgICAgICBBU1NFUlQoY2hpbGRJbnRyaW5zaWNTaXpl
LmhlaWdodCgpKTsKICAgICAgICAgcmF0aW8gPSBjaGlsZEludHJpbnNpY1NpemUud2lkdGgoKS50
b0Zsb2F0KCkgLyBjaGlsZEludHJpbnNpY1NpemUuaGVpZ2h0KCkudG9GbG9hdCgpOworICAgICAg
ICBjcm9zc1NpemUgPSBhZGp1c3RGb3JCb3hTaXppbmcoY2hpbGQsIGNyb3NzU2l6ZSk7CiAgICAg
fQogICAgIGlmIChpc0hvcml6b250YWxGbG93KCkpCi0gICAgICAgIHJldHVybiBMYXlvdXRVbml0
KGNyb3NzU2l6ZS52YWx1ZSgpICogcmF0aW8pOwotICAgIHJldHVybiBMYXlvdXRVbml0KGNyb3Nz
U2l6ZS52YWx1ZSgpIC8gcmF0aW8pOworICAgICAgICByZXR1cm4gTGF5b3V0VW5pdChjcm9zc1Np
emUgKiByYXRpbykgLSBib3JkZXJBbmRQYWRkaW5nOworICAgIHJldHVybiBMYXlvdXRVbml0KGNy
b3NzU2l6ZSAvIHJhdGlvKSAtIGJvcmRlckFuZFBhZGRpbmc7CiB9CiAKIHZvaWQgUmVuZGVyRmxl
eGlibGVCb3g6OnNldEZsb3dBd2FyZUxvY2F0aW9uRm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZCwg
Y29uc3QgTGF5b3V0UG9pbnQmIGxvY2F0aW9uKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1w
b3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cK
aW5kZXggMGUwYzA2MDA3MjlkNTUxZTY5ZjlhZWMxNGU5NDY3OGM5N2Q3OGI0OC4uNGUzODU1NDdk
Y2RkZDIwMGQzMTkwMmFkOWM2NTI2ZTkwZmYyZmYwNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv
aW1wb3J0ZWQvdzNjL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMDUtMjEgIFJvYiBCdWlzICA8cmJ1aXNAaWdh
bGlhLmNvbT4KKworICAgICAgICBGaXggZmxleC1hc3BlY3QtcmF0aW8tMDI1KzI2Lmh0bWwKKyAg
ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjM1NworCisg
ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0w
MjUuaHRtbDoKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw
ZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sOgorCiAyMDIxLTA1LTIwICBBbGV4
ZXkgU2h2YXlrYSAgPHNodmFpa2FsZXNoQGdtYWlsLmNvbT4KIAogICAgICAgICBbV2ViSURMXSBS
ZW1vdmUgW0ltcGxpY2l0VGhpc10gYW5kIFtDdXN0b21Qcm94eVRvSlNPYmplY3RdIGV4dGVuZGVk
IGF0dHJpYnV0ZXMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlv
LTAyNi5odG1sIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwKaW5k
ZXggYzRhMjUwODE4YmI3Nzg2ZTJmMzk1OTIyZDI4ZTNjNzUxOWI0ZWEzYS4uZmY2YmYyYWE1Njkw
NTUxODA4Yjk4ZTcxMTdlYzY1ZDkxNzhhMzQyNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v
ZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3Bl
Y3QtcmF0aW8tMDI2Lmh0bWwKQEAgLTQsNiArNCw4IEBACiAgIDxsaW5rIHJlbD0iYXV0aG9yIiB0
aXRsZT0iVGluZy1ZdSBMaW4iIGhyZWY9Im1haWx0bzp0bGluQG1vemlsbGEuY29tIj4KICAgPGxp
bmsgcmVsPSJhdXRob3IiIHRpdGxlPSJNb3ppbGxhIiBocmVmPSJodHRwczovL3d3dy5tb3ppbGxh
Lm9yZy8iPgogICA8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHBzOi8vZHJhZnRzLmNzc3dnLm9y
Zy9jc3Mtc2l6aW5nLTQvI2FzcGVjdC1yYXRpbyI+CisgIDxsaW5rIHJlbD0iaGVscCIgaHJlZj0i
aHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1zaXppbmctNC8jYXNwZWN0LXJhdGlvLW1pbmlt
dW0iPgorICA8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9j
c3MtZmxleGJveC0xLyNtaW4tc2l6ZS1hdXRvIj4KICAgPGxpbmsgcmVsPSJtYXRjaCIgaHJlZj0i
Li4vLi4vcmVmZXJlbmNlL3JlZi1maWxsZWQtZ3JlZW4tMjAwcHgtc3F1YXJlLmh0bWwiIC8+CiAg
IDxzdHlsZT4KICAgLmZsZXhDb250YWluZXIgewpAQCAtMTksNjAgKzIxLDc0IEBACiAgICAgYm94
LXNpemluZzogYm9yZGVyLWJveDsKICAgfQogICAuaXRlbSA+IGRpdiB7Ci0gICAgaGVpZ2h0OiA1
MDBweDsgLyogU2V0IGEgbGFyZ2UgY29udGVudCBzaXplIHN1Z2dlc3Rpb24gZm9yIGZsZXggaXRl
bS4gKi8KKyAgICBoZWlnaHQ6IDE5MHB4OyAvKiBTZXQgdGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0
aW9uIGZvciBmbGV4IGl0ZW0uICovCiAgIH0KICAgPC9zdHlsZT4KIAogICA8cD5UZXN0IHBhc3Nl
cyBpZiB0aGVyZSBpcyBhIGZpbGxlZCBncmVlbiBzcXVhcmUgYW5kIDxzdHJvbmc+bm8gcmVkPC9z
dHJvbmc+LjwvcD4KIAorICA8IS0tIEluIGFsbCBvZiB0aGUgc3VidGVzdHMgaGVyZSwgZWFjaCBm
bGV4IGl0ZW0ncyBhdXRvbWF0aWMgbWluaW11bSBoZWlnaHQgaXMKKyAgICAgICByZXNvbHZlZCBk
aXJlY3RseSBmcm9tIGl0cyBjb250ZW50IHNpemUgc3VnZ2VzdGlvbi4gTm90YWJseSwgdGhlc2Ug
aXRlbXMKKyAgICAgICAqZG8gbm90KiBnZXQgYSAidHJhbnNmZXJyZWQgc2l6ZSBzdWdnZXN0aW9u
IiwgYmVjYXVzZSB0aGV5IGFyZSBhbGwKKyAgICAgICAqbm9uLXJlcGxhY2VkKiBlbGVtZW50czsg
YW5kICJ0cmFuc2ZlcnJlZCBzaXplIHN1Z2dlc3Rpb24iIGlzIG9ubHkgdXNlZAorICAgICAgIGZv
ciByZXNvbHZpbmcgYXV0b21hdGljIG1pbmltdW0gc2l6ZXMgb24gKnJlcGxhY2VkKiBlbGVtZW50
cy4gSG93ZXZlciwKKyAgICAgICBub3RlIHRoYXQgd2UgZG8gInRyYW5zZmVyIiBzaXplcyB0aHJv
dWdoIHRoZSBhc3BlY3QgcmF0aW8sIGFzIHBhcnQgb2YKKyAgICAgICBjb21wdXRpbmcgdGhlIGNv
bnRlbnQgc2l6ZSBzdWdnZXN0aW9uIGFuZC9vciBmbGV4IGJhc2Ugc2l6ZS4gLS0+CisKICAgPCEt
LSBJbiB0aGUgZm9sbG93aW5nIGZvdXIgZmxleCBjb250YWluZXJzLCB0aGUgYXNwZWN0LXJhdGlv
IHdvcmtzIHdpdGggYm9yZGVyLWJveC4gLS0+CiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIi
IHN0eWxlPSJoZWlnaHQ6IGF1dG87Ij4KICAgICA8IS0tIFRoZSBib3JkZXItYm94IHdpZHRoIDI1
cHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEg
cmVzb2x2ZWQgZmxleCBiYXNlIHNpemUgb2YgMjAwcHguIC0tPgorICAgICAgICAgeWllbGRpbmcg
YSByZXNvbHZlZCBmbGV4IGJhc2Ugc2l6ZSAoYm9yZGVyLWJveCkgb2YgMjAwcHguIC0tPgogICAg
IDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4taGVpZ2h0OjA7IHdpZHRoOiAyNXB4OyBhc3Bl
Y3QtcmF0aW86IDEvODsiPjxkaXY+PC9kaXY+PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYgY2xh
c3M9ImZsZXhDb250YWluZXIiPgotICAgIDwhLS0gVGhlIGJvcmRlci1ib3ggd2lkdGggMjVweCBp
cyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNv
bHZlZCBtaW4taGVpZ2h0OmF1dG8gb2YgMjAwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0i
IHN0eWxlPSJ3aWR0aDogMjVweDsgYXNwZWN0LXJhdGlvOiAxLzg7Ij48ZGl2PjwvZGl2PjwvZGl2
PgorICAgIDwhLS0gVGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIGlzIDE5MHB4LCBpLmUuIHRo
ZSBoZWlnaHQgb2YgdGhlIGl0ZW0ncworICAgICAgICAgY2hpbGQgZGl2LiAtLT4KKyAgICA8ZGl2
IGNsYXNzPSJpdGVtIiBzdHlsZT0id2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogMS8xOyI+PGRp
dj48L2Rpdj48L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciI+
Ci0gICAgPCEtLSBUaGUgYm9yZGVyLWJveCBtaW4td2lkdGggMjVweCBpcyB0cmFuc2ZlcnJlZCB0
byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0
OmF1dG8gb2YgMjAwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4td2lk
dGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogMS84OyI+PGRpdj48L2Rpdj48L2Rpdj4KKyAgICA8IS0t
IFRoZSBjb250ZW50IHNpemUgc3VnZ2VzdGlvbiBpcyAxOTBweCwgaS5lLiB0aGUgaGVpZ2h0IG9m
IHRoZSBpdGVtJ3MKKyAgICAgICAgIGNoaWxkIGRpdi4gLS0+CisgICAgPGRpdiBjbGFzcz0iaXRl
bSIgc3R5bGU9Im1pbi13aWR0aDogMjVweDsgYXNwZWN0LXJhdGlvOiAxLzE7Ij48ZGl2PjwvZGl2
PjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAgICA8
IS0tIFRoZSBib3JkZXItYm94IHdpZHRoIDI1cHggKGNsYW1wZWQgYnkgbWF4LXdpZHRoKSBpcyB0
cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZl
ZCBtaW4taGVpZ2h0OmF1dG8gb2YgMjAwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0
eWxlPSJtYXgtd2lkdGg6IDI1cHg7IHdpZHRoOiAxMDBweDsgYXNwZWN0LXJhdGlvOiAxLzg7Ij48
ZGl2PjwvZGl2PjwvZGl2PgorICAgIDwhLS0gVGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIGlz
IDIwMHB4IGJlY2F1c2UgdGhlIGJvcmRlci1ib3ggbWF4LXdpZHRoCisgICAgICAgICAyNXB4IGlz
IHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMgYXMgdGhlIHVwcGVyIGJvdW5kIG9mIGl0cwor
ICAgICAgICAgYm9yZGVyLWJveCBoZWlnaHQuIC0tPgorICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0
eWxlPSJtYXgtd2lkdGg6IDI1cHg7IHdpZHRoOiAxMDBweDsgYXNwZWN0LXJhdGlvOiAxLzg7Ij4K
KyAgICAgIDxkaXYgc3R5bGU9ImhlaWdodDogNTAwcHgiPjwvZGl2PgorICAgIDwvZGl2PgogICA8
L2Rpdj4KIAogICA8IS0tIEluIHRoZSBmb2xsb3dpbmcgZm91ciBmbGV4IGNvbnRhaW5lcnMsIHRo
ZSBhc3BlY3QtcmF0aW8gd29ya3Mgd2l0aCBjb250ZW50LWJveAogICAgICAgIGJlY2F1c2UgaXRz
IHZhbHVlIGNvbnRhaW5zICdhdXRvJy4gLS0+CiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIi
IHN0eWxlPSJoZWlnaHQ6IGF1dG87Ij4KICAgICA8IS0tIFRoZSBjb250ZW50LWJveCB3aWR0aCAx
MHB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBh
IHJlc29sdmVkIGZsZXggYmFzZSBzaXplIG9mIDE5MHB4LiAtLT4KKyAgICAgICAgIHlpZWxkaW5n
IGEgcmVzb2x2ZWQgZmxleCBiYXNlIHNpemUgKGNvbnRlbnQtYm94KSBvZiAxOTBweC4gLS0+CiAg
ICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi1oZWlnaHQ6MDsgd2lkdGg6IDI1cHg7IGFz
cGVjdC1yYXRpbzogYXV0byAxLzE5OyI+PGRpdj48L2Rpdj48L2Rpdj4KICAgPC9kaXY+CiAKICAg
PGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciI+Ci0gICAgPCEtLSBUaGUgY29udGVudC1ib3ggd2lk
dGggMTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRp
bmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8gb2YgMTkwcHguIC0tPgotICAgIDxkaXYgY2xh
c3M9Iml0ZW0iIHN0eWxlPSJ3aWR0aDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEvMTk7Ij48
ZGl2PjwvZGl2PjwvZGl2PgorICAgIDwhLS0gVGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIGlz
IDE5MHB4LCBpLmUuIHRoZSBoZWlnaHQgb2YgdGhlIGl0ZW0ncworICAgICAgICAgY2hpbGQgZGl2
LiAtLT4KKyAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0id2lkdGg6IDI1cHg7IGFzcGVjdC1y
YXRpbzogYXV0byAxLzE7Ij48ZGl2PjwvZGl2PjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2IGNs
YXNzPSJmbGV4Q29udGFpbmVyIj4KLSAgICA8IS0tIFRoZSBjb250ZW50LWJveCBtaW4td2lkdGgg
MTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcg
YSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8gb2YgMTkwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9
Iml0ZW0iIHN0eWxlPSJtaW4td2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE5OyI+
PGRpdj48L2Rpdj48L2Rpdj4KKyAgICA8IS0tIFRoZSBjb250ZW50IHNpemUgc3VnZ2VzdGlvbiBp
cyAxOTBweCwgaS5lLiB0aGUgaGVpZ2h0IG9mIHRoZSBpdGVtJ3MKKyAgICAgICAgIGNoaWxkIGRp
di4gLS0+CisgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi13aWR0aDogMjVweDsgYXNw
ZWN0LXJhdGlvOiBhdXRvIDEvMTsiPjxkaXY+PC9kaXY+PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxk
aXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgotICAgIDwhLS0gVGhlIGNvbnRlbnQtYm94IHdpZHRo
IDEwcHggKGNsYW1wZWQgYnkgbWF4LXdpZHRoKSBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBh
eGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8gb2YgMTkw
cHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtYXgtd2lkdGg6IDI1cHg7IHdp
ZHRoOiAxMDBweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEvMTk7Ij48ZGl2PjwvZGl2PjwvZGl2Pgor
ICAgIDwhLS0gVGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIGlzIDE5MHB4IGJlY2F1c2UgdGhl
IGNvbnRlbnQtYm94IG1heC13aWR0aAorICAgICAgICAgMTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0
aGUgbWFpbiBheGlzIGFzIHRoZSB1cHBlciBib3VuZCBvZiBpdHMKKyAgICAgICAgIGNvbnRlbnQt
Ym94IGhlaWdodC4tLT4KKyAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWF4LXdpZHRoOiAy
NXB4OyB3aWR0aDogMTAwcHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE5OyI+CisgICAgICA8ZGl2
IHN0eWxlPSJoZWlnaHQ6IDUwMHB4Ij48L2Rpdj4KKyAgICA8L2Rpdj4KICAgPC9kaXY+CiA8L2h0
bWw+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>429875</attachid>
            <date>2021-05-27 07:01:05 -0700</date>
            <delta_ts>2021-06-03 07:08:53 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210527160103.patch</filename>
            <type>text/plain</type>
            <size>20329</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTM5ODA0MzRmOWQzOTIw
YTI4Y2ZiMmJkYmFkNWMzZjkyOTI2NDQ2MS4uNWMxZjhkZGYzNGM2ZTg2ZDljZTQ0MmZiMjlhOWNh
YzgwYjU0YWM4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA1LTI3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBNYWtlIGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nIHRha2UgaW50byBh
Y2NvdW50CisgICAgICAgIGJveC1zaXppbmcgZm9yIHRoZSBjYXNlIHdoZXJlIENTUyBhc3BlY3Qt
cmF0aW8gaXMgYXBwbGllZC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRo
VXNpbmcgY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6
CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJv
bUFzcGVjdFJhdGlvVXNpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGli
bGVCb3g6OmFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heCk6CisKIDIwMjEtMDUtMjcgIFlvdWVu
biBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFN1cHBvcnQgSDI2NCBwcm9m
aWxlcyBpbiBNZWRpYVJlY29yZGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp
bmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3Bw
CmluZGV4IDM4MjU5Mjc3NzNjY2ZhY2NlNTc4ZjVmNjk4YTdjNmJmZWIzZTNhZDguLjI5MzBiMzFj
NWZiNzNiOTE4OWU2NTExZWMyZDdhZTdjMTVlNzI1YjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu
Zy9SZW5kZXJCb3guY3BwCkBAIC0yNTk4LDkgKzI1OTgsMTAgQEAgTGF5b3V0VW5pdCBSZW5kZXJC
b3g6OmNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhVc2luZyhMZW5ndGggbG9naWNhbFdpZHRo
TGVuZ3QKIAogICAgIExheW91dFVuaXQgbWluTG9naWNhbFdpZHRoOwogICAgIExheW91dFVuaXQg
bWF4TG9naWNhbFdpZHRoOwotICAgIGlmICghbG9naWNhbFdpZHRoTGVuZ3RoLmlzTWluSW50cmlu
c2ljKCkgJiYgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpKQorICAg
IGlmICghbG9naWNhbFdpZHRoTGVuZ3RoLmlzTWluSW50cmluc2ljKCkgJiYgc2hvdWxkQ29tcHV0
ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpKSB7CiAgICAgICAgIG1pbkxvZ2ljYWxXaWR0
aCA9IG1heExvZ2ljYWxXaWR0aCA9IGNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8o
KTsKLSAgICBlbHNlCisgICAgICAgIGJvcmRlckFuZFBhZGRpbmcgPSBMYXlvdXRVbml0KCk7Cisg
ICAgfSBlbHNlCiAgICAgICAgIGNvbXB1dGVJbnRyaW5zaWNLZXl3b3JkTG9naWNhbFdpZHRocyht
aW5Mb2dpY2FsV2lkdGgsIG1heExvZ2ljYWxXaWR0aCk7CiAKICAgICBpZiAobG9naWNhbFdpZHRo
TGVuZ3RoLmlzTWluQ29udGVudCgpIHx8IGxvZ2ljYWxXaWR0aExlbmd0aC5pc01pbkludHJpbnNp
YygpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxl
Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAK
aW5kZXggZTkwZGMxYThhZDJjMTI0MDhkODAyNjRmZmQxN2JjYTkwZDJhOTIzOS4uZDVlMDMwMDAy
MDhhZWEyZDZiZDY2ZDQ0NTQ1NjhmMDNjYzdkNmQxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv
cmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y
ZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC04MDgsOSArODA4LDcgQEAgTGF5b3V0
VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNp
bmcoY29uc3QgUmVuZGVyQm8KIHsKICAgICBBU1NFUlQoY2hpbGRIYXNBc3BlY3RSYXRpbyhjaGls
ZCkpOwogCi0gICAgYXV0byBhZGp1c3RGb3JCb3hTaXppbmcgPSBbdGhpc10gKGNvbnN0IFJlbmRl
ckJveCYgYm94LCBMZW5ndGggbGVuZ3RoKSAtPiBMYXlvdXRVbml0IHsKLSAgICAgICAgQVNTRVJU
KGxlbmd0aC5pc0ZpeGVkKCkpOwotICAgICAgICBhdXRvIHZhbHVlID0gTGF5b3V0VW5pdChsZW5n
dGgudmFsdWUoKSk7CisgICAgYXV0byBhZGp1c3RGb3JCb3hTaXppbmcgPSBbdGhpc10gKGNvbnN0
IFJlbmRlckJveCYgYm94LCBMYXlvdXRVbml0IHZhbHVlKSAtPiBMYXlvdXRVbml0IHsKICAgICAg
ICAgLy8gV2UgbmVlZCB0byBzdWJzdHJhY3QgdGhlIGJvcmRlciBhbmQgcGFkZGluZyBleHRlbnQg
ZnJvbSB0aGUgY3Jvc3MgYXhpcy4KICAgICAgICAgLy8gRnVydGhlcm1vcmUsIHRoZSBzaXppbmcg
Y2FsY3VsYXRpb25zIHRoYXQgZmxvb3IgdGhlIGNvbnRlbnQgYm94IHNpemUgYXQgemVybyB3aGVu
IGFwcGx5aW5nIGJveC1zaXppbmcgYXJlIGFsc28gaWdub3JlZC4KICAgICAgICAgLy8gaHR0cHM6
Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1mbGV4Ym94LyNhbGdvLW1haW4taXRlbS4KQEAgLTgxOSw5
ICs4MTcsMTEgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXpl
RnJvbUFzcGVjdFJhdGlvVXNpbmcoY29uc3QgUmVuZGVyQm8KICAgICAgICAgcmV0dXJuIHZhbHVl
OwogICAgIH07CiAKLSAgICBPcHRpb25hbDxMYXlvdXRVbml0PiBjcm9zc1NpemU7CisgICAgLy8g
Y3Jvc3NTaXplIGlzIGJvcmRlci1ib3ggc2l6ZSBpZiBib3gtc2l6aW5nIGlzIGJvcmRlci1ib3gs
IGFuZAorICAgIC8vIGNvbnRlbnQtYm94IG90aGVyd2lzZS4KKyAgICBMYXlvdXRVbml0IGNyb3Nz
U2l6ZTsKICAgICBpZiAoY3Jvc3NTaXplTGVuZ3RoLmlzRml4ZWQoKSkKLSAgICAgICAgY3Jvc3NT
aXplID0gYWRqdXN0Rm9yQm94U2l6aW5nKGNoaWxkLCBjcm9zc1NpemVMZW5ndGgpOworICAgICAg
ICBjcm9zc1NpemUgPSBMYXlvdXRVbml0KGNyb3NzU2l6ZUxlbmd0aC52YWx1ZSgpKTsKICAgICBl
bHNlIGlmIChjcm9zc1NpemVMZW5ndGguaXNBdXRvKCkpIHsKICAgICAgICAgQVNTRVJUKGNoaWxk
Q3Jvc3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NTaXplKGNoaWxkKSk7CiAgICAgICAgIGF1
dG8gY29udGFpbmVyQ3Jvc3NTaXplTGVuZ3RoID0gaXNIb3Jpem9udGFsRmxvdygpID8gc3R5bGUo
KS5oZWlnaHQoKSA6IHN0eWxlKCkud2lkdGgoKTsKQEAgLTgzMCwyMiArODMwLDI5IEBAIExheW91
dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1Vz
aW5nKGNvbnN0IFJlbmRlckJvCiAgICAgICAgIGNyb3NzU2l6ZSA9IHN0ZDo6bWF4KDBfbHUsIHZh
bHVlRm9yTGVuZ3RoKGNvbnRhaW5lckNyb3NzU2l6ZUxlbmd0aCwgLTFfbHUpIC0gY3Jvc3NBeGlz
TWFyZ2luRXh0ZW50Rm9yQ2hpbGQoY2hpbGQpKTsKICAgICB9IGVsc2UgewogICAgICAgICBBU1NF
UlQoY3Jvc3NTaXplTGVuZ3RoLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpKTsKLSAgICAgICAgY3Jv
c3NTaXplID0gbWFpbkF4aXNJc0NoaWxkSW5saW5lQXhpcyhjaGlsZCkgPyBjaGlsZC5jb21wdXRl
UGVyY2VudGFnZUxvZ2ljYWxIZWlnaHQoY3Jvc3NTaXplTGVuZ3RoKSA6IGFkanVzdEJvcmRlckJv
eExvZ2ljYWxXaWR0aEZvckJveFNpemluZyh2YWx1ZUZvckxlbmd0aChjcm9zc1NpemVMZW5ndGgs
IGNvbnRlbnRXaWR0aCgpKSwgY3Jvc3NTaXplTGVuZ3RoLnR5cGUoKSk7Ci0gICAgICAgIGlmICgh
Y3Jvc3NTaXplKQorICAgICAgICBPcHRpb25hbDxMYXlvdXRVbml0PiBjaGlsZFNpemUgPSBtYWlu
QXhpc0lzQ2hpbGRJbmxpbmVBeGlzKGNoaWxkKSA/IGNoaWxkLmNvbXB1dGVQZXJjZW50YWdlTG9n
aWNhbEhlaWdodChjcm9zc1NpemVMZW5ndGgpIDogYWRqdXN0Qm9yZGVyQm94TG9naWNhbFdpZHRo
Rm9yQm94U2l6aW5nKHZhbHVlRm9yTGVuZ3RoKGNyb3NzU2l6ZUxlbmd0aCwgY29udGVudFdpZHRo
KCkpLCBjcm9zc1NpemVMZW5ndGgudHlwZSgpKTsKKyAgICAgICAgaWYgKCFjaGlsZFNpemUpCiAg
ICAgICAgICAgICByZXR1cm4gMF9sdTsKKyAgICAgICAgY3Jvc3NTaXplID0gY2hpbGRTaXplLnZh
bHVlKCk7CiAgICAgfQogCiAgICAgY29uc3QgTGF5b3V0U2l6ZSYgY2hpbGRJbnRyaW5zaWNTaXpl
ID0gY2hpbGQuaW50cmluc2ljU2l6ZSgpOwogICAgIGRvdWJsZSByYXRpbzsKLSAgICBpZiAoY2hp
bGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OlJhdGlvIHx8
IChjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6QXV0
b0FuZFJhdGlvICYmIGNoaWxkSW50cmluc2ljU2l6ZS5pc0VtcHR5KCkpKQorICAgIExheW91dFVu
aXQgYm9yZGVyQW5kUGFkZGluZzsKKyAgICBpZiAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5
cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OlJhdGlvIHx8IChjaGlsZC5zdHlsZSgpLmFzcGVjdFJh
dGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6QXV0b0FuZFJhdGlvICYmIGNoaWxkSW50cmlu
c2ljU2l6ZS5pc0VtcHR5KCkpKSB7CiAgICAgICAgIHJhdGlvID0gY2hpbGQuc3R5bGUoKS5hc3Bl
Y3RSYXRpb1dpZHRoKCkgLyBjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvSGVpZ2h0KCk7Ci0gICAg
ZWxzZSB7CisgICAgICAgIGlmIChjaGlsZC5zdHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJhdGlv
KCkgPT0gQm94U2l6aW5nOjpDb250ZW50Qm94KQorICAgICAgICAgICAgY3Jvc3NTaXplIC09IGlz
SG9yaXpvbnRhbEZsb3coKSA/IGNoaWxkLnZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgp
IDogY2hpbGQuaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKTsKKyAgICAgICAgZWxz
ZQorICAgICAgICAgICAgYm9yZGVyQW5kUGFkZGluZyA9IGlzSG9yaXpvbnRhbEZsb3coKSA/IGNo
aWxkLmhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCkgOiBjaGlsZC52ZXJ0aWNhbEJv
cmRlckFuZFBhZGRpbmdFeHRlbnQoKTsKKyAgICB9IGVsc2UgewogICAgICAgICBBU1NFUlQoY2hp
bGRJbnRyaW5zaWNTaXplLmhlaWdodCgpKTsKICAgICAgICAgcmF0aW8gPSBjaGlsZEludHJpbnNp
Y1NpemUud2lkdGgoKS50b0Zsb2F0KCkgLyBjaGlsZEludHJpbnNpY1NpemUuaGVpZ2h0KCkudG9G
bG9hdCgpOworICAgICAgICBjcm9zc1NpemUgPSBhZGp1c3RGb3JCb3hTaXppbmcoY2hpbGQsIGNy
b3NzU2l6ZSk7CiAgICAgfQogICAgIGlmIChpc0hvcml6b250YWxGbG93KCkpCi0gICAgICAgIHJl
dHVybiBMYXlvdXRVbml0KGNyb3NzU2l6ZS52YWx1ZSgpICogcmF0aW8pOwotICAgIHJldHVybiBM
YXlvdXRVbml0KGNyb3NzU2l6ZS52YWx1ZSgpIC8gcmF0aW8pOworICAgICAgICByZXR1cm4gTGF5
b3V0VW5pdChjcm9zc1NpemUgKiByYXRpbykgLSBib3JkZXJBbmRQYWRkaW5nOworICAgIHJldHVy
biBMYXlvdXRVbml0KGNyb3NzU2l6ZSAvIHJhdGlvKSAtIGJvcmRlckFuZFBhZGRpbmc7CiB9CiAK
IHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OnNldEZsb3dBd2FyZUxvY2F0aW9uRm9yQ2hpbGQoUmVu
ZGVyQm94JiBjaGlsZCwgY29uc3QgTGF5b3V0UG9pbnQmIGxvY2F0aW9uKQpAQCAtMTIxMyw2ICsx
MjIwLDEyIEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmFkanVzdENoaWxkU2l6ZUZv
ck1pbkFuZE1heChSZW5kZXJCb3gmIGNoaWxkLCBMYXlvCiAgICAgaWYgKG1heC5pc1NwZWNpZmll
ZE9ySW50cmluc2ljKCkpIHsKICAgICAgICAgbWF4RXh0ZW50ID0gY29tcHV0ZU1haW5BeGlzRXh0
ZW50Rm9yQ2hpbGQoY2hpbGQsIE1heFNpemUsIG1heCk7CiAgICAgICAgIGNoaWxkU2l6ZSA9IHN0
ZDo6bWluKGNoaWxkU2l6ZSwgbWF4RXh0ZW50LnZhbHVlT3IoY2hpbGRTaXplKSk7CisgICAgfSBl
bHNlIGlmIChjaGlsZC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpIHsKKyAgICAgICAgbWF4ID0g
Y3Jvc3NTaXplTGVuZ3RoRm9yQ2hpbGQoTWF4U2l6ZSwgY2hpbGQpOworICAgICAgICBpZiAobWF4
LmlzU3BlY2lmaWVkT3JJbnRyaW5zaWMoKSkgeworICAgICAgICAgICAgbWF4RXh0ZW50ID0gY29t
cHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoY2hpbGQsIG1heCk7CisgICAgICAgICAg
ICBjaGlsZFNpemUgPSBzdGQ6Om1pbihjaGlsZFNpemUsIG1heEV4dGVudC52YWx1ZU9yKGNoaWxk
U2l6ZSkpOworICAgICAgICB9CiAgICAgfQogCiAgICAgTGVuZ3RoIG1pbiA9IG1haW5TaXplTGVu
Z3RoRm9yQ2hpbGQoTWluU2l6ZSwgY2hpbGQpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hh
bmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDBkYzg2MjZiNzAwMGFmZjM3MmVk
MTJkNGZhYzQ1ZGMyNmE5NGU3MmUuLjgwYjAzNTUxNjAxNzNkNjE3NzAyNzBkMmQ5MjhhMGUzMTRl
ZmYyMjIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0
cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMS0wNS0yNyAgUm9iIEJ1aXMgIDxyYnVp
c0BpZ2FsaWEuY29tPgorCisgICAgICAgIEZpeCBmbGV4LWFzcGVjdC1yYXRpby0wMjUrMjYuaHRt
bAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyMzU3
CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0
RXhwZWN0YXRpb25zOgorCiAyMDIxLTA1LTI3ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxl
LmNvbT4KIAogICAgICAgICBTdXBwb3J0IEgyNjQgcHJvZmlsZXMgaW4gTWVkaWFSZWNvcmRlcgpk
aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xheW91dFRl
c3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggYzk4MjY5ZjEwOTVkOGYwZDk0NDNiYjg5
ODQ5ZDVlZTI2N2JhYzllOC4uYTc0MmI2MWM2ZDI2MWIzMzg2MmNjOTQ0ZmEzODEwY2ViOTc2NDBi
YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZworKysgYi9M
YXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEt
MDUtMjcgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBGaXggZmxleC1h
c3BlY3QtcmF0aW8tMDI1KzI2Lmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTIyMjM1NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj
dC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbDoKKyAgICAgICAgKiB3ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAy
Ni5odG1sOgorCiAyMDIxLTA1LTI2ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdl
YmtpdC5vcmc+CiAKICAgICAgICAgVVJMIHBhdGggc2V0dGVyIG1lc3NlcyB1cCBVVEYtOCBlbmNv
ZGluZyBhZnRlciA/CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIv
TGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCBlZTJmYzFlMTA1ZGE3NDFmNjAzZmNl
YzUzMjI2ZWE4ZTgwYWIzZWI1Li42OTAzMzE0NjBmYmRiZDIwZDlmMTJhODE4NTA0NGY1ZmIwZGM4
MjZhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91
dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTQ0NTcsOCArNDQ1Nyw2IEBAIHdlYmtpdC5vcmcv
Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h
c3BlY3QtcmF0aW8vCiAjIGZsZXgtYmFzaXM6Y29udGVudAogd2Via2l0Lm9yZy9iLzIxNDQ2MyBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp
by9mbGV4LWFzcGVjdC1yYXRpby0wMjEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0
Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6
aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjIuaHRtbCBbIEltYWdlT25seUZh
aWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRt
bCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVj
dC1yYXRpby0wMjYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2
MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y
YXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Vi
a2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
c2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTkuaHRtbCBbIEltYWdlT25s
eUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMjAu
aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxl
eC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRp
by0wMjUuaHRtbAppbmRleCBjNGZmODExMGQ3YmVkNzA3OWM4NjRkZGYxOTJmODI0MjkzMmU1ODhk
Li5iZjhkYWFhMzVmMDhhNDEyODIyZGQ0MWU3NDk5MDI1ZTQwNjVlMjg0IDEwMDY0NAotLS0gYS9M
YXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n
L2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbAorKysgYi9MYXlvdXRUZXN0
cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y
YXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbApAQCAtNCw2ICs0LDggQEAKICAgPGxpbmsg
cmVsPSJhdXRob3IiIHRpdGxlPSJUaW5nLVl1IExpbiIgaHJlZj0ibWFpbHRvOnRsaW5AbW96aWxs
YS5jb20iPgogICA8bGluayByZWw9ImF1dGhvciIgdGl0bGU9Ik1vemlsbGEiIGhyZWY9Imh0dHBz
Oi8vd3d3Lm1vemlsbGEub3JnLyI+CiAgIDxsaW5rIHJlbD0iaGVscCIgaHJlZj0iaHR0cHM6Ly9k
cmFmdHMuY3Nzd2cub3JnL2Nzcy1zaXppbmctNC8jYXNwZWN0LXJhdGlvIj4KKyAgPGxpbmsgcmVs
PSJoZWxwIiBocmVmPSJodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLXNpemluZy00LyNhc3Bl
Y3QtcmF0aW8tbWluaW11bSI+CisgIDxsaW5rIHJlbD0iaGVscCIgaHJlZj0iaHR0cHM6Ly9kcmFm
dHMuY3Nzd2cub3JnL2Nzcy1mbGV4Ym94LTEvI21pbi1zaXplLWF1dG8iPgogICA8bGluayByZWw9
Im1hdGNoIiBocmVmPSIuLi8uLi9yZWZlcmVuY2UvcmVmLWZpbGxlZC1ncmVlbi0yMDBweC1zcXVh
cmUuaHRtbCIgLz4KICAgPHN0eWxlPgogICAuZmxleENvbnRhaW5lciB7CkBAIC0yMSwyOCArMjMs
MzggQEAKIAogICA8cD5UZXN0IHBhc3NlcyBpZiB0aGVyZSBpcyBhIGZpbGxlZCBncmVlbiBzcXVh
cmUgYW5kIDxzdHJvbmc+bm8gcmVkPC9zdHJvbmc+LjwvcD4KIAorICA8IS0tIEluIGFsbCBvZiB0
aGUgc3VidGVzdHMgaGVyZSwgZWFjaCBmbGV4IGl0ZW0ncyBhdXRvbWF0aWMgbWluaW11bSB3aWR0
aCBpcworICAgICAgIHJlc29sdmVkIGRpcmVjdGx5IGZyb20gaXRzIGNvbnRlbnQgc2l6ZSBzdWdn
ZXN0aW9uLiBOb3RhYmx5LCB0aGVzZSBpdGVtcworICAgICAgICpkbyBub3QqIGdldCBhICJ0cmFu
c2ZlcnJlZCBzaXplIHN1Z2dlc3Rpb24iLCBiZWNhdXNlIHRoZXkgYXJlIGFsbAorICAgICAgICpu
b24tcmVwbGFjZWQqIGVsZW1lbnRzOyBhbmQgInRyYW5zZmVycmVkIHNpemUgc3VnZ2VzdGlvbiIg
aXMgb25seSB1c2VkCisgICAgICAgZm9yIHJlc29sdmluZyBhdXRvbWF0aWMgbWluaW11bSBzaXpl
cyBvbiAqcmVwbGFjZWQqIGVsZW1lbnRzLiBIb3dldmVyLAorICAgICAgIG5vdGUgdGhhdCB3ZSBk
byAidHJhbnNmZXIiIHNpemVzIHRocm91Z2ggdGhlIGFzcGVjdCByYXRpbywgYXMgcGFydCBvZgor
ICAgICAgIGNvbXB1dGluZyB0aGUgY29udGVudCBzaXplIHN1Z2dlc3Rpb24gYW5kL29yIGZsZXgg
YmFzZSBzaXplLiAtLT4KKwogICA8IS0tIEluIHRoZSBmb2xsb3dpbmcgZm91ciBmbGV4IGNvbnRh
aW5lcnMsIHRoZSBhc3BlY3QtcmF0aW8gd29ya3Mgd2l0aCBib3JkZXItYm94LiAtLT4KICAgPGRp
diBjbGFzcz0iZmxleENvbnRhaW5lciIgc3R5bGU9IndpZHRoOiBhdXRvOyI+CiAgICAgPCEtLSBU
aGUgYm9yZGVyLWJveCBoZWlnaHQgMjVweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlz
LAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBmbGV4IGJhc2Ugc2l6ZSBvZiAyMDBweC4g
LS0+CisgICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIGZsZXggYmFzZSBzaXplIChib3JkZXIt
Ym94KSBvZiAyMDBweC4gLS0+CiAgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi13aWR0
aDowOyBoZWlnaHQ6IDI1cHg7IGFzcGVjdC1yYXRpbzogOC8xOyI+PC9kaXY+CiAgIDwvZGl2Pgog
CiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgotICAgIDwhLS0gVGhlIGJvcmRlci1ib3gg
aGVpZ2h0IDI1cHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlp
ZWxkaW5nIGEgcmVzb2x2ZWQgbWluLXdpZHRoOmF1dG8gb2YgMjAwcHguIC0tPgorICAgIDwhLS0g
VGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIChib3JkZXItYm94KSBpcyAyMDBweCBiZWNhdXNl
IHRoZQorICAgICAgICAgYm9yZGVyLWJveCBoZWlnaHQgMjVweCBpcyB0cmFuc2ZlcnJlZCB0byB0
aGUgbWFpbiBheGlzLiAtLT4KICAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0iaGVpZ2h0OiAy
NXB4OyBhc3BlY3QtcmF0aW86IDgvMTsiPjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2IGNsYXNz
PSJmbGV4Q29udGFpbmVyIj4KLSAgICA8IS0tIFRoZSBib3JkZXItYm94IG1pbi1oZWlnaHQgMjVw
eCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSBy
ZXNvbHZlZCBtaW4td2lkdGg6YXV0byBvZiAyMDBweC4gLS0+CisgICAgPCEtLSBUaGUgY29udGVu
dCBzaXplIHN1Z2dlc3Rpb24gKGJvcmRlci1ib3gpIGlzIDIwMHB4IGJlY2F1c2UgdGhlCisgICAg
ICAgICBib3JkZXItYm94IGhlaWdodCAyNXB4IChlbmZvcmNlZCBieSBtaW4taGVpZ2h0KSBpcyB0
cmFuc2ZlcnJlZCB0byB0aGUKKyAgICAgICAgIG1haW4gYXhpcy4gLS0+CiAgICAgPGRpdiBjbGFz
cz0iaXRlbSIgc3R5bGU9Im1pbi1oZWlnaHQ6IDI1cHg7IGFzcGVjdC1yYXRpbzogOC8xOyI+PC9k
aXY+CiAgIDwvZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgotICAgIDwhLS0g
VGhlIGJvcmRlci1ib3ggaGVpZ2h0IDI1cHggKGNsYW1wZWQgYnkgbWF4LWhlaWdodCkgaXMgdHJh
bnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQg
bWluLXdpZHRoOmF1dG8gb2YgMjAwcHguIC0tPgorICAgIDwhLS0gVGhlIGNvbnRlbnQgc2l6ZSBz
dWdnZXN0aW9uIChib3JkZXItYm94KSBpcyAyMDBweCBiZWNhdXNlIHRoZQorICAgICAgICAgYm9y
ZGVyLWJveCBoZWlnaHQgMjVweCAoY2xhbXBlZCBieSBtYXgtaGVpZ2h0KSBpcyB0cmFuc2ZlcnJl
ZCB0byB0aGUKKyAgICAgICAgIG1haW4gYXhpcy4gLS0+CiAgICAgPGRpdiBjbGFzcz0iaXRlbSIg
c3R5bGU9Im1heC1oZWlnaHQ6IDI1cHg7IGhlaWdodDogMTAwcHg7IGFzcGVjdC1yYXRpbzogOC8x
OyI+PC9kaXY+CiAgIDwvZGl2PgogCkBAIC01MCwyNSArNjIsMjcgQEAKICAgICAgICBiZWNhdXNl
IGl0cyB2YWx1ZSBjb250YWlucyAnYXV0bycuIC0tPgogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFp
bmVyIiBzdHlsZT0id2lkdGg6IGF1dG87Ij4KICAgICA8IS0tIFRoZSBjb250ZW50LWJveCBoZWln
aHQgMTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRp
bmcgYSByZXNvbHZlZCBmbGV4IGJhc2Ugc2l6ZSBvZiAxOTBweC4gLS0+CisgICAgICAgICB5aWVs
ZGluZyBhIHJlc29sdmVkIGZsZXggYmFzZSBzaXplIChjb250ZW50LWJveCkgb2YgMTkwcHguIC0t
PgogICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4td2lkdGg6MDsgaGVpZ2h0OiAyNXB4
OyBhc3BlY3QtcmF0aW86IGF1dG8gMTkvMTsiPjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2IGNs
YXNzPSJmbGV4Q29udGFpbmVyIj4KLSAgICA8IS0tIFRoZSBjb250ZW50LWJveCBoZWlnaHQgMTBw
eCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSBy
ZXNvbHZlZCBtaW4td2lkdGg6YXV0byBvZiAxOTBweC4gLS0+CisgICAgPCEtLSBUaGUgY29udGVu
dCBzaXplIHN1Z2dlc3Rpb24gKGNvbnRlbnQtYm94KSBpcyAxOTBweCBiZWNhdXNlIHRoZQorICAg
ICAgICAgY29udGVudC1ib3ggaGVpZ2h0IDEwcHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4g
YXhpcy4gLS0+CiAgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9ImhlaWdodDogMjVweDsgYXNw
ZWN0LXJhdGlvOiBhdXRvIDE5LzE7Ij48L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRpdiBjbGFzcz0i
ZmxleENvbnRhaW5lciI+Ci0gICAgPCEtLSBUaGUgY29udGVudC1ib3ggbWluLWhlaWdodCAxMHB4
IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBhIHJl
c29sdmVkIG1pbi13aWR0aDphdXRvIG9mIDE5MHB4LiAtLT4KKyAgICA8IS0tIFRoZSBjb250ZW50
IHNpemUgc3VnZ2VzdGlvbiAoY29udGVudC1ib3gpIGlzIDE5MHB4IGJlY2F1c2UgdGhlCisgICAg
ICAgICBjb250ZW50LWJveCBoZWlnaHQgMTBweCAoZW5mb3JjZWQgYnkgbWluLWhlaWdodCkgaXMg
dHJhbnNmZXJyZWQgdG8gdGhlCisgICAgICAgICBtYWluIGF4aXMuIC0tPgogICAgIDxkaXYgY2xh
c3M9Iml0ZW0iIHN0eWxlPSJtaW4taGVpZ2h0OiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMTkv
MTsiPjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAg
ICA8IS0tIFRoZSBjb250ZW50LWJveCBoZWlnaHQgMTBweCAoY2xhbXBlZCBieSBtYXgtaGVpZ2h0
KSBpcyB0cmFuc2ZlcnJlZAotICAgICAgICAgdG8gdGhlIG1haW4gYXhpcywgeWllbGRpbmcgYSBy
ZXNvbHZlZCBtaW4td2lkdGg6YXV0byBvZiAxOTBweC4gLS0+CisgICAgPCEtLSBUaGUgY29udGVu
dCBzaXplIHN1Z2dlc3Rpb24gKGNvbnRlbnQtYm94KSBpcyAxOTBweCBiZWNhdXNlIHRoZQorICAg
ICAgICAgY29udGVudC1ib3ggaGVpZ2h0IDEwcHggKGNsYW1wZWQgYnkgbWF4LWhlaWdodCkgaXMg
dHJhbnNmZXJyZWQgdG8gdGhlCisgICAgICAgICBtYWluIGF4aXMuIC0tPgogICAgIDxkaXYgY2xh
c3M9Iml0ZW0iIHN0eWxlPSJtYXgtaGVpZ2h0OiAyNXB4OyBoZWlnaHQ6IDEwMHB4OyBhc3BlY3Qt
cmF0aW86IGF1dG8gMTkvMTsiPjwvZGl2PgogICA8L2Rpdj4KIDwvaHRtbD4KZGlmZiAtLWdpdCBh
L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp
bmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sIGIvTGF5b3V0VGVzdHMv
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0
aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwKaW5kZXggYzRhMjUwODE4YmI3Nzg2ZTJmMzk1
OTIyZDI4ZTNjNzUxOWI0ZWEzYS4uZmY2YmYyYWE1NjkwNTUxODA4Yjk4ZTcxMTdlYzY1ZDkxNzhh
MzQyNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0
bWwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwKQEAgLTQs
NiArNCw4IEBACiAgIDxsaW5rIHJlbD0iYXV0aG9yIiB0aXRsZT0iVGluZy1ZdSBMaW4iIGhyZWY9
Im1haWx0bzp0bGluQG1vemlsbGEuY29tIj4KICAgPGxpbmsgcmVsPSJhdXRob3IiIHRpdGxlPSJN
b3ppbGxhIiBocmVmPSJodHRwczovL3d3dy5tb3ppbGxhLm9yZy8iPgogICA8bGluayByZWw9Imhl
bHAiIGhyZWY9Imh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3Mtc2l6aW5nLTQvI2FzcGVjdC1y
YXRpbyI+CisgIDxsaW5rIHJlbD0iaGVscCIgaHJlZj0iaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3Jn
L2Nzcy1zaXppbmctNC8jYXNwZWN0LXJhdGlvLW1pbmltdW0iPgorICA8bGluayByZWw9ImhlbHAi
IGhyZWY9Imh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZmxleGJveC0xLyNtaW4tc2l6ZS1h
dXRvIj4KICAgPGxpbmsgcmVsPSJtYXRjaCIgaHJlZj0iLi4vLi4vcmVmZXJlbmNlL3JlZi1maWxs
ZWQtZ3JlZW4tMjAwcHgtc3F1YXJlLmh0bWwiIC8+CiAgIDxzdHlsZT4KICAgLmZsZXhDb250YWlu
ZXIgewpAQCAtMTksNjAgKzIxLDc0IEBACiAgICAgYm94LXNpemluZzogYm9yZGVyLWJveDsKICAg
fQogICAuaXRlbSA+IGRpdiB7Ci0gICAgaGVpZ2h0OiA1MDBweDsgLyogU2V0IGEgbGFyZ2UgY29u
dGVudCBzaXplIHN1Z2dlc3Rpb24gZm9yIGZsZXggaXRlbS4gKi8KKyAgICBoZWlnaHQ6IDE5MHB4
OyAvKiBTZXQgdGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIGZvciBmbGV4IGl0ZW0uICovCiAg
IH0KICAgPC9zdHlsZT4KIAogICA8cD5UZXN0IHBhc3NlcyBpZiB0aGVyZSBpcyBhIGZpbGxlZCBn
cmVlbiBzcXVhcmUgYW5kIDxzdHJvbmc+bm8gcmVkPC9zdHJvbmc+LjwvcD4KIAorICA8IS0tIElu
IGFsbCBvZiB0aGUgc3VidGVzdHMgaGVyZSwgZWFjaCBmbGV4IGl0ZW0ncyBhdXRvbWF0aWMgbWlu
aW11bSBoZWlnaHQgaXMKKyAgICAgICByZXNvbHZlZCBkaXJlY3RseSBmcm9tIGl0cyBjb250ZW50
IHNpemUgc3VnZ2VzdGlvbi4gTm90YWJseSwgdGhlc2UgaXRlbXMKKyAgICAgICAqZG8gbm90KiBn
ZXQgYSAidHJhbnNmZXJyZWQgc2l6ZSBzdWdnZXN0aW9uIiwgYmVjYXVzZSB0aGV5IGFyZSBhbGwK
KyAgICAgICAqbm9uLXJlcGxhY2VkKiBlbGVtZW50czsgYW5kICJ0cmFuc2ZlcnJlZCBzaXplIHN1
Z2dlc3Rpb24iIGlzIG9ubHkgdXNlZAorICAgICAgIGZvciByZXNvbHZpbmcgYXV0b21hdGljIG1p
bmltdW0gc2l6ZXMgb24gKnJlcGxhY2VkKiBlbGVtZW50cy4gSG93ZXZlciwKKyAgICAgICBub3Rl
IHRoYXQgd2UgZG8gInRyYW5zZmVyIiBzaXplcyB0aHJvdWdoIHRoZSBhc3BlY3QgcmF0aW8sIGFz
IHBhcnQgb2YKKyAgICAgICBjb21wdXRpbmcgdGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIGFu
ZC9vciBmbGV4IGJhc2Ugc2l6ZS4gLS0+CisKICAgPCEtLSBJbiB0aGUgZm9sbG93aW5nIGZvdXIg
ZmxleCBjb250YWluZXJzLCB0aGUgYXNwZWN0LXJhdGlvIHdvcmtzIHdpdGggYm9yZGVyLWJveC4g
LS0+CiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiIHN0eWxlPSJoZWlnaHQ6IGF1dG87Ij4K
ICAgICA8IS0tIFRoZSBib3JkZXItYm94IHdpZHRoIDI1cHggaXMgdHJhbnNmZXJyZWQgdG8gdGhl
IG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgZmxleCBiYXNlIHNpemUg
b2YgMjAwcHguIC0tPgorICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBmbGV4IGJhc2Ugc2l6
ZSAoYm9yZGVyLWJveCkgb2YgMjAwcHguIC0tPgogICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxl
PSJtaW4taGVpZ2h0OjA7IHdpZHRoOiAyNXB4OyBhc3BlY3QtcmF0aW86IDEvODsiPjxkaXY+PC9k
aXY+PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgotICAg
IDwhLS0gVGhlIGJvcmRlci1ib3ggd2lkdGggMjVweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFp
biBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8gb2Yg
MjAwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJ3aWR0aDogMjVweDsgYXNw
ZWN0LXJhdGlvOiAxLzg7Ij48ZGl2PjwvZGl2PjwvZGl2PgorICAgIDwhLS0gVGhlIGNvbnRlbnQg
c2l6ZSBzdWdnZXN0aW9uIGlzIDE5MHB4LCBpLmUuIHRoZSBoZWlnaHQgb2YgdGhlIGl0ZW0ncwor
ICAgICAgICAgY2hpbGQgZGl2LiAtLT4KKyAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0id2lk
dGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogMS8xOyI+PGRpdj48L2Rpdj48L2Rpdj4KICAgPC9kaXY+
CiAKICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciI+Ci0gICAgPCEtLSBUaGUgYm9yZGVyLWJv
eCBtaW4td2lkdGggMjVweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAg
ICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8gb2YgMjAwcHguIC0tPgotICAg
IDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4td2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzog
MS84OyI+PGRpdj48L2Rpdj48L2Rpdj4KKyAgICA8IS0tIFRoZSBjb250ZW50IHNpemUgc3VnZ2Vz
dGlvbiBpcyAxOTBweCwgaS5lLiB0aGUgaGVpZ2h0IG9mIHRoZSBpdGVtJ3MKKyAgICAgICAgIGNo
aWxkIGRpdi4gLS0+CisgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi13aWR0aDogMjVw
eDsgYXNwZWN0LXJhdGlvOiAxLzE7Ij48ZGl2PjwvZGl2PjwvZGl2PgogICA8L2Rpdj4KIAogICA8
ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAgICA8IS0tIFRoZSBib3JkZXItYm94IHdpZHRo
IDI1cHggKGNsYW1wZWQgYnkgbWF4LXdpZHRoKSBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBh
eGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8gb2YgMjAw
cHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtYXgtd2lkdGg6IDI1cHg7IHdp
ZHRoOiAxMDBweDsgYXNwZWN0LXJhdGlvOiAxLzg7Ij48ZGl2PjwvZGl2PjwvZGl2PgorICAgIDwh
LS0gVGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIGlzIDIwMHB4IGJlY2F1c2UgdGhlIGJvcmRl
ci1ib3ggbWF4LXdpZHRoCisgICAgICAgICAyNXB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWlu
IGF4aXMgYXMgdGhlIHVwcGVyIGJvdW5kIG9mIGl0cworICAgICAgICAgYm9yZGVyLWJveCBoZWln
aHQuIC0tPgorICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtYXgtd2lkdGg6IDI1cHg7IHdp
ZHRoOiAxMDBweDsgYXNwZWN0LXJhdGlvOiAxLzg7Ij4KKyAgICAgIDxkaXYgc3R5bGU9ImhlaWdo
dDogNTAwcHgiPjwvZGl2PgorICAgIDwvZGl2PgogICA8L2Rpdj4KIAogICA8IS0tIEluIHRoZSBm
b2xsb3dpbmcgZm91ciBmbGV4IGNvbnRhaW5lcnMsIHRoZSBhc3BlY3QtcmF0aW8gd29ya3Mgd2l0
aCBjb250ZW50LWJveAogICAgICAgIGJlY2F1c2UgaXRzIHZhbHVlIGNvbnRhaW5zICdhdXRvJy4g
LS0+CiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiIHN0eWxlPSJoZWlnaHQ6IGF1dG87Ij4K
ICAgICA8IS0tIFRoZSBjb250ZW50LWJveCB3aWR0aCAxMHB4IGlzIHRyYW5zZmVycmVkIHRvIHRo
ZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIGZsZXggYmFzZSBzaXpl
IG9mIDE5MHB4LiAtLT4KKyAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgZmxleCBiYXNlIHNp
emUgKGNvbnRlbnQtYm94KSBvZiAxOTBweC4gLS0+CiAgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5
bGU9Im1pbi1oZWlnaHQ6MDsgd2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE5OyI+
PGRpdj48L2Rpdj48L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5l
ciI+Ci0gICAgPCEtLSBUaGUgY29udGVudC1ib3ggd2lkdGggMTBweCBpcyB0cmFuc2ZlcnJlZCB0
byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0
OmF1dG8gb2YgMTkwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJ3aWR0aDog
MjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEvMTk7Ij48ZGl2PjwvZGl2PjwvZGl2PgorICAgIDwh
LS0gVGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIGlzIDE5MHB4LCBpLmUuIHRoZSBoZWlnaHQg
b2YgdGhlIGl0ZW0ncworICAgICAgICAgY2hpbGQgZGl2LiAtLT4KKyAgICA8ZGl2IGNsYXNzPSJp
dGVtIiBzdHlsZT0id2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE7Ij48ZGl2Pjwv
ZGl2PjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAg
ICA8IS0tIFRoZSBjb250ZW50LWJveCBtaW4td2lkdGggMTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0
aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1
dG8gb2YgMTkwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4td2lkdGg6
IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE5OyI+PGRpdj48L2Rpdj48L2Rpdj4KKyAgICA8
IS0tIFRoZSBjb250ZW50IHNpemUgc3VnZ2VzdGlvbiBpcyAxOTBweCwgaS5lLiB0aGUgaGVpZ2h0
IG9mIHRoZSBpdGVtJ3MKKyAgICAgICAgIGNoaWxkIGRpdi4gLS0+CisgICAgPGRpdiBjbGFzcz0i
aXRlbSIgc3R5bGU9Im1pbi13aWR0aDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEvMTsiPjxk
aXY+PC9kaXY+PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIi
PgotICAgIDwhLS0gVGhlIGNvbnRlbnQtYm94IHdpZHRoIDEwcHggKGNsYW1wZWQgYnkgbWF4LXdp
ZHRoKSBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcg
YSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8gb2YgMTkwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9
Iml0ZW0iIHN0eWxlPSJtYXgtd2lkdGg6IDI1cHg7IHdpZHRoOiAxMDBweDsgYXNwZWN0LXJhdGlv
OiBhdXRvIDEvMTk7Ij48ZGl2PjwvZGl2PjwvZGl2PgorICAgIDwhLS0gVGhlIGNvbnRlbnQgc2l6
ZSBzdWdnZXN0aW9uIGlzIDE5MHB4IGJlY2F1c2UgdGhlIGNvbnRlbnQtYm94IG1heC13aWR0aAor
ICAgICAgICAgMTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzIGFzIHRoZSB1cHBl
ciBib3VuZCBvZiBpdHMKKyAgICAgICAgIGNvbnRlbnQtYm94IGhlaWdodC4tLT4KKyAgICA8ZGl2
IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWF4LXdpZHRoOiAyNXB4OyB3aWR0aDogMTAwcHg7IGFzcGVj
dC1yYXRpbzogYXV0byAxLzE5OyI+CisgICAgICA8ZGl2IHN0eWxlPSJoZWlnaHQ6IDUwMHB4Ij48
L2Rpdj4KKyAgICA8L2Rpdj4KICAgPC9kaXY+CiA8L2h0bWw+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>430467</attachid>
            <date>2021-06-03 07:08:58 -0700</date>
            <delta_ts>2021-06-16 08:03:10 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210603160857.patch</filename>
            <type>text/plain</type>
            <size>19616</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NDAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjJiYzBlYmFiYWQ0Zjhj
MWQwMjMyNDdmNDYwYzg2ZjYyNjdjN2Y1ZC4uMGNiMzk4OGI5MTI1NzkwYzA3NTMyN2RhZDA3YmZh
ZDM0NjgxZDkxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA2LTAzICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBNYWtlIGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nIHRha2UgaW50byBh
Y2NvdW50CisgICAgICAgIGJveC1zaXppbmcgZm9yIHRoZSBjYXNlIHdoZXJlIENTUyBhc3BlY3Qt
cmF0aW8gaXMgYXBwbGllZC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRo
VXNpbmcgY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6
CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJv
bUFzcGVjdFJhdGlvVXNpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGli
bGVCb3g6OmFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heCk6CisKIDIwMjEtMDYtMDMgIEp1bGlh
biBHb256YWxleiAgPGp1bGlhbl9hX2dvbnphbGV6QGFwcGxlLmNvbT4KIAogICAgICAgICBDcmFz
aCBpbiBIVE1MQ29udmVydGVyOjpfYWRkTGlua0ZvckVsZW1lbnQoKQpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCA2ODM0ZjIzOGM0ZTYyNzQwMDE2NWVlYjNhOTE4ODI5
ZjIwN2VhN2I0Li4zOWRlZjg2ZTU5NmExODg0YzFiMzQwNWUzZmU2MTVlMjQ4MDg1MjM0IDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3Vy
Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtMjY3Miw5ICsyNjcyLDEwIEBA
IExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRoVXNpbmco
TGVuZ3RoIGxvZ2ljYWxXaWR0aExlbmd0CiAKICAgICBMYXlvdXRVbml0IG1pbkxvZ2ljYWxXaWR0
aDsKICAgICBMYXlvdXRVbml0IG1heExvZ2ljYWxXaWR0aDsKLSAgICBpZiAoIWxvZ2ljYWxXaWR0
aExlbmd0aC5pc01pbkludHJpbnNpYygpICYmIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9t
QXNwZWN0UmF0aW8oKSkKKyAgICBpZiAoIWxvZ2ljYWxXaWR0aExlbmd0aC5pc01pbkludHJpbnNp
YygpICYmIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSkgewogICAg
ICAgICBtaW5Mb2dpY2FsV2lkdGggPSBtYXhMb2dpY2FsV2lkdGggPSBjb21wdXRlTG9naWNhbFdp
ZHRoRnJvbUFzcGVjdFJhdGlvKCk7Ci0gICAgZWxzZQorICAgICAgICBib3JkZXJBbmRQYWRkaW5n
ID0gTGF5b3V0VW5pdCgpOworICAgIH0gZWxzZQogICAgICAgICBjb21wdXRlSW50cmluc2ljS2V5
d29yZExvZ2ljYWxXaWR0aHMobWluTG9naWNhbFdpZHRoLCBtYXhMb2dpY2FsV2lkdGgpOwogCiAg
ICAgaWYgKGxvZ2ljYWxXaWR0aExlbmd0aC5pc01pbkNvbnRlbnQoKSB8fCBsb2dpY2FsV2lkdGhM
ZW5ndGguaXNNaW5JbnRyaW5zaWMoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl
cmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu
ZGVyRmxleGlibGVCb3guY3BwCmluZGV4IDg3NTkzZDY4NmMxZmQzYWRmOWU0ODg4YTI0YmI5ZTli
MjAyMWNlZDYuLjhhNGVkMDc0YmJmOGEzMjBiYmJhOGMxMjZmOWY1ODYxZTc1ODNjMWIgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysr
IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtODA4
LDkgKzgwOCw3IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6
ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJvCiB7CiAgICAgQVNTRVJUKGNoaWxk
SGFzQXNwZWN0UmF0aW8oY2hpbGQpKTsKIAotICAgIGF1dG8gYWRqdXN0Rm9yQm94U2l6aW5nID0g
W3RoaXNdIChjb25zdCBSZW5kZXJCb3gmIGJveCwgTGVuZ3RoIGxlbmd0aCkgLT4gTGF5b3V0VW5p
dCB7Ci0gICAgICAgIEFTU0VSVChsZW5ndGguaXNGaXhlZCgpKTsKLSAgICAgICAgYXV0byB2YWx1
ZSA9IExheW91dFVuaXQobGVuZ3RoLnZhbHVlKCkpOworICAgIGF1dG8gYWRqdXN0Rm9yQm94U2l6
aW5nID0gW3RoaXNdIChjb25zdCBSZW5kZXJCb3gmIGJveCwgTGF5b3V0VW5pdCB2YWx1ZSkgLT4g
TGF5b3V0VW5pdCB7CiAgICAgICAgIC8vIFdlIG5lZWQgdG8gc3Vic3RyYWN0IHRoZSBib3JkZXIg
YW5kIHBhZGRpbmcgZXh0ZW50IGZyb20gdGhlIGNyb3NzIGF4aXMuCiAgICAgICAgIC8vIEZ1cnRo
ZXJtb3JlLCB0aGUgc2l6aW5nIGNhbGN1bGF0aW9ucyB0aGF0IGZsb29yIHRoZSBjb250ZW50IGJv
eCBzaXplIGF0IHplcm8gd2hlbiBhcHBseWluZyBib3gtc2l6aW5nIGFyZSBhbHNvIGlnbm9yZWQu
CiAgICAgICAgIC8vIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZmxleGJveC8jYWxnby1t
YWluLWl0ZW0uCkBAIC04MTksOSArODE3LDExIEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVC
b3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJvCiAg
ICAgICAgIHJldHVybiB2YWx1ZTsKICAgICB9OwogCi0gICAgc3RkOjpvcHRpb25hbDxMYXlvdXRV
bml0PiBjcm9zc1NpemU7CisgICAgLy8gY3Jvc3NTaXplIGlzIGJvcmRlci1ib3ggc2l6ZSBpZiBi
b3gtc2l6aW5nIGlzIGJvcmRlci1ib3gsIGFuZAorICAgIC8vIGNvbnRlbnQtYm94IG90aGVyd2lz
ZS4KKyAgICBMYXlvdXRVbml0IGNyb3NzU2l6ZTsKICAgICBpZiAoY3Jvc3NTaXplTGVuZ3RoLmlz
Rml4ZWQoKSkKLSAgICAgICAgY3Jvc3NTaXplID0gYWRqdXN0Rm9yQm94U2l6aW5nKGNoaWxkLCBj
cm9zc1NpemVMZW5ndGgpOworICAgICAgICBjcm9zc1NpemUgPSBMYXlvdXRVbml0KGNyb3NzU2l6
ZUxlbmd0aC52YWx1ZSgpKTsKICAgICBlbHNlIGlmIChjcm9zc1NpemVMZW5ndGguaXNBdXRvKCkp
IHsKICAgICAgICAgQVNTRVJUKGNoaWxkQ3Jvc3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NT
aXplKGNoaWxkKSk7CiAgICAgICAgIGF1dG8gY29udGFpbmVyQ3Jvc3NTaXplTGVuZ3RoID0gaXNI
b3Jpem9udGFsRmxvdygpID8gc3R5bGUoKS5oZWlnaHQoKSA6IHN0eWxlKCkud2lkdGgoKTsKQEAg
LTgzMCwyMiArODMwLDI5IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVN
YWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJvCiAgICAgICAgIGNyb3Nz
U2l6ZSA9IHN0ZDo6bWF4KDBfbHUsIHZhbHVlRm9yTGVuZ3RoKGNvbnRhaW5lckNyb3NzU2l6ZUxl
bmd0aCwgLTFfbHUpIC0gY3Jvc3NBeGlzTWFyZ2luRXh0ZW50Rm9yQ2hpbGQoY2hpbGQpKTsKICAg
ICB9IGVsc2UgewogICAgICAgICBBU1NFUlQoY3Jvc3NTaXplTGVuZ3RoLmlzUGVyY2VudE9yQ2Fs
Y3VsYXRlZCgpKTsKLSAgICAgICAgY3Jvc3NTaXplID0gbWFpbkF4aXNJc0NoaWxkSW5saW5lQXhp
cyhjaGlsZCkgPyBjaGlsZC5jb21wdXRlUGVyY2VudGFnZUxvZ2ljYWxIZWlnaHQoY3Jvc3NTaXpl
TGVuZ3RoKSA6IGFkanVzdEJvcmRlckJveExvZ2ljYWxXaWR0aEZvckJveFNpemluZyh2YWx1ZUZv
ckxlbmd0aChjcm9zc1NpemVMZW5ndGgsIGNvbnRlbnRXaWR0aCgpKSwgY3Jvc3NTaXplTGVuZ3Ro
LnR5cGUoKSk7Ci0gICAgICAgIGlmICghY3Jvc3NTaXplKQorICAgICAgICBzdGQ6Om9wdGlvbmFs
PExheW91dFVuaXQ+IGNoaWxkU2l6ZSA9IG1haW5BeGlzSXNDaGlsZElubGluZUF4aXMoY2hpbGQp
ID8gY2hpbGQuY29tcHV0ZVBlcmNlbnRhZ2VMb2dpY2FsSGVpZ2h0KGNyb3NzU2l6ZUxlbmd0aCkg
OiBhZGp1c3RCb3JkZXJCb3hMb2dpY2FsV2lkdGhGb3JCb3hTaXppbmcodmFsdWVGb3JMZW5ndGgo
Y3Jvc3NTaXplTGVuZ3RoLCBjb250ZW50V2lkdGgoKSksIGNyb3NzU2l6ZUxlbmd0aC50eXBlKCkp
OworICAgICAgICBpZiAoIWNoaWxkU2l6ZSkKICAgICAgICAgICAgIHJldHVybiAwX2x1OworICAg
ICAgICBjcm9zc1NpemUgPSBjaGlsZFNpemUudmFsdWUoKTsKICAgICB9CiAKICAgICBjb25zdCBM
YXlvdXRTaXplJiBjaGlsZEludHJpbnNpY1NpemUgPSBjaGlsZC5pbnRyaW5zaWNTaXplKCk7CiAg
ICAgZG91YmxlIHJhdGlvOwotICAgIGlmIChjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvVHlwZSgp
ID09IEFzcGVjdFJhdGlvVHlwZTo6UmF0aW8gfHwgKGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9U
eXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpBdXRvQW5kUmF0aW8gJiYgY2hpbGRJbnRyaW5zaWNT
aXplLmlzRW1wdHkoKSkpCisgICAgTGF5b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5nOworICAgIGlm
IChjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6UmF0
aW8gfHwgKGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBl
OjpBdXRvQW5kUmF0aW8gJiYgY2hpbGRJbnRyaW5zaWNTaXplLmlzRW1wdHkoKSkpIHsKICAgICAg
ICAgcmF0aW8gPSBjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvV2lkdGgoKSAvIGNoaWxkLnN0eWxl
KCkuYXNwZWN0UmF0aW9IZWlnaHQoKTsKLSAgICBlbHNlIHsKKyAgICAgICAgaWYgKGNoaWxkLnN0
eWxlKCkuYm94U2l6aW5nRm9yQXNwZWN0UmF0aW8oKSA9PSBCb3hTaXppbmc6OkNvbnRlbnRCb3gp
CisgICAgICAgICAgICBjcm9zc1NpemUgLT0gaXNIb3Jpem9udGFsRmxvdygpID8gY2hpbGQudmVy
dGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCkgOiBjaGlsZC5ob3Jpem9udGFsQm9yZGVyQW5k
UGFkZGluZ0V4dGVudCgpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBib3JkZXJBbmRQYWRk
aW5nID0gaXNIb3Jpem9udGFsRmxvdygpID8gY2hpbGQuaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRp
bmdFeHRlbnQoKSA6IGNoaWxkLnZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpOworICAg
IH0gZWxzZSB7CiAgICAgICAgIEFTU0VSVChjaGlsZEludHJpbnNpY1NpemUuaGVpZ2h0KCkpOwog
ICAgICAgICByYXRpbyA9IGNoaWxkSW50cmluc2ljU2l6ZS53aWR0aCgpLnRvRmxvYXQoKSAvIGNo
aWxkSW50cmluc2ljU2l6ZS5oZWlnaHQoKS50b0Zsb2F0KCk7CisgICAgICAgIGNyb3NzU2l6ZSA9
IGFkanVzdEZvckJveFNpemluZyhjaGlsZCwgY3Jvc3NTaXplKTsKICAgICB9CiAgICAgaWYgKGlz
SG9yaXpvbnRhbEZsb3coKSkKLSAgICAgICAgcmV0dXJuIExheW91dFVuaXQoY3Jvc3NTaXplLnZh
bHVlKCkgKiByYXRpbyk7Ci0gICAgcmV0dXJuIExheW91dFVuaXQoY3Jvc3NTaXplLnZhbHVlKCkg
LyByYXRpbyk7CisgICAgICAgIHJldHVybiBMYXlvdXRVbml0KGNyb3NzU2l6ZSAqIHJhdGlvKSAt
IGJvcmRlckFuZFBhZGRpbmc7CisgICAgcmV0dXJuIExheW91dFVuaXQoY3Jvc3NTaXplIC8gcmF0
aW8pIC0gYm9yZGVyQW5kUGFkZGluZzsKIH0KIAogdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6c2V0
Rmxvd0F3YXJlTG9jYXRpb25Gb3JDaGlsZChSZW5kZXJCb3gmIGNoaWxkLCBjb25zdCBMYXlvdXRQ
b2ludCYgbG9jYXRpb24pCkBAIC0xMjEzLDYgKzEyMjAsMTIgQEAgTGF5b3V0VW5pdCBSZW5kZXJG
bGV4aWJsZUJveDo6YWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KFJlbmRlckJveCYgY2hpbGQs
IExheW8KICAgICBpZiAobWF4LmlzU3BlY2lmaWVkT3JJbnRyaW5zaWMoKSkgewogICAgICAgICBt
YXhFeHRlbnQgPSBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjaGlsZCwgTWF4U2l6ZSwg
bWF4KTsKICAgICAgICAgY2hpbGRTaXplID0gc3RkOjptaW4oY2hpbGRTaXplLCBtYXhFeHRlbnQu
dmFsdWVfb3IoY2hpbGRTaXplKSk7CisgICAgfSBlbHNlIGlmIChjaGlsZC5zdHlsZSgpLmhhc0Fz
cGVjdFJhdGlvKCkpIHsKKyAgICAgICAgbWF4ID0gY3Jvc3NTaXplTGVuZ3RoRm9yQ2hpbGQoTWF4
U2l6ZSwgY2hpbGQpOworICAgICAgICBpZiAobWF4LmlzU3BlY2lmaWVkT3JJbnRyaW5zaWMoKSkg
eworICAgICAgICAgICAgbWF4RXh0ZW50ID0gY29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlv
VXNpbmcoY2hpbGQsIG1heCk7CisgICAgICAgICAgICBjaGlsZFNpemUgPSBzdGQ6Om1pbihjaGls
ZFNpemUsIG1heEV4dGVudC52YWx1ZV9vcihjaGlsZFNpemUpKTsKKyAgICAgICAgfQogICAgIH0K
IAogICAgIExlbmd0aCBtaW4gPSBtYWluU2l6ZUxlbmd0aEZvckNoaWxkKE1pblNpemUsIGNoaWxk
KTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5n
ZUxvZwppbmRleCAyOTM2OTYyMzY0ZmJlMTk3MzQ1MjI0ZTEzYTI1NDFhNWUzMjZmNzQ0Li4yMGEw
NDU3MzA1OGQyZjhkY2U4MTBmOWVlZGM1MTc4YWNkMjM2NTg5IDEwMDY0NAotLS0gYS9MYXlvdXRU
ZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIg
QEAKKzIwMjEtMDYtMDMgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBG
aXggZmxleC1hc3BlY3QtcmF0aW8tMDI1KzI2Lmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjM1NworCisgICAgICAgIFJldmlld2VkIGJ5IE5P
Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0wNi0w
MyAgSnVsaWFuIEdvbnphbGV6ICA8anVsaWFuX2FfZ29uemFsZXpAYXBwbGUuY29tPgogCiAgICAg
ICAgIENyYXNoIGluIEhUTUxDb252ZXJ0ZXI6Ol9hZGRMaW5rRm9yRWxlbWVudCgpCmRpZmYgLS1n
aXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1w
b3J0ZWQvdzNjL0NoYW5nZUxvZwppbmRleCBiMTNlMjViNmNkYjAxZjVmZTZlMGE0ZWJlMTZmZGFi
NDlkNDdkZjgyLi40NGVmYTQ1YWJmMzA0MTRkMTM5NGFmMzMyYWYwNGZkYmFiYzFmNWI4IDEwMDY0
NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRl
c3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMS0wNi0wMyAg
Um9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIEZpeCBmbGV4LWFzcGVjdC1y
YXRpby0wMjUrMjYuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1
Zy5jZ2k/aWQ9MjIyMzU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK
KyAgICAgICAgSW1wb3J0IHVwZGF0ZWQgV1BUIHRlc3RzLgorCisgICAgICAgICogd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0w
MjUuaHRtbDoKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw
ZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sOgorCiAyMDIxLTA2LTAyICBBbGV4
IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRml4IFdQ
VCB0ZXN0IHJlc291cmNlLXRpbWluZy9jcm9zcy1vcmlnaW4tcmVkaXJlY3RzLmh0bWwKZGlmZiAt
LWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhw
ZWN0YXRpb25zCmluZGV4IGZmN2NmOGY3Y2I4OTY3ZDg5OGVhNzA2ZmJmM2MwMzE5YTI4YTU5NTcu
LjczNTc4OWU2YTEzOGM4YWExN2QyMTA5ODE1MmY0OWIxNTI5NDQ2OGIgMTAwNjQ0Ci0tLSBhL0xh
eW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0
aW9ucwpAQCAtNDQ2MCw4ICs0NDYwLDYgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby8KICMgZmxl
eC1iYXNpczpjb250ZW50CiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlv
LTAyMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Zs
ZXgtYXNwZWN0LXJhdGlvLTAyMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3Jn
L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv
YXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sIFsg
SW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJh
dGlvLTAxOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGlt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv
L2dyaWQtYXNwZWN0LXJhdGlvLTAxOS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQu
b3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp
bmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAyMC5odG1sIFsgSW1hZ2VPbmx5RmFp
bHVyZSBdCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUu
aHRtbCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1sCmluZGV4IGM0
ZmY4MTEwZDdiZWQ3MDc5Yzg2NGRkZjE5MmY4MjQyOTMyZTU4OGQuLjIzOTljMTAzZWNkMjM5M2Mw
MjliOWI3OGJlNzU0YjcyMWVjY2ZhNWMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgt
YXNwZWN0LXJhdGlvLTAyNS5odG1sCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJh
dGlvLTAyNS5odG1sCkBAIC00LDYgKzQsOCBAQAogICA8bGluayByZWw9ImF1dGhvciIgdGl0bGU9
IlRpbmctWXUgTGluIiBocmVmPSJtYWlsdG86dGxpbkBtb3ppbGxhLmNvbSI+CiAgIDxsaW5rIHJl
bD0iYXV0aG9yIiB0aXRsZT0iTW96aWxsYSIgaHJlZj0iaHR0cHM6Ly93d3cubW96aWxsYS5vcmcv
Ij4KICAgPGxpbmsgcmVsPSJoZWxwIiBocmVmPSJodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3Nz
LXNpemluZy00LyNhc3BlY3QtcmF0aW8iPgorICA8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHBz
Oi8vZHJhZnRzLmNzc3dnLm9yZy9jc3Mtc2l6aW5nLTQvI2FzcGVjdC1yYXRpby1taW5pbXVtIj4K
KyAgPGxpbmsgcmVsPSJoZWxwIiBocmVmPSJodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLWZs
ZXhib3gtMS8jbWluLXNpemUtYXV0byI+CiAgIDxsaW5rIHJlbD0ibWF0Y2giIGhyZWY9Ii4uLy4u
L3JlZmVyZW5jZS9yZWYtZmlsbGVkLWdyZWVuLTIwMHB4LXNxdWFyZS5odG1sIiAvPgogICA8c3R5
bGU+CiAgIC5mbGV4Q29udGFpbmVyIHsKQEAgLTIxLDU0ICsyMywyMCBAQAogCiAgIDxwPlRlc3Qg
cGFzc2VzIGlmIHRoZXJlIGlzIGEgZmlsbGVkIGdyZWVuIHNxdWFyZSBhbmQgPHN0cm9uZz5ubyBy
ZWQ8L3N0cm9uZz4uPC9wPgogCi0gIDwhLS0gSW4gdGhlIGZvbGxvd2luZyBmb3VyIGZsZXggY29u
dGFpbmVycywgdGhlIGFzcGVjdC1yYXRpbyB3b3JrcyB3aXRoIGJvcmRlci1ib3guIC0tPgotICA8
ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIiBzdHlsZT0id2lkdGg6IGF1dG87Ij4KLSAgICA8IS0t
IFRoZSBib3JkZXItYm94IGhlaWdodCAyNXB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4
aXMsCi0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIGZsZXggYmFzZSBzaXplIG9mIDIwMHB4
LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWluLXdpZHRoOjA7IGhlaWdodDog
MjVweDsgYXNwZWN0LXJhdGlvOiA4LzE7Ij48L2Rpdj4KLSAgPC9kaXY+Ci0KLSAgPGRpdiBjbGFz
cz0iZmxleENvbnRhaW5lciI+Ci0gICAgPCEtLSBUaGUgYm9yZGVyLWJveCBoZWlnaHQgMjVweCBp
cyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNv
bHZlZCBtaW4td2lkdGg6YXV0byBvZiAyMDBweC4gLS0+Ci0gICAgPGRpdiBjbGFzcz0iaXRlbSIg
c3R5bGU9ImhlaWdodDogMjVweDsgYXNwZWN0LXJhdGlvOiA4LzE7Ij48L2Rpdj4KLSAgPC9kaXY+
CisgIDwhLS0gSW4gYWxsIG9mIHRoZSBzdWJ0ZXN0cyBoZXJlLCBlYWNoIGZsZXggaXRlbSdzIGF1
dG9tYXRpYyBtaW5pbXVtIHdpZHRoIGlzCisgICAgICAgcmVzb2x2ZWQgZGlyZWN0bHkgZnJvbSBp
dHMgY29udGVudCBzaXplIHN1Z2dlc3Rpb24uIE5vdGFibHksIHRoZXNlIGl0ZW1zCisgICAgICAg
KmRvIG5vdCogZ2V0IGEgInRyYW5zZmVycmVkIHNpemUgc3VnZ2VzdGlvbiIsIGJlY2F1c2UgdGhl
eSBhcmUgYWxsCisgICAgICAgKm5vbi1yZXBsYWNlZCogZWxlbWVudHM7IGFuZCAidHJhbnNmZXJy
ZWQgc2l6ZSBzdWdnZXN0aW9uIiBpcyBvbmx5IHVzZWQKKyAgICAgICBmb3IgcmVzb2x2aW5nIGF1
dG9tYXRpYyBtaW5pbXVtIHNpemVzIG9uICpyZXBsYWNlZCogZWxlbWVudHMuIEhvd2V2ZXIsCisg
ICAgICAgbm90ZSB0aGF0IHdlIGRvICJ0cmFuc2ZlciIgc2l6ZXMgdGhyb3VnaCB0aGUgYXNwZWN0
IHJhdGlvLCBhcyBwYXJ0IG9mCisgICAgICAgY29tcHV0aW5nIHRoZSBjb250ZW50IHNpemUgc3Vn
Z2VzdGlvbiBhbmQvb3IgZmxleCBiYXNlIHNpemUuIC0tPgogCisgIDwhLS0gSW4gdGhlIGZvbGxv
d2luZyBmb3VyIGZsZXggY29udGFpbmVycywgdGhlIGFzcGVjdC1yYXRpbyB3b3JrcyB3aXRoIGJv
cmRlci1ib3guIC0tPgogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAgICA8IS0tIFRo
ZSBib3JkZXItYm94IG1pbi1oZWlnaHQgMjVweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBh
eGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4td2lkdGg6YXV0byBvZiAyMDBw
eC4gLS0+CisgICAgPCEtLSBUaGUgY29udGVudCBzaXplIHN1Z2dlc3Rpb24gKGJvcmRlci1ib3gp
IGlzIDIwMHB4IGJlY2F1c2UgdGhlCisgICAgICAgICBib3JkZXItYm94IGhlaWdodCAyNXB4IChl
bmZvcmNlZCBieSBtaW4taGVpZ2h0KSBpcyB0cmFuc2ZlcnJlZCB0byB0aGUKKyAgICAgICAgIG1h
aW4gYXhpcy4gLS0+CiAgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi1oZWlnaHQ6IDI1
cHg7IGFzcGVjdC1yYXRpbzogOC8xOyI+PC9kaXY+CiAgIDwvZGl2PgogCi0gIDxkaXYgY2xhc3M9
ImZsZXhDb250YWluZXIiPgotICAgIDwhLS0gVGhlIGJvcmRlci1ib3ggaGVpZ2h0IDI1cHggKGNs
YW1wZWQgYnkgbWF4LWhlaWdodCkgaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAg
ICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLXdpZHRoOmF1dG8gb2YgMjAwcHguIC0tPgot
ICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtYXgtaGVpZ2h0OiAyNXB4OyBoZWlnaHQ6IDEw
MHB4OyBhc3BlY3QtcmF0aW86IDgvMTsiPjwvZGl2PgotICA8L2Rpdj4KLQotICA8IS0tIEluIHRo
ZSBmb2xsb3dpbmcgZm91ciBmbGV4IGNvbnRhaW5lcnMsIHRoZSBhc3BlY3QtcmF0aW8gd29ya3Mg
d2l0aCBjb250ZW50LWJveAotICAgICAgIGJlY2F1c2UgaXRzIHZhbHVlIGNvbnRhaW5zICdhdXRv
Jy4gLS0+Ci0gIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiIHN0eWxlPSJ3aWR0aDogYXV0bzsi
PgotICAgIDwhLS0gVGhlIGNvbnRlbnQtYm94IGhlaWdodCAxMHB4IGlzIHRyYW5zZmVycmVkIHRv
IHRoZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIGZsZXggYmFzZSBz
aXplIG9mIDE5MHB4LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWluLXdpZHRo
OjA7IGhlaWdodDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDE5LzE7Ij48L2Rpdj4KLSAgPC9k
aXY+Ci0KLSAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciI+Ci0gICAgPCEtLSBUaGUgY29udGVu
dC1ib3ggaGVpZ2h0IDEwcHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAg
ICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLXdpZHRoOmF1dG8gb2YgMTkwcHguIC0tPgotICAg
IDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJoZWlnaHQ6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0
byAxOS8xOyI+PC9kaXY+Ci0gIDwvZGl2PgotCi0gIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIi
PgotICAgIDwhLS0gVGhlIGNvbnRlbnQtYm94IG1pbi1oZWlnaHQgMTBweCBpcyB0cmFuc2ZlcnJl
ZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4td2lk
dGg6YXV0byBvZiAxOTBweC4gLS0+Ci0gICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi1o
ZWlnaHQ6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxOS8xOyI+PC9kaXY+Ci0gIDwvZGl2Pgot
Ci0gIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgotICAgIDwhLS0gVGhlIGNvbnRlbnQtYm94
IGhlaWdodCAxMHB4IChjbGFtcGVkIGJ5IG1heC1oZWlnaHQpIGlzIHRyYW5zZmVycmVkCi0gICAg
ICAgICB0byB0aGUgbWFpbiBheGlzLCB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi13aWR0aDphdXRv
IG9mIDE5MHB4LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWF4LWhlaWdodDog
MjVweDsgaGVpZ2h0OiAxMDBweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDE5LzE7Ij48L2Rpdj4KLSAg
PC9kaXY+CiA8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1y
YXRpby0wMjYuaHRtbCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1s
CmluZGV4IGM0YTI1MDgxOGJiNzc4NmUyZjM5NTkyMmQyOGUzYzc1MTliNGVhM2EuLmZmNmJmMmFh
NTY5MDU1MTgwOGI5OGU3MTE3ZWM2NWQ5MTc4YTM0MjUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz
L2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh
dGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgt
YXNwZWN0LXJhdGlvLTAyNi5odG1sCkBAIC00LDYgKzQsOCBAQAogICA8bGluayByZWw9ImF1dGhv
ciIgdGl0bGU9IlRpbmctWXUgTGluIiBocmVmPSJtYWlsdG86dGxpbkBtb3ppbGxhLmNvbSI+CiAg
IDxsaW5rIHJlbD0iYXV0aG9yIiB0aXRsZT0iTW96aWxsYSIgaHJlZj0iaHR0cHM6Ly93d3cubW96
aWxsYS5vcmcvIj4KICAgPGxpbmsgcmVsPSJoZWxwIiBocmVmPSJodHRwczovL2RyYWZ0cy5jc3N3
Zy5vcmcvY3NzLXNpemluZy00LyNhc3BlY3QtcmF0aW8iPgorICA8bGluayByZWw9ImhlbHAiIGhy
ZWY9Imh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3Mtc2l6aW5nLTQvI2FzcGVjdC1yYXRpby1t
aW5pbXVtIj4KKyAgPGxpbmsgcmVsPSJoZWxwIiBocmVmPSJodHRwczovL2RyYWZ0cy5jc3N3Zy5v
cmcvY3NzLWZsZXhib3gtMS8jbWluLXNpemUtYXV0byI+CiAgIDxsaW5rIHJlbD0ibWF0Y2giIGhy
ZWY9Ii4uLy4uL3JlZmVyZW5jZS9yZWYtZmlsbGVkLWdyZWVuLTIwMHB4LXNxdWFyZS5odG1sIiAv
PgogICA8c3R5bGU+CiAgIC5mbGV4Q29udGFpbmVyIHsKQEAgLTE5LDYwICsyMSw3NCBAQAogICAg
IGJveC1zaXppbmc6IGJvcmRlci1ib3g7CiAgIH0KICAgLml0ZW0gPiBkaXYgewotICAgIGhlaWdo
dDogNTAwcHg7IC8qIFNldCBhIGxhcmdlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIGZvciBmbGV4
IGl0ZW0uICovCisgICAgaGVpZ2h0OiAxOTBweDsgLyogU2V0IHRoZSBjb250ZW50IHNpemUgc3Vn
Z2VzdGlvbiBmb3IgZmxleCBpdGVtLiAqLwogICB9CiAgIDwvc3R5bGU+CiAKICAgPHA+VGVzdCBw
YXNzZXMgaWYgdGhlcmUgaXMgYSBmaWxsZWQgZ3JlZW4gc3F1YXJlIGFuZCA8c3Ryb25nPm5vIHJl
ZDwvc3Ryb25nPi48L3A+CiAKKyAgPCEtLSBJbiBhbGwgb2YgdGhlIHN1YnRlc3RzIGhlcmUsIGVh
Y2ggZmxleCBpdGVtJ3MgYXV0b21hdGljIG1pbmltdW0gaGVpZ2h0IGlzCisgICAgICAgcmVzb2x2
ZWQgZGlyZWN0bHkgZnJvbSBpdHMgY29udGVudCBzaXplIHN1Z2dlc3Rpb24uIE5vdGFibHksIHRo
ZXNlIGl0ZW1zCisgICAgICAgKmRvIG5vdCogZ2V0IGEgInRyYW5zZmVycmVkIHNpemUgc3VnZ2Vz
dGlvbiIsIGJlY2F1c2UgdGhleSBhcmUgYWxsCisgICAgICAgKm5vbi1yZXBsYWNlZCogZWxlbWVu
dHM7IGFuZCAidHJhbnNmZXJyZWQgc2l6ZSBzdWdnZXN0aW9uIiBpcyBvbmx5IHVzZWQKKyAgICAg
ICBmb3IgcmVzb2x2aW5nIGF1dG9tYXRpYyBtaW5pbXVtIHNpemVzIG9uICpyZXBsYWNlZCogZWxl
bWVudHMuIEhvd2V2ZXIsCisgICAgICAgbm90ZSB0aGF0IHdlIGRvICJ0cmFuc2ZlciIgc2l6ZXMg
dGhyb3VnaCB0aGUgYXNwZWN0IHJhdGlvLCBhcyBwYXJ0IG9mCisgICAgICAgY29tcHV0aW5nIHRo
ZSBjb250ZW50IHNpemUgc3VnZ2VzdGlvbiBhbmQvb3IgZmxleCBiYXNlIHNpemUuIC0tPgorCiAg
IDwhLS0gSW4gdGhlIGZvbGxvd2luZyBmb3VyIGZsZXggY29udGFpbmVycywgdGhlIGFzcGVjdC1y
YXRpbyB3b3JrcyB3aXRoIGJvcmRlci1ib3guIC0tPgogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFp
bmVyIiBzdHlsZT0iaGVpZ2h0OiBhdXRvOyI+CiAgICAgPCEtLSBUaGUgYm9yZGVyLWJveCB3aWR0
aCAyNXB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVsZGlu
ZyBhIHJlc29sdmVkIGZsZXggYmFzZSBzaXplIG9mIDIwMHB4LiAtLT4KKyAgICAgICAgIHlpZWxk
aW5nIGEgcmVzb2x2ZWQgZmxleCBiYXNlIHNpemUgKGJvcmRlci1ib3gpIG9mIDIwMHB4LiAtLT4K
ICAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWluLWhlaWdodDowOyB3aWR0aDogMjVweDsg
YXNwZWN0LXJhdGlvOiAxLzg7Ij48ZGl2PjwvZGl2PjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2
IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAgICA8IS0tIFRoZSBib3JkZXItYm94IHdpZHRoIDI1
cHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEg
cmVzb2x2ZWQgbWluLWhlaWdodDphdXRvIG9mIDIwMHB4LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJp
dGVtIiBzdHlsZT0id2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogMS84OyI+PGRpdj48L2Rpdj48
L2Rpdj4KKyAgICA8IS0tIFRoZSBjb250ZW50IHNpemUgc3VnZ2VzdGlvbiBpcyAxOTBweCwgaS5l
LiB0aGUgaGVpZ2h0IG9mIHRoZSBpdGVtJ3MKKyAgICAgICAgIGNoaWxkIGRpdi4gLS0+CisgICAg
PGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9IndpZHRoOiAyNXB4OyBhc3BlY3QtcmF0aW86IDEvMTsi
PjxkaXY+PC9kaXY+PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWlu
ZXIiPgotICAgIDwhLS0gVGhlIGJvcmRlci1ib3ggbWluLXdpZHRoIDI1cHggaXMgdHJhbnNmZXJy
ZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLWhl
aWdodDphdXRvIG9mIDIwMHB4LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWlu
LXdpZHRoOiAyNXB4OyBhc3BlY3QtcmF0aW86IDEvODsiPjxkaXY+PC9kaXY+PC9kaXY+CisgICAg
PCEtLSBUaGUgY29udGVudCBzaXplIHN1Z2dlc3Rpb24gaXMgMTkwcHgsIGkuZS4gdGhlIGhlaWdo
dCBvZiB0aGUgaXRlbSdzCisgICAgICAgICBjaGlsZCBkaXYuIC0tPgorICAgIDxkaXYgY2xhc3M9
Iml0ZW0iIHN0eWxlPSJtaW4td2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogMS8xOyI+PGRpdj48
L2Rpdj48L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciI+Ci0g
ICAgPCEtLSBUaGUgYm9yZGVyLWJveCB3aWR0aCAyNXB4IChjbGFtcGVkIGJ5IG1heC13aWR0aCkg
aXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVz
b2x2ZWQgbWluLWhlaWdodDphdXRvIG9mIDIwMHB4LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJpdGVt
IiBzdHlsZT0ibWF4LXdpZHRoOiAyNXB4OyB3aWR0aDogMTAwcHg7IGFzcGVjdC1yYXRpbzogMS84
OyI+PGRpdj48L2Rpdj48L2Rpdj4KKyAgICA8IS0tIFRoZSBjb250ZW50IHNpemUgc3VnZ2VzdGlv
biBpcyAyMDBweCBiZWNhdXNlIHRoZSBib3JkZXItYm94IG1heC13aWR0aAorICAgICAgICAgMjVw
eCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzIGFzIHRoZSB1cHBlciBib3VuZCBvZiBp
dHMKKyAgICAgICAgIGJvcmRlci1ib3ggaGVpZ2h0LiAtLT4KKyAgICA8ZGl2IGNsYXNzPSJpdGVt
IiBzdHlsZT0ibWF4LXdpZHRoOiAyNXB4OyB3aWR0aDogMTAwcHg7IGFzcGVjdC1yYXRpbzogMS84
OyI+CisgICAgICA8ZGl2IHN0eWxlPSJoZWlnaHQ6IDUwMHB4Ij48L2Rpdj4KKyAgICA8L2Rpdj4K
ICAgPC9kaXY+CiAKICAgPCEtLSBJbiB0aGUgZm9sbG93aW5nIGZvdXIgZmxleCBjb250YWluZXJz
LCB0aGUgYXNwZWN0LXJhdGlvIHdvcmtzIHdpdGggY29udGVudC1ib3gKICAgICAgICBiZWNhdXNl
IGl0cyB2YWx1ZSBjb250YWlucyAnYXV0bycuIC0tPgogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFp
bmVyIiBzdHlsZT0iaGVpZ2h0OiBhdXRvOyI+CiAgICAgPCEtLSBUaGUgY29udGVudC1ib3ggd2lk
dGggMTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRp
bmcgYSByZXNvbHZlZCBmbGV4IGJhc2Ugc2l6ZSBvZiAxOTBweC4gLS0+CisgICAgICAgICB5aWVs
ZGluZyBhIHJlc29sdmVkIGZsZXggYmFzZSBzaXplIChjb250ZW50LWJveCkgb2YgMTkwcHguIC0t
PgogICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4taGVpZ2h0OjA7IHdpZHRoOiAyNXB4
OyBhc3BlY3QtcmF0aW86IGF1dG8gMS8xOTsiPjxkaXY+PC9kaXY+PC9kaXY+CiAgIDwvZGl2Pgog
CiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgotICAgIDwhLS0gVGhlIGNvbnRlbnQtYm94
IHdpZHRoIDEwcHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlp
ZWxkaW5nIGEgcmVzb2x2ZWQgbWluLWhlaWdodDphdXRvIG9mIDE5MHB4LiAtLT4KLSAgICA8ZGl2
IGNsYXNzPSJpdGVtIiBzdHlsZT0id2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE5
OyI+PGRpdj48L2Rpdj48L2Rpdj4KKyAgICA8IS0tIFRoZSBjb250ZW50IHNpemUgc3VnZ2VzdGlv
biBpcyAxOTBweCwgaS5lLiB0aGUgaGVpZ2h0IG9mIHRoZSBpdGVtJ3MKKyAgICAgICAgIGNoaWxk
IGRpdi4gLS0+CisgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9IndpZHRoOiAyNXB4OyBhc3Bl
Y3QtcmF0aW86IGF1dG8gMS8xOyI+PGRpdj48L2Rpdj48L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRp
diBjbGFzcz0iZmxleENvbnRhaW5lciI+Ci0gICAgPCEtLSBUaGUgY29udGVudC1ib3ggbWluLXdp
ZHRoIDEwcHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxk
aW5nIGEgcmVzb2x2ZWQgbWluLWhlaWdodDphdXRvIG9mIDE5MHB4LiAtLT4KLSAgICA8ZGl2IGNs
YXNzPSJpdGVtIiBzdHlsZT0ibWluLXdpZHRoOiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMS8x
OTsiPjxkaXY+PC9kaXY+PC9kaXY+CisgICAgPCEtLSBUaGUgY29udGVudCBzaXplIHN1Z2dlc3Rp
b24gaXMgMTkwcHgsIGkuZS4gdGhlIGhlaWdodCBvZiB0aGUgaXRlbSdzCisgICAgICAgICBjaGls
ZCBkaXYuIC0tPgorICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4td2lkdGg6IDI1cHg7
IGFzcGVjdC1yYXRpbzogYXV0byAxLzE7Ij48ZGl2PjwvZGl2PjwvZGl2PgogICA8L2Rpdj4KIAog
ICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAgICA8IS0tIFRoZSBjb250ZW50LWJveCB3
aWR0aCAxMHB4IChjbGFtcGVkIGJ5IG1heC13aWR0aCkgaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1h
aW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLWhlaWdodDphdXRvIG9m
IDE5MHB4LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWF4LXdpZHRoOiAyNXB4
OyB3aWR0aDogMTAwcHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE5OyI+PGRpdj48L2Rpdj48L2Rp
dj4KKyAgICA8IS0tIFRoZSBjb250ZW50IHNpemUgc3VnZ2VzdGlvbiBpcyAxOTBweCBiZWNhdXNl
IHRoZSBjb250ZW50LWJveCBtYXgtd2lkdGgKKyAgICAgICAgIDEwcHggaXMgdHJhbnNmZXJyZWQg
dG8gdGhlIG1haW4gYXhpcyBhcyB0aGUgdXBwZXIgYm91bmQgb2YgaXRzCisgICAgICAgICBjb250
ZW50LWJveCBoZWlnaHQuLS0+CisgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1heC13aWR0
aDogMjVweDsgd2lkdGg6IDEwMHB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMS8xOTsiPgorICAgICAg
PGRpdiBzdHlsZT0iaGVpZ2h0OiA1MDBweCI+PC9kaXY+CisgICAgPC9kaXY+CiAgIDwvZGl2Pgog
PC9odG1sPgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>431546</attachid>
            <date>2021-06-16 08:03:14 -0700</date>
            <delta_ts>2021-06-25 09:22:04 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210616160313.patch</filename>
            <type>text/plain</type>
            <size>19590</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4OTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWU0MWNjN2VkZDk5ZTVi
M2Q4YjA0N2IyMzBiMmU1ZmZmMWIzNWRlYi4uZDUyNWRkZjVmYWZkYzg3Yzk2MDFjYzk0NGIwMTU1
Mzk0N2ZmNGM4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA2LTE2ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBNYWtlIGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nIHRha2UgaW50byBh
Y2NvdW50CisgICAgICAgIGJveC1zaXppbmcgZm9yIHRoZSBjYXNlIHdoZXJlIENTUyBhc3BlY3Qt
cmF0aW8gaXMgYXBwbGllZC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRo
VXNpbmcgY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6
CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJv
bUFzcGVjdFJhdGlvVXNpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGli
bGVCb3g6OmFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heCk6CisKIDIwMjEtMDYtMTYgIEFsYW4g
QnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIENvbnRlbnQgbW92ZXMgdXAgd2hl
biBob3ZlcmluZyBvdmVyIGEgbGluayBvbiBIYWNrZXIgTmV3cwpkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp
bmcvUmVuZGVyQm94LmNwcAppbmRleCBhMWQyZjhhYmJiMTVlNWY5NjBjZWM5MWQ3MDQ3ZWZjZTY3
ZDg4NmI2Li43OTAxNDJhZGU2MTAwZDZiZTI2N2RiM2RjOWE3NGEyOGYyOTFlMzBiIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2Uv
V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtMjY5OCw5ICsyNjk4LDEwIEBAIExh
eW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRoVXNpbmcoTGVu
Z3RoIGxvZ2ljYWxXaWR0aExlbmd0CiAKICAgICBMYXlvdXRVbml0IG1pbkxvZ2ljYWxXaWR0aDsK
ICAgICBMYXlvdXRVbml0IG1heExvZ2ljYWxXaWR0aDsKLSAgICBpZiAoIWxvZ2ljYWxXaWR0aExl
bmd0aC5pc01pbkludHJpbnNpYygpICYmIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNw
ZWN0UmF0aW8oKSkKKyAgICBpZiAoIWxvZ2ljYWxXaWR0aExlbmd0aC5pc01pbkludHJpbnNpYygp
ICYmIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSkgewogICAgICAg
ICBtaW5Mb2dpY2FsV2lkdGggPSBtYXhMb2dpY2FsV2lkdGggPSBjb21wdXRlTG9naWNhbFdpZHRo
RnJvbUFzcGVjdFJhdGlvKCk7Ci0gICAgZWxzZQorICAgICAgICBib3JkZXJBbmRQYWRkaW5nID0g
TGF5b3V0VW5pdCgpOworICAgIH0gZWxzZQogICAgICAgICBjb21wdXRlSW50cmluc2ljS2V5d29y
ZExvZ2ljYWxXaWR0aHMobWluTG9naWNhbFdpZHRoLCBtYXhMb2dpY2FsV2lkdGgpOwogCiAgICAg
aWYgKGxvZ2ljYWxXaWR0aExlbmd0aC5pc01pbkNvbnRlbnQoKSB8fCBsb2dpY2FsV2lkdGhMZW5n
dGguaXNNaW5JbnRyaW5zaWMoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu
Zy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy
RmxleGlibGVCb3guY3BwCmluZGV4IDA5MTAxMDJlNjVlNmZiMzM3OTdiN2FjOGM1ZGYzNGNiN2Q3
ZDA3OWEuLjBkODcxYzEyZWZjYjkwMTY4Y2VjYzM4NDQxNGNjNjQ2YzYzN2ExOTMgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIv
U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtNzk3LDkg
Kzc5Nyw3IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZy
b21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJvCiB7CiAgICAgQVNTRVJUKGNoaWxkSGFz
QXNwZWN0UmF0aW8oY2hpbGQpKTsKIAotICAgIGF1dG8gYWRqdXN0Rm9yQm94U2l6aW5nID0gW3Ro
aXNdIChjb25zdCBSZW5kZXJCb3gmIGJveCwgTGVuZ3RoIGxlbmd0aCkgLT4gTGF5b3V0VW5pdCB7
Ci0gICAgICAgIEFTU0VSVChsZW5ndGguaXNGaXhlZCgpKTsKLSAgICAgICAgYXV0byB2YWx1ZSA9
IExheW91dFVuaXQobGVuZ3RoLnZhbHVlKCkpOworICAgIGF1dG8gYWRqdXN0Rm9yQm94U2l6aW5n
ID0gW3RoaXNdIChjb25zdCBSZW5kZXJCb3gmIGJveCwgTGF5b3V0VW5pdCB2YWx1ZSkgLT4gTGF5
b3V0VW5pdCB7CiAgICAgICAgIC8vIFdlIG5lZWQgdG8gc3Vic3RyYWN0IHRoZSBib3JkZXIgYW5k
IHBhZGRpbmcgZXh0ZW50IGZyb20gdGhlIGNyb3NzIGF4aXMuCiAgICAgICAgIC8vIEZ1cnRoZXJt
b3JlLCB0aGUgc2l6aW5nIGNhbGN1bGF0aW9ucyB0aGF0IGZsb29yIHRoZSBjb250ZW50IGJveCBz
aXplIGF0IHplcm8gd2hlbiBhcHBseWluZyBib3gtc2l6aW5nIGFyZSBhbHNvIGlnbm9yZWQuCiAg
ICAgICAgIC8vIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZmxleGJveC8jYWxnby1tYWlu
LWl0ZW0uCkBAIC04MDgsOSArODA2LDExIEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6
OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJvCiAgICAg
ICAgIHJldHVybiB2YWx1ZTsKICAgICB9OwogCi0gICAgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0
PiBjcm9zc1NpemU7CisgICAgLy8gY3Jvc3NTaXplIGlzIGJvcmRlci1ib3ggc2l6ZSBpZiBib3gt
c2l6aW5nIGlzIGJvcmRlci1ib3gsIGFuZAorICAgIC8vIGNvbnRlbnQtYm94IG90aGVyd2lzZS4K
KyAgICBMYXlvdXRVbml0IGNyb3NzU2l6ZTsKICAgICBpZiAoY3Jvc3NTaXplTGVuZ3RoLmlzRml4
ZWQoKSkKLSAgICAgICAgY3Jvc3NTaXplID0gYWRqdXN0Rm9yQm94U2l6aW5nKGNoaWxkLCBjcm9z
c1NpemVMZW5ndGgpOworICAgICAgICBjcm9zc1NpemUgPSBMYXlvdXRVbml0KGNyb3NzU2l6ZUxl
bmd0aC52YWx1ZSgpKTsKICAgICBlbHNlIGlmIChjcm9zc1NpemVMZW5ndGguaXNBdXRvKCkpIHsK
ICAgICAgICAgQVNTRVJUKGNoaWxkQ3Jvc3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NTaXpl
KGNoaWxkKSk7CiAgICAgICAgIGF1dG8gY29udGFpbmVyQ3Jvc3NTaXplTGVuZ3RoID0gaXNIb3Jp
em9udGFsRmxvdygpID8gc3R5bGUoKS5oZWlnaHQoKSA6IHN0eWxlKCkud2lkdGgoKTsKQEAgLTgx
OSwyMiArODE5LDI5IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWlu
U2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJvCiAgICAgICAgIGNyb3NzU2l6
ZSA9IHN0ZDo6bWF4KDBfbHUsIHZhbHVlRm9yTGVuZ3RoKGNvbnRhaW5lckNyb3NzU2l6ZUxlbmd0
aCwgLTFfbHUpIC0gY3Jvc3NBeGlzTWFyZ2luRXh0ZW50Rm9yQ2hpbGQoY2hpbGQpKTsKICAgICB9
IGVsc2UgewogICAgICAgICBBU1NFUlQoY3Jvc3NTaXplTGVuZ3RoLmlzUGVyY2VudE9yQ2FsY3Vs
YXRlZCgpKTsKLSAgICAgICAgY3Jvc3NTaXplID0gbWFpbkF4aXNJc0NoaWxkSW5saW5lQXhpcyhj
aGlsZCkgPyBjaGlsZC5jb21wdXRlUGVyY2VudGFnZUxvZ2ljYWxIZWlnaHQoY3Jvc3NTaXplTGVu
Z3RoKSA6IGFkanVzdEJvcmRlckJveExvZ2ljYWxXaWR0aEZvckJveFNpemluZyh2YWx1ZUZvckxl
bmd0aChjcm9zc1NpemVMZW5ndGgsIGNvbnRlbnRXaWR0aCgpKSwgY3Jvc3NTaXplTGVuZ3RoLnR5
cGUoKSk7Ci0gICAgICAgIGlmICghY3Jvc3NTaXplKQorICAgICAgICBzdGQ6Om9wdGlvbmFsPExh
eW91dFVuaXQ+IGNoaWxkU2l6ZSA9IG1haW5BeGlzSXNDaGlsZElubGluZUF4aXMoY2hpbGQpID8g
Y2hpbGQuY29tcHV0ZVBlcmNlbnRhZ2VMb2dpY2FsSGVpZ2h0KGNyb3NzU2l6ZUxlbmd0aCkgOiBh
ZGp1c3RCb3JkZXJCb3hMb2dpY2FsV2lkdGhGb3JCb3hTaXppbmcodmFsdWVGb3JMZW5ndGgoY3Jv
c3NTaXplTGVuZ3RoLCBjb250ZW50V2lkdGgoKSksIGNyb3NzU2l6ZUxlbmd0aC50eXBlKCkpOwor
ICAgICAgICBpZiAoIWNoaWxkU2l6ZSkKICAgICAgICAgICAgIHJldHVybiAwX2x1OworICAgICAg
ICBjcm9zc1NpemUgPSBjaGlsZFNpemUudmFsdWUoKTsKICAgICB9CiAKICAgICBjb25zdCBMYXlv
dXRTaXplJiBjaGlsZEludHJpbnNpY1NpemUgPSBjaGlsZC5pbnRyaW5zaWNTaXplKCk7CiAgICAg
ZG91YmxlIHJhdGlvOwotICAgIGlmIChjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvVHlwZSgpID09
IEFzcGVjdFJhdGlvVHlwZTo6UmF0aW8gfHwgKGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9UeXBl
KCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpBdXRvQW5kUmF0aW8gJiYgY2hpbGRJbnRyaW5zaWNTaXpl
LmlzRW1wdHkoKSkpCisgICAgTGF5b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5nOworICAgIGlmIChj
aGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6UmF0aW8g
fHwgKGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpB
dXRvQW5kUmF0aW8gJiYgY2hpbGRJbnRyaW5zaWNTaXplLmlzRW1wdHkoKSkpIHsKICAgICAgICAg
cmF0aW8gPSBjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvV2lkdGgoKSAvIGNoaWxkLnN0eWxlKCku
YXNwZWN0UmF0aW9IZWlnaHQoKTsKLSAgICBlbHNlIHsKKyAgICAgICAgaWYgKGNoaWxkLnN0eWxl
KCkuYm94U2l6aW5nRm9yQXNwZWN0UmF0aW8oKSA9PSBCb3hTaXppbmc6OkNvbnRlbnRCb3gpCisg
ICAgICAgICAgICBjcm9zc1NpemUgLT0gaXNIb3Jpem9udGFsRmxvdygpID8gY2hpbGQudmVydGlj
YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCkgOiBjaGlsZC5ob3Jpem9udGFsQm9yZGVyQW5kUGFk
ZGluZ0V4dGVudCgpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBib3JkZXJBbmRQYWRkaW5n
ID0gaXNIb3Jpem9udGFsRmxvdygpID8gY2hpbGQuaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdF
eHRlbnQoKSA6IGNoaWxkLnZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpOworICAgIH0g
ZWxzZSB7CiAgICAgICAgIEFTU0VSVChjaGlsZEludHJpbnNpY1NpemUuaGVpZ2h0KCkpOwogICAg
ICAgICByYXRpbyA9IGNoaWxkSW50cmluc2ljU2l6ZS53aWR0aCgpLnRvRmxvYXQoKSAvIGNoaWxk
SW50cmluc2ljU2l6ZS5oZWlnaHQoKS50b0Zsb2F0KCk7CisgICAgICAgIGNyb3NzU2l6ZSA9IGFk
anVzdEZvckJveFNpemluZyhjaGlsZCwgY3Jvc3NTaXplKTsKICAgICB9CiAgICAgaWYgKGlzSG9y
aXpvbnRhbEZsb3coKSkKLSAgICAgICAgcmV0dXJuIExheW91dFVuaXQoY3Jvc3NTaXplLnZhbHVl
KCkgKiByYXRpbyk7Ci0gICAgcmV0dXJuIExheW91dFVuaXQoY3Jvc3NTaXplLnZhbHVlKCkgLyBy
YXRpbyk7CisgICAgICAgIHJldHVybiBMYXlvdXRVbml0KGNyb3NzU2l6ZSAqIHJhdGlvKSAtIGJv
cmRlckFuZFBhZGRpbmc7CisgICAgcmV0dXJuIExheW91dFVuaXQoY3Jvc3NTaXplIC8gcmF0aW8p
IC0gYm9yZGVyQW5kUGFkZGluZzsKIH0KIAogdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6c2V0Rmxv
d0F3YXJlTG9jYXRpb25Gb3JDaGlsZChSZW5kZXJCb3gmIGNoaWxkLCBjb25zdCBMYXlvdXRQb2lu
dCYgbG9jYXRpb24pCkBAIC0xMjA3LDYgKzEyMTQsMTEgQEAgc3RkOjpwYWlyPExheW91dFVuaXQs
IExheW91dFVuaXQ+IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlRmxleEl0ZW1NaW5NYXhTaXpl
cygKICAgICBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IG1heEV4dGVudCA9IHN0ZDo6bnVsbG9w
dDsKICAgICBpZiAobWF4LmlzU3BlY2lmaWVkT3JJbnRyaW5zaWMoKSkKICAgICAgICAgbWF4RXh0
ZW50ID0gY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQoY2hpbGQsIE1heFNpemUsIG1heCk7
CisgICAgZWxzZSBpZiAoY2hpbGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKSB7CisgICAgICAg
IG1heCA9IGNyb3NzU2l6ZUxlbmd0aEZvckNoaWxkKE1heFNpemUsIGNoaWxkKTsKKyAgICAgICAg
aWYgKG1heC5pc1NwZWNpZmllZE9ySW50cmluc2ljKCkpCisgICAgICAgICAgICBtYXhFeHRlbnQg
PSBjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjaGlsZCwgbWF4KTsKKyAgICB9
CiAKICAgICBMZW5ndGggbWluID0gbWFpblNpemVMZW5ndGhGb3JDaGlsZChNaW5TaXplLCBjaGls
ZCk7CiAgICAgLy8gSW50cmluc2ljIHNpemVzIGluIGNoaWxkJ3MgYmxvY2sgYXhpcyBhcmUgaGFu
ZGxlZCBieSB0aGUgbWluLXNpemU6YXV0byBjb2RlIHBhdGguCmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMDBmMzA4ZmMyODFi
Zjg0OTk5YzIyMmQzMDM3Y2U0MWE2YjNjNThhNi4uNGYzODVkMDY5NzdlMTRhOWE3NGE0YmE5NDY5
NDlkODdkZjU1OGU1YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh
eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIxLTA2LTE2ICBSb2IgQnVp
cyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlvLTAy
NSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p
ZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg
ICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDYtMTYgIEFsYW4gQnVqdGFzICA8emFsYW5A
YXBwbGUuY29tPgogCiAgICAgICAgIENvbnRlbnQgbW92ZXMgdXAgd2hlbiBob3ZlcmluZyBvdmVy
IGEgbGluayBvbiBIYWNrZXIgTmV3cwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv
dzNjL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXgg
ZDAzYTljODk4MzhiYjBhZTljODZjOWZlYWE4NWUwYTdlMmRlNWZiYi4uMWQ2ODU5ZDg2YWRjMGM2
MTU4YmEzZDI4NDA3YTZmM2VmY2M0ODZkMCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0
ZWQvdzNjL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9n
CkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMDYtMTYgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNv
bT4KKworICAgICAgICBGaXggZmxleC1hc3BlY3QtcmF0aW8tMDI1KzI2Lmh0bWwKKyAgICAgICAg
aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjM1NworCisgICAgICAg
IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcG9ydCB1cGRhdGVkIFdQ
VCB0ZXN0cy4KKworICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h
c3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWw6CisgICAgICAgICogd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRp
by0wMjYuaHRtbDoKKwogMjAyMS0wNi0xNSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNl
bkB3ZWJraXQub3JnPgogCiAgICAgICAgIENoZWNrIGZvciAieG4tLSIgaW4gYW55IHN1YmRvbWFp
biB3aGVuIHBhcnNpbmcgVVJMIGhvc3RzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhw
ZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCBhYzU3YjNiNDky
NzdkZmRlZTk1Y2Q3YTA0MjAzMTQ3NGJkZjQ5NjA2Li5mNDBmMTczYWQ2YThlZTQ4NzM2NDRiZWNl
YzAxNDBiMjdjNzA5YTRlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25z
CisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTQ0NzQsOCArNDQ3NCw2IEBA
IHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vCiAjIGZsZXgtYmFzaXM6Y29udGVudAogd2Via2l0Lm9y
Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n
L2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjEuaHRtbCBbIEltYWdlT25seUZhaWx1
cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjIuaHRtbCBb
IEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1y
YXRpby0wMjUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp
by9mbGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0
Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6
aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTguaHRtbCBbIEltYWdlT25seUZh
aWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTkuaHRt
bCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVj
dC1yYXRpby0wMjAuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpkaWZmIC0tZ2l0IGEvTGF5b3V0
VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl
Y3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4
LWFzcGVjdC1yYXRpby0wMjUuaHRtbAppbmRleCBjNGZmODExMGQ3YmVkNzA3OWM4NjRkZGYxOTJm
ODI0MjkzMmU1ODhkLi4yMzk5YzEwM2VjZDIzOTNjMDI5YjliNzhiZTc1NGI3MjFlY2NmYTVjIDEw
MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbAorKysg
Yi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6
aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbApAQCAtNCw2ICs0LDgg
QEAKICAgPGxpbmsgcmVsPSJhdXRob3IiIHRpdGxlPSJUaW5nLVl1IExpbiIgaHJlZj0ibWFpbHRv
OnRsaW5AbW96aWxsYS5jb20iPgogICA8bGluayByZWw9ImF1dGhvciIgdGl0bGU9Ik1vemlsbGEi
IGhyZWY9Imh0dHBzOi8vd3d3Lm1vemlsbGEub3JnLyI+CiAgIDxsaW5rIHJlbD0iaGVscCIgaHJl
Zj0iaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1zaXppbmctNC8jYXNwZWN0LXJhdGlvIj4K
KyAgPGxpbmsgcmVsPSJoZWxwIiBocmVmPSJodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLXNp
emluZy00LyNhc3BlY3QtcmF0aW8tbWluaW11bSI+CisgIDxsaW5rIHJlbD0iaGVscCIgaHJlZj0i
aHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1mbGV4Ym94LTEvI21pbi1zaXplLWF1dG8iPgog
ICA8bGluayByZWw9Im1hdGNoIiBocmVmPSIuLi8uLi9yZWZlcmVuY2UvcmVmLWZpbGxlZC1ncmVl
bi0yMDBweC1zcXVhcmUuaHRtbCIgLz4KICAgPHN0eWxlPgogICAuZmxleENvbnRhaW5lciB7CkBA
IC0yMSw1NCArMjMsMjAgQEAKIAogICA8cD5UZXN0IHBhc3NlcyBpZiB0aGVyZSBpcyBhIGZpbGxl
ZCBncmVlbiBzcXVhcmUgYW5kIDxzdHJvbmc+bm8gcmVkPC9zdHJvbmc+LjwvcD4KIAotICA8IS0t
IEluIHRoZSBmb2xsb3dpbmcgZm91ciBmbGV4IGNvbnRhaW5lcnMsIHRoZSBhc3BlY3QtcmF0aW8g
d29ya3Mgd2l0aCBib3JkZXItYm94LiAtLT4KLSAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciIg
c3R5bGU9IndpZHRoOiBhdXRvOyI+Ci0gICAgPCEtLSBUaGUgYm9yZGVyLWJveCBoZWlnaHQgMjVw
eCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSBy
ZXNvbHZlZCBmbGV4IGJhc2Ugc2l6ZSBvZiAyMDBweC4gLS0+Ci0gICAgPGRpdiBjbGFzcz0iaXRl
bSIgc3R5bGU9Im1pbi13aWR0aDowOyBoZWlnaHQ6IDI1cHg7IGFzcGVjdC1yYXRpbzogOC8xOyI+
PC9kaXY+Ci0gIDwvZGl2PgotCi0gIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgotICAgIDwh
LS0gVGhlIGJvcmRlci1ib3ggaGVpZ2h0IDI1cHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4g
YXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLXdpZHRoOmF1dG8gb2YgMjAw
cHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJoZWlnaHQ6IDI1cHg7IGFzcGVj
dC1yYXRpbzogOC8xOyI+PC9kaXY+Ci0gIDwvZGl2PgorICA8IS0tIEluIGFsbCBvZiB0aGUgc3Vi
dGVzdHMgaGVyZSwgZWFjaCBmbGV4IGl0ZW0ncyBhdXRvbWF0aWMgbWluaW11bSB3aWR0aCBpcwor
ICAgICAgIHJlc29sdmVkIGRpcmVjdGx5IGZyb20gaXRzIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9u
LiBOb3RhYmx5LCB0aGVzZSBpdGVtcworICAgICAgICpkbyBub3QqIGdldCBhICJ0cmFuc2ZlcnJl
ZCBzaXplIHN1Z2dlc3Rpb24iLCBiZWNhdXNlIHRoZXkgYXJlIGFsbAorICAgICAgICpub24tcmVw
bGFjZWQqIGVsZW1lbnRzOyBhbmQgInRyYW5zZmVycmVkIHNpemUgc3VnZ2VzdGlvbiIgaXMgb25s
eSB1c2VkCisgICAgICAgZm9yIHJlc29sdmluZyBhdXRvbWF0aWMgbWluaW11bSBzaXplcyBvbiAq
cmVwbGFjZWQqIGVsZW1lbnRzLiBIb3dldmVyLAorICAgICAgIG5vdGUgdGhhdCB3ZSBkbyAidHJh
bnNmZXIiIHNpemVzIHRocm91Z2ggdGhlIGFzcGVjdCByYXRpbywgYXMgcGFydCBvZgorICAgICAg
IGNvbXB1dGluZyB0aGUgY29udGVudCBzaXplIHN1Z2dlc3Rpb24gYW5kL29yIGZsZXggYmFzZSBz
aXplLiAtLT4KIAorICA8IS0tIEluIHRoZSBmb2xsb3dpbmcgZm91ciBmbGV4IGNvbnRhaW5lcnMs
IHRoZSBhc3BlY3QtcmF0aW8gd29ya3Mgd2l0aCBib3JkZXItYm94LiAtLT4KICAgPGRpdiBjbGFz
cz0iZmxleENvbnRhaW5lciI+Ci0gICAgPCEtLSBUaGUgYm9yZGVyLWJveCBtaW4taGVpZ2h0IDI1
cHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEg
cmVzb2x2ZWQgbWluLXdpZHRoOmF1dG8gb2YgMjAwcHguIC0tPgorICAgIDwhLS0gVGhlIGNvbnRl
bnQgc2l6ZSBzdWdnZXN0aW9uIChib3JkZXItYm94KSBpcyAyMDBweCBiZWNhdXNlIHRoZQorICAg
ICAgICAgYm9yZGVyLWJveCBoZWlnaHQgMjVweCAoZW5mb3JjZWQgYnkgbWluLWhlaWdodCkgaXMg
dHJhbnNmZXJyZWQgdG8gdGhlCisgICAgICAgICBtYWluIGF4aXMuIC0tPgogICAgIDxkaXYgY2xh
c3M9Iml0ZW0iIHN0eWxlPSJtaW4taGVpZ2h0OiAyNXB4OyBhc3BlY3QtcmF0aW86IDgvMTsiPjwv
ZGl2PgogICA8L2Rpdj4KIAotICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAgICA8IS0t
IFRoZSBib3JkZXItYm94IGhlaWdodCAyNXB4IChjbGFtcGVkIGJ5IG1heC1oZWlnaHQpIGlzIHRy
YW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVk
IG1pbi13aWR0aDphdXRvIG9mIDIwMHB4LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHls
ZT0ibWF4LWhlaWdodDogMjVweDsgaGVpZ2h0OiAxMDBweDsgYXNwZWN0LXJhdGlvOiA4LzE7Ij48
L2Rpdj4KLSAgPC9kaXY+Ci0KLSAgPCEtLSBJbiB0aGUgZm9sbG93aW5nIGZvdXIgZmxleCBjb250
YWluZXJzLCB0aGUgYXNwZWN0LXJhdGlvIHdvcmtzIHdpdGggY29udGVudC1ib3gKLSAgICAgICBi
ZWNhdXNlIGl0cyB2YWx1ZSBjb250YWlucyAnYXV0bycuIC0tPgotICA8ZGl2IGNsYXNzPSJmbGV4
Q29udGFpbmVyIiBzdHlsZT0id2lkdGg6IGF1dG87Ij4KLSAgICA8IS0tIFRoZSBjb250ZW50LWJv
eCBoZWlnaHQgMTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAg
eWllbGRpbmcgYSByZXNvbHZlZCBmbGV4IGJhc2Ugc2l6ZSBvZiAxOTBweC4gLS0+Ci0gICAgPGRp
diBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi13aWR0aDowOyBoZWlnaHQ6IDI1cHg7IGFzcGVjdC1y
YXRpbzogYXV0byAxOS8xOyI+PC9kaXY+Ci0gIDwvZGl2PgotCi0gIDxkaXYgY2xhc3M9ImZsZXhD
b250YWluZXIiPgotICAgIDwhLS0gVGhlIGNvbnRlbnQtYm94IGhlaWdodCAxMHB4IGlzIHRyYW5z
ZmVycmVkIHRvIHRoZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIG1p
bi13aWR0aDphdXRvIG9mIDE5MHB4LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0i
aGVpZ2h0OiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMTkvMTsiPjwvZGl2PgotICA8L2Rpdj4K
LQotICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAgICA8IS0tIFRoZSBjb250ZW50LWJv
eCBtaW4taGVpZ2h0IDEwcHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAg
ICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLXdpZHRoOmF1dG8gb2YgMTkwcHguIC0tPgotICAg
IDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4taGVpZ2h0OiAyNXB4OyBhc3BlY3QtcmF0aW86
IGF1dG8gMTkvMTsiPjwvZGl2PgotICA8L2Rpdj4KLQotICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFp
bmVyIj4KLSAgICA8IS0tIFRoZSBjb250ZW50LWJveCBoZWlnaHQgMTBweCAoY2xhbXBlZCBieSBt
YXgtaGVpZ2h0KSBpcyB0cmFuc2ZlcnJlZAotICAgICAgICAgdG8gdGhlIG1haW4gYXhpcywgeWll
bGRpbmcgYSByZXNvbHZlZCBtaW4td2lkdGg6YXV0byBvZiAxOTBweC4gLS0+Ci0gICAgPGRpdiBj
bGFzcz0iaXRlbSIgc3R5bGU9Im1heC1oZWlnaHQ6IDI1cHg7IGhlaWdodDogMTAwcHg7IGFzcGVj
dC1yYXRpbzogYXV0byAxOS8xOyI+PC9kaXY+Ci0gIDwvZGl2PgogPC9odG1sPgpkaWZmIC0tZ2l0
IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp
emluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwgYi9MYXlvdXRUZXN0
cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y
YXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbAppbmRleCBjNGEyNTA4MThiYjc3ODZlMmYz
OTU5MjJkMjhlM2M3NTE5YjRlYTNhLi5mZjZiZjJhYTU2OTA1NTE4MDhiOThlNzExN2VjNjVkOTE3
OGEzNDI1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjYu
aHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbApAQCAt
NCw2ICs0LDggQEAKICAgPGxpbmsgcmVsPSJhdXRob3IiIHRpdGxlPSJUaW5nLVl1IExpbiIgaHJl
Zj0ibWFpbHRvOnRsaW5AbW96aWxsYS5jb20iPgogICA8bGluayByZWw9ImF1dGhvciIgdGl0bGU9
Ik1vemlsbGEiIGhyZWY9Imh0dHBzOi8vd3d3Lm1vemlsbGEub3JnLyI+CiAgIDxsaW5rIHJlbD0i
aGVscCIgaHJlZj0iaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1zaXppbmctNC8jYXNwZWN0
LXJhdGlvIj4KKyAgPGxpbmsgcmVsPSJoZWxwIiBocmVmPSJodHRwczovL2RyYWZ0cy5jc3N3Zy5v
cmcvY3NzLXNpemluZy00LyNhc3BlY3QtcmF0aW8tbWluaW11bSI+CisgIDxsaW5rIHJlbD0iaGVs
cCIgaHJlZj0iaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1mbGV4Ym94LTEvI21pbi1zaXpl
LWF1dG8iPgogICA8bGluayByZWw9Im1hdGNoIiBocmVmPSIuLi8uLi9yZWZlcmVuY2UvcmVmLWZp
bGxlZC1ncmVlbi0yMDBweC1zcXVhcmUuaHRtbCIgLz4KICAgPHN0eWxlPgogICAuZmxleENvbnRh
aW5lciB7CkBAIC0xOSw2MCArMjEsNzQgQEAKICAgICBib3gtc2l6aW5nOiBib3JkZXItYm94Owog
ICB9CiAgIC5pdGVtID4gZGl2IHsKLSAgICBoZWlnaHQ6IDUwMHB4OyAvKiBTZXQgYSBsYXJnZSBj
b250ZW50IHNpemUgc3VnZ2VzdGlvbiBmb3IgZmxleCBpdGVtLiAqLworICAgIGhlaWdodDogMTkw
cHg7IC8qIFNldCB0aGUgY29udGVudCBzaXplIHN1Z2dlc3Rpb24gZm9yIGZsZXggaXRlbS4gKi8K
ICAgfQogICA8L3N0eWxlPgogCiAgIDxwPlRlc3QgcGFzc2VzIGlmIHRoZXJlIGlzIGEgZmlsbGVk
IGdyZWVuIHNxdWFyZSBhbmQgPHN0cm9uZz5ubyByZWQ8L3N0cm9uZz4uPC9wPgogCisgIDwhLS0g
SW4gYWxsIG9mIHRoZSBzdWJ0ZXN0cyBoZXJlLCBlYWNoIGZsZXggaXRlbSdzIGF1dG9tYXRpYyBt
aW5pbXVtIGhlaWdodCBpcworICAgICAgIHJlc29sdmVkIGRpcmVjdGx5IGZyb20gaXRzIGNvbnRl
bnQgc2l6ZSBzdWdnZXN0aW9uLiBOb3RhYmx5LCB0aGVzZSBpdGVtcworICAgICAgICpkbyBub3Qq
IGdldCBhICJ0cmFuc2ZlcnJlZCBzaXplIHN1Z2dlc3Rpb24iLCBiZWNhdXNlIHRoZXkgYXJlIGFs
bAorICAgICAgICpub24tcmVwbGFjZWQqIGVsZW1lbnRzOyBhbmQgInRyYW5zZmVycmVkIHNpemUg
c3VnZ2VzdGlvbiIgaXMgb25seSB1c2VkCisgICAgICAgZm9yIHJlc29sdmluZyBhdXRvbWF0aWMg
bWluaW11bSBzaXplcyBvbiAqcmVwbGFjZWQqIGVsZW1lbnRzLiBIb3dldmVyLAorICAgICAgIG5v
dGUgdGhhdCB3ZSBkbyAidHJhbnNmZXIiIHNpemVzIHRocm91Z2ggdGhlIGFzcGVjdCByYXRpbywg
YXMgcGFydCBvZgorICAgICAgIGNvbXB1dGluZyB0aGUgY29udGVudCBzaXplIHN1Z2dlc3Rpb24g
YW5kL29yIGZsZXggYmFzZSBzaXplLiAtLT4KKwogICA8IS0tIEluIHRoZSBmb2xsb3dpbmcgZm91
ciBmbGV4IGNvbnRhaW5lcnMsIHRoZSBhc3BlY3QtcmF0aW8gd29ya3Mgd2l0aCBib3JkZXItYm94
LiAtLT4KICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciIgc3R5bGU9ImhlaWdodDogYXV0bzsi
PgogICAgIDwhLS0gVGhlIGJvcmRlci1ib3ggd2lkdGggMjVweCBpcyB0cmFuc2ZlcnJlZCB0byB0
aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBmbGV4IGJhc2Ugc2l6
ZSBvZiAyMDBweC4gLS0+CisgICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIGZsZXggYmFzZSBz
aXplIChib3JkZXItYm94KSBvZiAyMDBweC4gLS0+CiAgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5
bGU9Im1pbi1oZWlnaHQ6MDsgd2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogMS84OyI+PGRpdj48
L2Rpdj48L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciI+Ci0g
ICAgPCEtLSBUaGUgYm9yZGVyLWJveCB3aWR0aCAyNXB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBt
YWluIGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi1oZWlnaHQ6YXV0byBv
ZiAyMDBweC4gLS0+Ci0gICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9IndpZHRoOiAyNXB4OyBh
c3BlY3QtcmF0aW86IDEvODsiPjxkaXY+PC9kaXY+PC9kaXY+CisgICAgPCEtLSBUaGUgY29udGVu
dCBzaXplIHN1Z2dlc3Rpb24gaXMgMTkwcHgsIGkuZS4gdGhlIGhlaWdodCBvZiB0aGUgaXRlbSdz
CisgICAgICAgICBjaGlsZCBkaXYuIC0tPgorICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJ3
aWR0aDogMjVweDsgYXNwZWN0LXJhdGlvOiAxLzE7Ij48ZGl2PjwvZGl2PjwvZGl2PgogICA8L2Rp
dj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAgICA8IS0tIFRoZSBib3JkZXIt
Ym94IG1pbi13aWR0aCAyNXB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMsCi0gICAg
ICAgICB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi1oZWlnaHQ6YXV0byBvZiAyMDBweC4gLS0+Ci0g
ICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi13aWR0aDogMjVweDsgYXNwZWN0LXJhdGlv
OiAxLzg7Ij48ZGl2PjwvZGl2PjwvZGl2PgorICAgIDwhLS0gVGhlIGNvbnRlbnQgc2l6ZSBzdWdn
ZXN0aW9uIGlzIDE5MHB4LCBpLmUuIHRoZSBoZWlnaHQgb2YgdGhlIGl0ZW0ncworICAgICAgICAg
Y2hpbGQgZGl2LiAtLT4KKyAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWluLXdpZHRoOiAy
NXB4OyBhc3BlY3QtcmF0aW86IDEvMTsiPjxkaXY+PC9kaXY+PC9kaXY+CiAgIDwvZGl2PgogCiAg
IDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgotICAgIDwhLS0gVGhlIGJvcmRlci1ib3ggd2lk
dGggMjVweCAoY2xhbXBlZCBieSBtYXgtd2lkdGgpIGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWlu
IGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi1oZWlnaHQ6YXV0byBvZiAy
MDBweC4gLS0+Ci0gICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1heC13aWR0aDogMjVweDsg
d2lkdGg6IDEwMHB4OyBhc3BlY3QtcmF0aW86IDEvODsiPjxkaXY+PC9kaXY+PC9kaXY+CisgICAg
PCEtLSBUaGUgY29udGVudCBzaXplIHN1Z2dlc3Rpb24gaXMgMjAwcHggYmVjYXVzZSB0aGUgYm9y
ZGVyLWJveCBtYXgtd2lkdGgKKyAgICAgICAgIDI1cHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1h
aW4gYXhpcyBhcyB0aGUgdXBwZXIgYm91bmQgb2YgaXRzCisgICAgICAgICBib3JkZXItYm94IGhl
aWdodC4gLS0+CisgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1heC13aWR0aDogMjVweDsg
d2lkdGg6IDEwMHB4OyBhc3BlY3QtcmF0aW86IDEvODsiPgorICAgICAgPGRpdiBzdHlsZT0iaGVp
Z2h0OiA1MDBweCI+PC9kaXY+CisgICAgPC9kaXY+CiAgIDwvZGl2PgogCiAgIDwhLS0gSW4gdGhl
IGZvbGxvd2luZyBmb3VyIGZsZXggY29udGFpbmVycywgdGhlIGFzcGVjdC1yYXRpbyB3b3JrcyB3
aXRoIGNvbnRlbnQtYm94CiAgICAgICAgYmVjYXVzZSBpdHMgdmFsdWUgY29udGFpbnMgJ2F1dG8n
LiAtLT4KICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciIgc3R5bGU9ImhlaWdodDogYXV0bzsi
PgogICAgIDwhLS0gVGhlIGNvbnRlbnQtYm94IHdpZHRoIDEwcHggaXMgdHJhbnNmZXJyZWQgdG8g
dGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgZmxleCBiYXNlIHNp
emUgb2YgMTkwcHguIC0tPgorICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBmbGV4IGJhc2Ug
c2l6ZSAoY29udGVudC1ib3gpIG9mIDE5MHB4LiAtLT4KICAgICA8ZGl2IGNsYXNzPSJpdGVtIiBz
dHlsZT0ibWluLWhlaWdodDowOyB3aWR0aDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEvMTk7
Ij48ZGl2PjwvZGl2PjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFp
bmVyIj4KLSAgICA8IS0tIFRoZSBjb250ZW50LWJveCB3aWR0aCAxMHB4IGlzIHRyYW5zZmVycmVk
IHRvIHRoZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi1oZWln
aHQ6YXV0byBvZiAxOTBweC4gLS0+Ci0gICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9IndpZHRo
OiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMS8xOTsiPjxkaXY+PC9kaXY+PC9kaXY+CisgICAg
PCEtLSBUaGUgY29udGVudCBzaXplIHN1Z2dlc3Rpb24gaXMgMTkwcHgsIGkuZS4gdGhlIGhlaWdo
dCBvZiB0aGUgaXRlbSdzCisgICAgICAgICBjaGlsZCBkaXYuIC0tPgorICAgIDxkaXYgY2xhc3M9
Iml0ZW0iIHN0eWxlPSJ3aWR0aDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEvMTsiPjxkaXY+
PC9kaXY+PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgot
ICAgIDwhLS0gVGhlIGNvbnRlbnQtYm94IG1pbi13aWR0aCAxMHB4IGlzIHRyYW5zZmVycmVkIHRv
IHRoZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi1oZWlnaHQ6
YXV0byBvZiAxOTBweC4gLS0+Ci0gICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi13aWR0
aDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEvMTk7Ij48ZGl2PjwvZGl2PjwvZGl2PgorICAg
IDwhLS0gVGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIGlzIDE5MHB4LCBpLmUuIHRoZSBoZWln
aHQgb2YgdGhlIGl0ZW0ncworICAgICAgICAgY2hpbGQgZGl2LiAtLT4KKyAgICA8ZGl2IGNsYXNz
PSJpdGVtIiBzdHlsZT0ibWluLXdpZHRoOiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMS8xOyI+
PGRpdj48L2Rpdj48L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5l
ciI+Ci0gICAgPCEtLSBUaGUgY29udGVudC1ib3ggd2lkdGggMTBweCAoY2xhbXBlZCBieSBtYXgt
d2lkdGgpIGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVsZGlu
ZyBhIHJlc29sdmVkIG1pbi1oZWlnaHQ6YXV0byBvZiAxOTBweC4gLS0+Ci0gICAgPGRpdiBjbGFz
cz0iaXRlbSIgc3R5bGU9Im1heC13aWR0aDogMjVweDsgd2lkdGg6IDEwMHB4OyBhc3BlY3QtcmF0
aW86IGF1dG8gMS8xOTsiPjxkaXY+PC9kaXY+PC9kaXY+CisgICAgPCEtLSBUaGUgY29udGVudCBz
aXplIHN1Z2dlc3Rpb24gaXMgMTkwcHggYmVjYXVzZSB0aGUgY29udGVudC1ib3ggbWF4LXdpZHRo
CisgICAgICAgICAxMHB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMgYXMgdGhlIHVw
cGVyIGJvdW5kIG9mIGl0cworICAgICAgICAgY29udGVudC1ib3ggaGVpZ2h0Li0tPgorICAgIDxk
aXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtYXgtd2lkdGg6IDI1cHg7IHdpZHRoOiAxMDBweDsgYXNw
ZWN0LXJhdGlvOiBhdXRvIDEvMTk7Ij4KKyAgICAgIDxkaXYgc3R5bGU9ImhlaWdodDogNTAwcHgi
PjwvZGl2PgorICAgIDwvZGl2PgogICA8L2Rpdj4KIDwvaHRtbD4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>432280</attachid>
            <date>2021-06-25 09:22:09 -0700</date>
            <delta_ts>2021-06-29 07:29:57 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210625172208.patch</filename>
            <type>text/plain</type>
            <size>20153</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5Mjg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjUwMGNhNGU1MmY5Zjlm
MzFiNmU5NjlmNGFlMmEzOGZkMjA5YTM4Ni4uNWVlNTc3MzgxYzUwNTU3NzJmYTNiMjM5ODkzN2Y1
YTBjOGUzNzVlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA2LTI1ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBNYWtlIGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nIHRha2UgaW50byBh
Y2NvdW50CisgICAgICAgIGJveC1zaXppbmcgZm9yIHRoZSBjYXNlIHdoZXJlIENTUyBhc3BlY3Qt
cmF0aW8gaXMgYXBwbGllZC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRo
VXNpbmcgY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6
CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJv
bUFzcGVjdFJhdGlvVXNpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGli
bGVCb3g6OmNvbXB1dGVGbGV4SXRlbU1pbk1heFNpemVzKToKKwogMjAyMS0wNi0yNSAgU2VyZ2lv
IFZpbGxhciBTZW5pbiAgPHN2aWxsYXJAaWdhbGlhLmNvbT4KIAogICAgICAgICBbY3NzLWZsZXhi
b3hdIEltcHJvdmUgY29tcHV0YXRpb24gb2YgaW50cmluc2ljIHNpemVzIG9mIGZsZXggaXRlbXMg
d2l0aCBhc3BlY3QgcmF0aW8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S
ZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5k
ZXggY2E1YTZjMzM0ODg5OTJhZGQ0NjIxMGM3ZmE3MWI5OGIwNjdkM2Q4Ny4uZmY5NjE3MjMwMWE2
OGYwZTZlZDI4MWE3YjhiY2YzZDZiMGNkYTA4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv
cmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl
bmRlckJveC5jcHAKQEAgLTI2OTEsOSArMjY5MSwxMCBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6
Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aFVzaW5nKExlbmd0aCBsb2dpY2FsV2lkdGhMZW5n
dAogCiAgICAgTGF5b3V0VW5pdCBtaW5Mb2dpY2FsV2lkdGg7CiAgICAgTGF5b3V0VW5pdCBtYXhM
b2dpY2FsV2lkdGg7Ci0gICAgaWYgKCFsb2dpY2FsV2lkdGhMZW5ndGguaXNNaW5JbnRyaW5zaWMo
KSAmJiBzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkpCisgICAgaWYg
KCFsb2dpY2FsV2lkdGhMZW5ndGguaXNNaW5JbnRyaW5zaWMoKSAmJiBzaG91bGRDb21wdXRlTG9n
aWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkpIHsKICAgICAgICAgbWluTG9naWNhbFdpZHRoID0g
bWF4TG9naWNhbFdpZHRoID0gY29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpOwot
ICAgIGVsc2UKKyAgICAgICAgYm9yZGVyQW5kUGFkZGluZyA9IExheW91dFVuaXQoKTsKKyAgICB9
IGVsc2UKICAgICAgICAgY29tcHV0ZUludHJpbnNpY0tleXdvcmRMb2dpY2FsV2lkdGhzKG1pbkxv
Z2ljYWxXaWR0aCwgbWF4TG9naWNhbFdpZHRoKTsKIAogICAgIGlmIChsb2dpY2FsV2lkdGhMZW5n
dGguaXNNaW5Db250ZW50KCkgfHwgbG9naWNhbFdpZHRoTGVuZ3RoLmlzTWluSW50cmluc2ljKCkp
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3gu
Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAppbmRl
eCAyZTdjNzY0ZDc3M2U2YTllMTBmZGIwNTlmYzRjNmIwOGYyMDU0ZjczLi4zM2MxMTczYzdhZjcx
ZjVkNjFjMTk3M2Y2NjJhZGY5MzM4NGYxNmI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y
ZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl
cmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKQEAgLTg2NSw5ICs4NjUsNyBAQCBMYXlvdXRVbml0
IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhj
b25zdCBSZW5kZXJCbwogewogICAgIEFTU0VSVChjaGlsZEhhc0FzcGVjdFJhdGlvKGNoaWxkKSk7
CiAKLSAgICBhdXRvIGFkanVzdEZvckJveFNpemluZyA9IFt0aGlzXSAoY29uc3QgUmVuZGVyQm94
JiBib3gsIExlbmd0aCBsZW5ndGgpIC0+IExheW91dFVuaXQgewotICAgICAgICBBU1NFUlQobGVu
Z3RoLmlzRml4ZWQoKSk7Ci0gICAgICAgIGF1dG8gdmFsdWUgPSBMYXlvdXRVbml0KGxlbmd0aC52
YWx1ZSgpKTsKKyAgICBhdXRvIGFkanVzdEZvckJveFNpemluZyA9IFt0aGlzXSAoY29uc3QgUmVu
ZGVyQm94JiBib3gsIExheW91dFVuaXQgdmFsdWUpIC0+IExheW91dFVuaXQgewogICAgICAgICAv
LyBXZSBuZWVkIHRvIHN1YnN0cmFjdCB0aGUgYm9yZGVyIGFuZCBwYWRkaW5nIGV4dGVudCBmcm9t
IHRoZSBjcm9zcyBheGlzLgogICAgICAgICAvLyBGdXJ0aGVybW9yZSwgdGhlIHNpemluZyBjYWxj
dWxhdGlvbnMgdGhhdCBmbG9vciB0aGUgY29udGVudCBib3ggc2l6ZSBhdCB6ZXJvIHdoZW4gYXBw
bHlpbmcgYm94LXNpemluZyBhcmUgYWxzbyBpZ25vcmVkLgogICAgICAgICAvLyBodHRwczovL2Ry
YWZ0cy5jc3N3Zy5vcmcvY3NzLWZsZXhib3gvI2FsZ28tbWFpbi1pdGVtLgpAQCAtODc2LDI5ICs4
NzQsMzggQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJv
bUFzcGVjdFJhdGlvVXNpbmcoY29uc3QgUmVuZGVyQm8KICAgICAgICAgcmV0dXJuIHZhbHVlOwog
ICAgIH07CiAKLSAgICBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IGNyb3NzU2l6ZTsKKyAgICAv
LyBjcm9zc1NpemUgaXMgYm9yZGVyLWJveCBzaXplIGlmIGJveC1zaXppbmcgaXMgYm9yZGVyLWJv
eCwgYW5kCisgICAgLy8gY29udGVudC1ib3ggb3RoZXJ3aXNlLgorICAgIExheW91dFVuaXQgY3Jv
c3NTaXplOwogICAgIGlmIChjcm9zc1NpemVMZW5ndGguaXNGaXhlZCgpKQotICAgICAgICBjcm9z
c1NpemUgPSBhZGp1c3RGb3JCb3hTaXppbmcoY2hpbGQsIGNyb3NzU2l6ZUxlbmd0aCk7CisgICAg
ICAgIGNyb3NzU2l6ZSA9IExheW91dFVuaXQoY3Jvc3NTaXplTGVuZ3RoLnZhbHVlKCkpOwogICAg
IGVsc2UgaWYgKGNyb3NzU2l6ZUxlbmd0aC5pc0F1dG8oKSkKICAgICAgICAgY3Jvc3NTaXplID0g
Y29tcHV0ZUNyb3NzU2l6ZUZvckNoaWxkVXNpbmdDb250YWluZXJDcm9zc1NpemUoY2hpbGQpOwog
ICAgIGVsc2UgewogICAgICAgICBBU1NFUlQoY3Jvc3NTaXplTGVuZ3RoLmlzUGVyY2VudE9yQ2Fs
Y3VsYXRlZCgpKTsKLSAgICAgICAgY3Jvc3NTaXplID0gbWFpbkF4aXNJc0NoaWxkSW5saW5lQXhp
cyhjaGlsZCkgPyBjaGlsZC5jb21wdXRlUGVyY2VudGFnZUxvZ2ljYWxIZWlnaHQoY3Jvc3NTaXpl
TGVuZ3RoKSA6IGFkanVzdEJvcmRlckJveExvZ2ljYWxXaWR0aEZvckJveFNpemluZyh2YWx1ZUZv
ckxlbmd0aChjcm9zc1NpemVMZW5ndGgsIGNvbnRlbnRXaWR0aCgpKSwgY3Jvc3NTaXplTGVuZ3Ro
LnR5cGUoKSk7Ci0gICAgICAgIGlmICghY3Jvc3NTaXplKQorICAgICAgICBzdGQ6Om9wdGlvbmFs
PExheW91dFVuaXQ+IGNoaWxkU2l6ZSA9IG1haW5BeGlzSXNDaGlsZElubGluZUF4aXMoY2hpbGQp
ID8gY2hpbGQuY29tcHV0ZVBlcmNlbnRhZ2VMb2dpY2FsSGVpZ2h0KGNyb3NzU2l6ZUxlbmd0aCkg
OiBhZGp1c3RCb3JkZXJCb3hMb2dpY2FsV2lkdGhGb3JCb3hTaXppbmcodmFsdWVGb3JMZW5ndGgo
Y3Jvc3NTaXplTGVuZ3RoLCBjb250ZW50V2lkdGgoKSksIGNyb3NzU2l6ZUxlbmd0aC50eXBlKCkp
OworICAgICAgICBpZiAoIWNoaWxkU2l6ZSkKICAgICAgICAgICAgIHJldHVybiAwX2x1OworICAg
ICAgICBjcm9zc1NpemUgPSBjaGlsZFNpemUudmFsdWUoKTsKICAgICB9CiAKICAgICBjb25zdCBM
YXlvdXRTaXplJiBjaGlsZEludHJpbnNpY1NpemUgPSBjaGlsZC5pbnRyaW5zaWNTaXplKCk7CiAg
ICAgZG91YmxlIHJhdGlvOwotICAgIGlmIChjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvVHlwZSgp
ID09IEFzcGVjdFJhdGlvVHlwZTo6UmF0aW8gfHwgKGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9U
eXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpBdXRvQW5kUmF0aW8gJiYgY2hpbGRJbnRyaW5zaWNT
aXplLmlzRW1wdHkoKSkpCisgICAgTGF5b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5nOworICAgIGlm
IChjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6UmF0
aW8gfHwgKGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBl
OjpBdXRvQW5kUmF0aW8gJiYgY2hpbGRJbnRyaW5zaWNTaXplLmlzRW1wdHkoKSkpIHsKICAgICAg
ICAgcmF0aW8gPSBjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvV2lkdGgoKSAvIGNoaWxkLnN0eWxl
KCkuYXNwZWN0UmF0aW9IZWlnaHQoKTsKLSAgICBlbHNlIHsKKyAgICAgICAgaWYgKGNoaWxkLnN0
eWxlKCkuYm94U2l6aW5nRm9yQXNwZWN0UmF0aW8oKSA9PSBCb3hTaXppbmc6OkNvbnRlbnRCb3gp
CisgICAgICAgICAgICBjcm9zc1NpemUgLT0gaXNIb3Jpem9udGFsRmxvdygpID8gY2hpbGQudmVy
dGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCkgOiBjaGlsZC5ob3Jpem9udGFsQm9yZGVyQW5k
UGFkZGluZ0V4dGVudCgpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBib3JkZXJBbmRQYWRk
aW5nID0gaXNIb3Jpem9udGFsRmxvdygpID8gY2hpbGQuaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRp
bmdFeHRlbnQoKSA6IGNoaWxkLnZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpOworICAg
IH0gZWxzZSB7CiAgICAgICAgIEFTU0VSVChjaGlsZEludHJpbnNpY1NpemUuaGVpZ2h0KCkpOwog
ICAgICAgICByYXRpbyA9IGNoaWxkSW50cmluc2ljU2l6ZS53aWR0aCgpLnRvRmxvYXQoKSAvIGNo
aWxkSW50cmluc2ljU2l6ZS5oZWlnaHQoKS50b0Zsb2F0KCk7CisgICAgICAgIGNyb3NzU2l6ZSA9
IGFkanVzdEZvckJveFNpemluZyhjaGlsZCwgY3Jvc3NTaXplKTsKICAgICB9CiAgICAgaWYgKGlz
SG9yaXpvbnRhbEZsb3coKSkKLSAgICAgICAgcmV0dXJuIExheW91dFVuaXQoY3Jvc3NTaXplLnZh
bHVlKCkgKiByYXRpbyk7Ci0gICAgcmV0dXJuIExheW91dFVuaXQoY3Jvc3NTaXplLnZhbHVlKCkg
LyByYXRpbyk7CisgICAgICAgIHJldHVybiBMYXlvdXRVbml0KGNyb3NzU2l6ZSAqIHJhdGlvKSAt
IGJvcmRlckFuZFBhZGRpbmc7CisgICAgcmV0dXJuIExheW91dFVuaXQoY3Jvc3NTaXplIC8gcmF0
aW8pIC0gYm9yZGVyQW5kUGFkZGluZzsKIH0KIAogdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6c2V0
Rmxvd0F3YXJlTG9jYXRpb25Gb3JDaGlsZChSZW5kZXJCb3gmIGNoaWxkLCBjb25zdCBMYXlvdXRQ
b2ludCYgbG9jYXRpb24pCkBAIC0xMjcxLDYgKzEyNzgsMTEgQEAgc3RkOjpwYWlyPExheW91dFVu
aXQsIExheW91dFVuaXQ+IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlRmxleEl0ZW1NaW5NYXhT
aXplcygKICAgICBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IG1heEV4dGVudCA9IHN0ZDo6bnVs
bG9wdDsKICAgICBpZiAobWF4LmlzU3BlY2lmaWVkT3JJbnRyaW5zaWMoKSkKICAgICAgICAgbWF4
RXh0ZW50ID0gY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQoY2hpbGQsIE1heFNpemUsIG1h
eCk7CisgICAgZWxzZSBpZiAoY2hpbGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKSB7CisgICAg
ICAgIG1heCA9IGNyb3NzU2l6ZUxlbmd0aEZvckNoaWxkKE1heFNpemUsIGNoaWxkKTsKKyAgICAg
ICAgaWYgKG1heC5pc1NwZWNpZmllZE9ySW50cmluc2ljKCkpCisgICAgICAgICAgICBtYXhFeHRl
bnQgPSBjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjaGlsZCwgbWF4KTsKKyAg
ICB9CiAKICAgICBMZW5ndGggbWluID0gbWFpblNpemVMZW5ndGhGb3JDaGlsZChNaW5TaXplLCBj
aGlsZCk7CiAgICAgLy8gSW50cmluc2ljIHNpemVzIGluIGNoaWxkJ3MgYmxvY2sgYXhpcyBhcmUg
aGFuZGxlZCBieSB0aGUgbWluLXNpemU6YXV0byBjb2RlIHBhdGguCmRpZmYgLS1naXQgYS9MYXlv
dXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggOWE3NjJjYjNk
YTI5NzY4NDQwNjhmNjEwNDY2NTk2NGM1YWQ5NDA0ZS4uN2Q3MTU5ZGJiMWRkMTI5Y2UyY2ZlZDI5
ZTM3ZWZmZjRiZDJjMjdmZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBi
L0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIxLTA2LTI1ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDYtMjUgIFNlcmdpbyBWaWxsYXIgU2Vu
aW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+CiAKICAgICAgICAgW2Nzcy1mbGV4Ym94XSBJbXByb3Zl
IGNvbXB1dGF0aW9uIG9mIGludHJpbnNpYyBzaXplcyBvZiBmbGV4IGl0ZW1zIHdpdGggYXNwZWN0
IHJhdGlvCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIv
TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwppbmRleCBiNzJiMjUwY2IyZjFiOGJm
ZmI3ZTFhM2ZlNDg0ZjUzMDkxNmY3MjBhLi4zNjFiMmEwOTNkODJkYzA4YWU1NjYxNjYxYmE0MDNj
NGJlMmM4YTYzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9n
CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBA
QAorMjAyMS0wNi0yNSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIEZp
eCBmbGV4LWFzcGVjdC1yYXRpby0wMjUrMjYuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyMzU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C
T0RZIChPT1BTISkuCisKKyAgICAgICAgSW1wb3J0IHVwZGF0ZWQgV1BUIHRlc3RzLgorCisgICAg
ICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4
LWFzcGVjdC1yYXRpby0wMjUuaHRtbDoKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sOgorCiAy
MDIxLTA2LTI1ICBaaXJhbiBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CiAKICAgICAgICAgW2Nzcy1n
cmlkXSBDb25zaWRlciBjb250YWluZXIncyB3cml0aW5nIG1vZGUgdG8gZ2V0IGdyaWQgaXRlbSdz
IG1hcmdpbgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91
dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggNzEyMzMwOTU2Y2JlYjRmZjg3ZGViZjczMjYz
MGFmYWMzMGYxNDUzNy4uNDI3MjJmYzM0NTJkOWMzMjY1YTI4MjZjZDk0YTliOTllOWIyMDUxYiAx
MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0
cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NTYzLDggKzQ1NjMsNiBAQCB3ZWJraXQub3JnL2IvMjE0
NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0
LXJhdGlvLwogIyBmbGV4LWJhc2lzOmNvbnRlbnQKIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxl
eC1hc3BlY3QtcmF0aW8tMDIxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcv
Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h
c3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDIyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWwgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0
aW8tMDI2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v
Z3JpZC1hc3BlY3QtcmF0aW8tMDE4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5v
cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu
Zy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE5Lmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDIwLmh0bWwg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNw
ZWN0LXJhdGlvLTAyNS5odG1sIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1
Lmh0bWwKaW5kZXggYzRmZjgxMTBkN2JlZDcwNzljODY0ZGRmMTkyZjgyNDI5MzJlNTg4ZC4uYmY4
ZGFhYTM1ZjA4YTQxMjgyMmRkNDFlNzQ5OTAyNWU0MDY1ZTI4NCAxMDA2NDQKLS0tIGEvTGF5b3V0
VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl
Y3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v
ZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWwKQEAgLTQsNiArNCw4IEBACiAgIDxsaW5rIHJlbD0i
YXV0aG9yIiB0aXRsZT0iVGluZy1ZdSBMaW4iIGhyZWY9Im1haWx0bzp0bGluQG1vemlsbGEuY29t
Ij4KICAgPGxpbmsgcmVsPSJhdXRob3IiIHRpdGxlPSJNb3ppbGxhIiBocmVmPSJodHRwczovL3d3
dy5tb3ppbGxhLm9yZy8iPgogICA8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHBzOi8vZHJhZnRz
LmNzc3dnLm9yZy9jc3Mtc2l6aW5nLTQvI2FzcGVjdC1yYXRpbyI+CisgIDxsaW5rIHJlbD0iaGVs
cCIgaHJlZj0iaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1zaXppbmctNC8jYXNwZWN0LXJh
dGlvLW1pbmltdW0iPgorICA8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHBzOi8vZHJhZnRzLmNz
c3dnLm9yZy9jc3MtZmxleGJveC0xLyNtaW4tc2l6ZS1hdXRvIj4KICAgPGxpbmsgcmVsPSJtYXRj
aCIgaHJlZj0iLi4vLi4vcmVmZXJlbmNlL3JlZi1maWxsZWQtZ3JlZW4tMjAwcHgtc3F1YXJlLmh0
bWwiIC8+CiAgIDxzdHlsZT4KICAgLmZsZXhDb250YWluZXIgewpAQCAtMjEsMjggKzIzLDM4IEBA
CiAKICAgPHA+VGVzdCBwYXNzZXMgaWYgdGhlcmUgaXMgYSBmaWxsZWQgZ3JlZW4gc3F1YXJlIGFu
ZCA8c3Ryb25nPm5vIHJlZDwvc3Ryb25nPi48L3A+CiAKKyAgPCEtLSBJbiBhbGwgb2YgdGhlIHN1
YnRlc3RzIGhlcmUsIGVhY2ggZmxleCBpdGVtJ3MgYXV0b21hdGljIG1pbmltdW0gd2lkdGggaXMK
KyAgICAgICByZXNvbHZlZCBkaXJlY3RseSBmcm9tIGl0cyBjb250ZW50IHNpemUgc3VnZ2VzdGlv
bi4gTm90YWJseSwgdGhlc2UgaXRlbXMKKyAgICAgICAqZG8gbm90KiBnZXQgYSAidHJhbnNmZXJy
ZWQgc2l6ZSBzdWdnZXN0aW9uIiwgYmVjYXVzZSB0aGV5IGFyZSBhbGwKKyAgICAgICAqbm9uLXJl
cGxhY2VkKiBlbGVtZW50czsgYW5kICJ0cmFuc2ZlcnJlZCBzaXplIHN1Z2dlc3Rpb24iIGlzIG9u
bHkgdXNlZAorICAgICAgIGZvciByZXNvbHZpbmcgYXV0b21hdGljIG1pbmltdW0gc2l6ZXMgb24g
KnJlcGxhY2VkKiBlbGVtZW50cy4gSG93ZXZlciwKKyAgICAgICBub3RlIHRoYXQgd2UgZG8gInRy
YW5zZmVyIiBzaXplcyB0aHJvdWdoIHRoZSBhc3BlY3QgcmF0aW8sIGFzIHBhcnQgb2YKKyAgICAg
ICBjb21wdXRpbmcgdGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIGFuZC9vciBmbGV4IGJhc2Ug
c2l6ZS4gLS0+CisKICAgPCEtLSBJbiB0aGUgZm9sbG93aW5nIGZvdXIgZmxleCBjb250YWluZXJz
LCB0aGUgYXNwZWN0LXJhdGlvIHdvcmtzIHdpdGggYm9yZGVyLWJveC4gLS0+CiAgIDxkaXYgY2xh
c3M9ImZsZXhDb250YWluZXIiIHN0eWxlPSJ3aWR0aDogYXV0bzsiPgogICAgIDwhLS0gVGhlIGJv
cmRlci1ib3ggaGVpZ2h0IDI1cHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAg
ICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgZmxleCBiYXNlIHNpemUgb2YgMjAwcHguIC0tPgor
ICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBmbGV4IGJhc2Ugc2l6ZSAoYm9yZGVyLWJveCkg
b2YgMjAwcHguIC0tPgogICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4td2lkdGg6MDsg
aGVpZ2h0OiAyNXB4OyBhc3BlY3QtcmF0aW86IDgvMTsiPjwvZGl2PgogICA8L2Rpdj4KIAogICA8
ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAgICA8IS0tIFRoZSBib3JkZXItYm94IGhlaWdo
dCAyNXB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVsZGlu
ZyBhIHJlc29sdmVkIG1pbi13aWR0aDphdXRvIG9mIDIwMHB4LiAtLT4KKyAgICA8IS0tIFRoZSBj
b250ZW50IHNpemUgc3VnZ2VzdGlvbiAoYm9yZGVyLWJveCkgaXMgMjAwcHggYmVjYXVzZSB0aGUK
KyAgICAgICAgIGJvcmRlci1ib3ggaGVpZ2h0IDI1cHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1h
aW4gYXhpcy4gLS0+CiAgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9ImhlaWdodDogMjVweDsg
YXNwZWN0LXJhdGlvOiA4LzE7Ij48L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRpdiBjbGFzcz0iZmxl
eENvbnRhaW5lciI+Ci0gICAgPCEtLSBUaGUgYm9yZGVyLWJveCBtaW4taGVpZ2h0IDI1cHggaXMg
dHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2
ZWQgbWluLXdpZHRoOmF1dG8gb2YgMjAwcHguIC0tPgorICAgIDwhLS0gVGhlIGNvbnRlbnQgc2l6
ZSBzdWdnZXN0aW9uIChib3JkZXItYm94KSBpcyAyMDBweCBiZWNhdXNlIHRoZQorICAgICAgICAg
Ym9yZGVyLWJveCBoZWlnaHQgMjVweCAoZW5mb3JjZWQgYnkgbWluLWhlaWdodCkgaXMgdHJhbnNm
ZXJyZWQgdG8gdGhlCisgICAgICAgICBtYWluIGF4aXMuIC0tPgogICAgIDxkaXYgY2xhc3M9Iml0
ZW0iIHN0eWxlPSJtaW4taGVpZ2h0OiAyNXB4OyBhc3BlY3QtcmF0aW86IDgvMTsiPjwvZGl2Pgog
ICA8L2Rpdj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAgICA8IS0tIFRoZSBi
b3JkZXItYm94IGhlaWdodCAyNXB4IChjbGFtcGVkIGJ5IG1heC1oZWlnaHQpIGlzIHRyYW5zZmVy
cmVkIHRvIHRoZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi13
aWR0aDphdXRvIG9mIDIwMHB4LiAtLT4KKyAgICA8IS0tIFRoZSBjb250ZW50IHNpemUgc3VnZ2Vz
dGlvbiAoYm9yZGVyLWJveCkgaXMgMjAwcHggYmVjYXVzZSB0aGUKKyAgICAgICAgIGJvcmRlci1i
b3ggaGVpZ2h0IDI1cHggKGNsYW1wZWQgYnkgbWF4LWhlaWdodCkgaXMgdHJhbnNmZXJyZWQgdG8g
dGhlCisgICAgICAgICBtYWluIGF4aXMuIC0tPgogICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxl
PSJtYXgtaGVpZ2h0OiAyNXB4OyBoZWlnaHQ6IDEwMHB4OyBhc3BlY3QtcmF0aW86IDgvMTsiPjwv
ZGl2PgogICA8L2Rpdj4KIApAQCAtNTAsMjUgKzYyLDI3IEBACiAgICAgICAgYmVjYXVzZSBpdHMg
dmFsdWUgY29udGFpbnMgJ2F1dG8nLiAtLT4KICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciIg
c3R5bGU9IndpZHRoOiBhdXRvOyI+CiAgICAgPCEtLSBUaGUgY29udGVudC1ib3ggaGVpZ2h0IDEw
cHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEg
cmVzb2x2ZWQgZmxleCBiYXNlIHNpemUgb2YgMTkwcHguIC0tPgorICAgICAgICAgeWllbGRpbmcg
YSByZXNvbHZlZCBmbGV4IGJhc2Ugc2l6ZSAoY29udGVudC1ib3gpIG9mIDE5MHB4LiAtLT4KICAg
ICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWluLXdpZHRoOjA7IGhlaWdodDogMjVweDsgYXNw
ZWN0LXJhdGlvOiBhdXRvIDE5LzE7Ij48L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRpdiBjbGFzcz0i
ZmxleENvbnRhaW5lciI+Ci0gICAgPCEtLSBUaGUgY29udGVudC1ib3ggaGVpZ2h0IDEwcHggaXMg
dHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2
ZWQgbWluLXdpZHRoOmF1dG8gb2YgMTkwcHguIC0tPgorICAgIDwhLS0gVGhlIGNvbnRlbnQgc2l6
ZSBzdWdnZXN0aW9uIChjb250ZW50LWJveCkgaXMgMTkwcHggYmVjYXVzZSB0aGUKKyAgICAgICAg
IGNvbnRlbnQtYm94IGhlaWdodCAxMHB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMu
IC0tPgogICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJoZWlnaHQ6IDI1cHg7IGFzcGVjdC1y
YXRpbzogYXV0byAxOS8xOyI+PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhD
b250YWluZXIiPgotICAgIDwhLS0gVGhlIGNvbnRlbnQtYm94IG1pbi1oZWlnaHQgMTBweCBpcyB0
cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZl
ZCBtaW4td2lkdGg6YXV0byBvZiAxOTBweC4gLS0+CisgICAgPCEtLSBUaGUgY29udGVudCBzaXpl
IHN1Z2dlc3Rpb24gKGNvbnRlbnQtYm94KSBpcyAxOTBweCBiZWNhdXNlIHRoZQorICAgICAgICAg
Y29udGVudC1ib3ggaGVpZ2h0IDEwcHggKGVuZm9yY2VkIGJ5IG1pbi1oZWlnaHQpIGlzIHRyYW5z
ZmVycmVkIHRvIHRoZQorICAgICAgICAgbWFpbiBheGlzLiAtLT4KICAgICA8ZGl2IGNsYXNzPSJp
dGVtIiBzdHlsZT0ibWluLWhlaWdodDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDE5LzE7Ij48
L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciI+Ci0gICAgPCEt
LSBUaGUgY29udGVudC1ib3ggaGVpZ2h0IDEwcHggKGNsYW1wZWQgYnkgbWF4LWhlaWdodCkgaXMg
dHJhbnNmZXJyZWQKLSAgICAgICAgIHRvIHRoZSBtYWluIGF4aXMsIHlpZWxkaW5nIGEgcmVzb2x2
ZWQgbWluLXdpZHRoOmF1dG8gb2YgMTkwcHguIC0tPgorICAgIDwhLS0gVGhlIGNvbnRlbnQgc2l6
ZSBzdWdnZXN0aW9uIChjb250ZW50LWJveCkgaXMgMTkwcHggYmVjYXVzZSB0aGUKKyAgICAgICAg
IGNvbnRlbnQtYm94IGhlaWdodCAxMHB4IChjbGFtcGVkIGJ5IG1heC1oZWlnaHQpIGlzIHRyYW5z
ZmVycmVkIHRvIHRoZQorICAgICAgICAgbWFpbiBheGlzLiAtLT4KICAgICA8ZGl2IGNsYXNzPSJp
dGVtIiBzdHlsZT0ibWF4LWhlaWdodDogMjVweDsgaGVpZ2h0OiAxMDBweDsgYXNwZWN0LXJhdGlv
OiBhdXRvIDE5LzE7Ij48L2Rpdj4KICAgPC9kaXY+CiA8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlv
dXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz
cGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbCBiL0xheW91dFRlc3RzL2ltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Zs
ZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sCmluZGV4IGM0YTI1MDgxOGJiNzc4NmUyZjM5NTkyMmQy
OGUzYzc1MTliNGVhM2EuLmZmNmJmMmFhNTY5MDU1MTgwOGI5OGU3MTE3ZWM2NWQ5MTc4YTM0MjUg
MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sCisr
KyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z
aXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sCkBAIC00LDYgKzQs
OCBAQAogICA8bGluayByZWw9ImF1dGhvciIgdGl0bGU9IlRpbmctWXUgTGluIiBocmVmPSJtYWls
dG86dGxpbkBtb3ppbGxhLmNvbSI+CiAgIDxsaW5rIHJlbD0iYXV0aG9yIiB0aXRsZT0iTW96aWxs
YSIgaHJlZj0iaHR0cHM6Ly93d3cubW96aWxsYS5vcmcvIj4KICAgPGxpbmsgcmVsPSJoZWxwIiBo
cmVmPSJodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLXNpemluZy00LyNhc3BlY3QtcmF0aW8i
PgorICA8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3Mt
c2l6aW5nLTQvI2FzcGVjdC1yYXRpby1taW5pbXVtIj4KKyAgPGxpbmsgcmVsPSJoZWxwIiBocmVm
PSJodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLWZsZXhib3gtMS8jbWluLXNpemUtYXV0byI+
CiAgIDxsaW5rIHJlbD0ibWF0Y2giIGhyZWY9Ii4uLy4uL3JlZmVyZW5jZS9yZWYtZmlsbGVkLWdy
ZWVuLTIwMHB4LXNxdWFyZS5odG1sIiAvPgogICA8c3R5bGU+CiAgIC5mbGV4Q29udGFpbmVyIHsK
QEAgLTE5LDYwICsyMSw3NCBAQAogICAgIGJveC1zaXppbmc6IGJvcmRlci1ib3g7CiAgIH0KICAg
Lml0ZW0gPiBkaXYgewotICAgIGhlaWdodDogNTAwcHg7IC8qIFNldCBhIGxhcmdlIGNvbnRlbnQg
c2l6ZSBzdWdnZXN0aW9uIGZvciBmbGV4IGl0ZW0uICovCisgICAgaGVpZ2h0OiAxOTBweDsgLyog
U2V0IHRoZSBjb250ZW50IHNpemUgc3VnZ2VzdGlvbiBmb3IgZmxleCBpdGVtLiAqLwogICB9CiAg
IDwvc3R5bGU+CiAKICAgPHA+VGVzdCBwYXNzZXMgaWYgdGhlcmUgaXMgYSBmaWxsZWQgZ3JlZW4g
c3F1YXJlIGFuZCA8c3Ryb25nPm5vIHJlZDwvc3Ryb25nPi48L3A+CiAKKyAgPCEtLSBJbiBhbGwg
b2YgdGhlIHN1YnRlc3RzIGhlcmUsIGVhY2ggZmxleCBpdGVtJ3MgYXV0b21hdGljIG1pbmltdW0g
aGVpZ2h0IGlzCisgICAgICAgcmVzb2x2ZWQgZGlyZWN0bHkgZnJvbSBpdHMgY29udGVudCBzaXpl
IHN1Z2dlc3Rpb24uIE5vdGFibHksIHRoZXNlIGl0ZW1zCisgICAgICAgKmRvIG5vdCogZ2V0IGEg
InRyYW5zZmVycmVkIHNpemUgc3VnZ2VzdGlvbiIsIGJlY2F1c2UgdGhleSBhcmUgYWxsCisgICAg
ICAgKm5vbi1yZXBsYWNlZCogZWxlbWVudHM7IGFuZCAidHJhbnNmZXJyZWQgc2l6ZSBzdWdnZXN0
aW9uIiBpcyBvbmx5IHVzZWQKKyAgICAgICBmb3IgcmVzb2x2aW5nIGF1dG9tYXRpYyBtaW5pbXVt
IHNpemVzIG9uICpyZXBsYWNlZCogZWxlbWVudHMuIEhvd2V2ZXIsCisgICAgICAgbm90ZSB0aGF0
IHdlIGRvICJ0cmFuc2ZlciIgc2l6ZXMgdGhyb3VnaCB0aGUgYXNwZWN0IHJhdGlvLCBhcyBwYXJ0
IG9mCisgICAgICAgY29tcHV0aW5nIHRoZSBjb250ZW50IHNpemUgc3VnZ2VzdGlvbiBhbmQvb3Ig
ZmxleCBiYXNlIHNpemUuIC0tPgorCiAgIDwhLS0gSW4gdGhlIGZvbGxvd2luZyBmb3VyIGZsZXgg
Y29udGFpbmVycywgdGhlIGFzcGVjdC1yYXRpbyB3b3JrcyB3aXRoIGJvcmRlci1ib3guIC0tPgog
ICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIiBzdHlsZT0iaGVpZ2h0OiBhdXRvOyI+CiAgICAg
PCEtLSBUaGUgYm9yZGVyLWJveCB3aWR0aCAyNXB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWlu
IGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIGZsZXggYmFzZSBzaXplIG9mIDIw
MHB4LiAtLT4KKyAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgZmxleCBiYXNlIHNpemUgKGJv
cmRlci1ib3gpIG9mIDIwMHB4LiAtLT4KICAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWlu
LWhlaWdodDowOyB3aWR0aDogMjVweDsgYXNwZWN0LXJhdGlvOiAxLzg7Ij48ZGl2PjwvZGl2Pjwv
ZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAgICA8IS0t
IFRoZSBib3JkZXItYm94IHdpZHRoIDI1cHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhp
cywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLWhlaWdodDphdXRvIG9mIDIwMHB4
LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0id2lkdGg6IDI1cHg7IGFzcGVjdC1y
YXRpbzogMS84OyI+PGRpdj48L2Rpdj48L2Rpdj4KKyAgICA8IS0tIFRoZSBjb250ZW50IHNpemUg
c3VnZ2VzdGlvbiBpcyAxOTBweCwgaS5lLiB0aGUgaGVpZ2h0IG9mIHRoZSBpdGVtJ3MKKyAgICAg
ICAgIGNoaWxkIGRpdi4gLS0+CisgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9IndpZHRoOiAy
NXB4OyBhc3BlY3QtcmF0aW86IDEvMTsiPjxkaXY+PC9kaXY+PC9kaXY+CiAgIDwvZGl2PgogCiAg
IDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgotICAgIDwhLS0gVGhlIGJvcmRlci1ib3ggbWlu
LXdpZHRoIDI1cHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlp
ZWxkaW5nIGEgcmVzb2x2ZWQgbWluLWhlaWdodDphdXRvIG9mIDIwMHB4LiAtLT4KLSAgICA8ZGl2
IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWluLXdpZHRoOiAyNXB4OyBhc3BlY3QtcmF0aW86IDEvODsi
PjxkaXY+PC9kaXY+PC9kaXY+CisgICAgPCEtLSBUaGUgY29udGVudCBzaXplIHN1Z2dlc3Rpb24g
aXMgMTkwcHgsIGkuZS4gdGhlIGhlaWdodCBvZiB0aGUgaXRlbSdzCisgICAgICAgICBjaGlsZCBk
aXYuIC0tPgorICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4td2lkdGg6IDI1cHg7IGFz
cGVjdC1yYXRpbzogMS8xOyI+PGRpdj48L2Rpdj48L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRpdiBj
bGFzcz0iZmxleENvbnRhaW5lciI+Ci0gICAgPCEtLSBUaGUgYm9yZGVyLWJveCB3aWR0aCAyNXB4
IChjbGFtcGVkIGJ5IG1heC13aWR0aCkgaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywK
LSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLWhlaWdodDphdXRvIG9mIDIwMHB4LiAt
LT4KLSAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWF4LXdpZHRoOiAyNXB4OyB3aWR0aDog
MTAwcHg7IGFzcGVjdC1yYXRpbzogMS84OyI+PGRpdj48L2Rpdj48L2Rpdj4KKyAgICA8IS0tIFRo
ZSBjb250ZW50IHNpemUgc3VnZ2VzdGlvbiBpcyAyMDBweCBiZWNhdXNlIHRoZSBib3JkZXItYm94
IG1heC13aWR0aAorICAgICAgICAgMjVweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlz
IGFzIHRoZSB1cHBlciBib3VuZCBvZiBpdHMKKyAgICAgICAgIGJvcmRlci1ib3ggaGVpZ2h0LiAt
LT4KKyAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWF4LXdpZHRoOiAyNXB4OyB3aWR0aDog
MTAwcHg7IGFzcGVjdC1yYXRpbzogMS84OyI+CisgICAgICA8ZGl2IHN0eWxlPSJoZWlnaHQ6IDUw
MHB4Ij48L2Rpdj4KKyAgICA8L2Rpdj4KICAgPC9kaXY+CiAKICAgPCEtLSBJbiB0aGUgZm9sbG93
aW5nIGZvdXIgZmxleCBjb250YWluZXJzLCB0aGUgYXNwZWN0LXJhdGlvIHdvcmtzIHdpdGggY29u
dGVudC1ib3gKICAgICAgICBiZWNhdXNlIGl0cyB2YWx1ZSBjb250YWlucyAnYXV0bycuIC0tPgog
ICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIiBzdHlsZT0iaGVpZ2h0OiBhdXRvOyI+CiAgICAg
PCEtLSBUaGUgY29udGVudC1ib3ggd2lkdGggMTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFp
biBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBmbGV4IGJhc2Ugc2l6ZSBvZiAx
OTBweC4gLS0+CisgICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIGZsZXggYmFzZSBzaXplIChj
b250ZW50LWJveCkgb2YgMTkwcHguIC0tPgogICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJt
aW4taGVpZ2h0OjA7IHdpZHRoOiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMS8xOTsiPjxkaXY+
PC9kaXY+PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgot
ICAgIDwhLS0gVGhlIGNvbnRlbnQtYm94IHdpZHRoIDEwcHggaXMgdHJhbnNmZXJyZWQgdG8gdGhl
IG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLWhlaWdodDphdXRv
IG9mIDE5MHB4LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0id2lkdGg6IDI1cHg7
IGFzcGVjdC1yYXRpbzogYXV0byAxLzE5OyI+PGRpdj48L2Rpdj48L2Rpdj4KKyAgICA8IS0tIFRo
ZSBjb250ZW50IHNpemUgc3VnZ2VzdGlvbiBpcyAxOTBweCwgaS5lLiB0aGUgaGVpZ2h0IG9mIHRo
ZSBpdGVtJ3MKKyAgICAgICAgIGNoaWxkIGRpdi4gLS0+CisgICAgPGRpdiBjbGFzcz0iaXRlbSIg
c3R5bGU9IndpZHRoOiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMS8xOyI+PGRpdj48L2Rpdj48
L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciI+Ci0gICAgPCEt
LSBUaGUgY29udGVudC1ib3ggbWluLXdpZHRoIDEwcHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1h
aW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLWhlaWdodDphdXRvIG9m
IDE5MHB4LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWluLXdpZHRoOiAyNXB4
OyBhc3BlY3QtcmF0aW86IGF1dG8gMS8xOTsiPjxkaXY+PC9kaXY+PC9kaXY+CisgICAgPCEtLSBU
aGUgY29udGVudCBzaXplIHN1Z2dlc3Rpb24gaXMgMTkwcHgsIGkuZS4gdGhlIGhlaWdodCBvZiB0
aGUgaXRlbSdzCisgICAgICAgICBjaGlsZCBkaXYuIC0tPgorICAgIDxkaXYgY2xhc3M9Iml0ZW0i
IHN0eWxlPSJtaW4td2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE7Ij48ZGl2Pjwv
ZGl2PjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAg
ICA8IS0tIFRoZSBjb250ZW50LWJveCB3aWR0aCAxMHB4IChjbGFtcGVkIGJ5IG1heC13aWR0aCkg
aXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVz
b2x2ZWQgbWluLWhlaWdodDphdXRvIG9mIDE5MHB4LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJpdGVt
IiBzdHlsZT0ibWF4LXdpZHRoOiAyNXB4OyB3aWR0aDogMTAwcHg7IGFzcGVjdC1yYXRpbzogYXV0
byAxLzE5OyI+PGRpdj48L2Rpdj48L2Rpdj4KKyAgICA8IS0tIFRoZSBjb250ZW50IHNpemUgc3Vn
Z2VzdGlvbiBpcyAxOTBweCBiZWNhdXNlIHRoZSBjb250ZW50LWJveCBtYXgtd2lkdGgKKyAgICAg
ICAgIDEwcHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcyBhcyB0aGUgdXBwZXIgYm91
bmQgb2YgaXRzCisgICAgICAgICBjb250ZW50LWJveCBoZWlnaHQuLS0+CisgICAgPGRpdiBjbGFz
cz0iaXRlbSIgc3R5bGU9Im1heC13aWR0aDogMjVweDsgd2lkdGg6IDEwMHB4OyBhc3BlY3QtcmF0
aW86IGF1dG8gMS8xOTsiPgorICAgICAgPGRpdiBzdHlsZT0iaGVpZ2h0OiA1MDBweCI+PC9kaXY+
CisgICAgPC9kaXY+CiAgIDwvZGl2PgogPC9odG1sPgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>432480</attachid>
            <date>2021-06-29 07:30:01 -0700</date>
            <delta_ts>2021-06-30 01:36:36 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210629153000.patch</filename>
            <type>text/plain</type>
            <size>20704</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MzcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmRiZGJmZmY3NjhjMTVh
OWJhM2MwOGE2YWQwNDdhZmEyZGFjNDE2OS4uZDFjNWVjODZkNGZiNmI1ZDljZjAwYjAwNzliYTM3
MzQ3M2M4NDliMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA2LTI5ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBNYWtlIGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nIHRha2UgaW50byBh
Y2NvdW50CisgICAgICAgIGJveC1zaXppbmcgZm9yIHRoZSBjYXNlIHdoZXJlIENTUyBhc3BlY3Qt
cmF0aW8gaXMgYXBwbGllZC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRo
VXNpbmcgY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6
CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJv
bUFzcGVjdFJhdGlvVXNpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGli
bGVCb3g6OmNvbXB1dGVGbGV4SXRlbU1pbk1heFNpemVzKToKKwogMjAyMS0wNi0yOSAgUm9iIEJ1
aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIENyYXNoIGluIFNoYXJlZEJ1ZmZlcjo6
ZGF0YQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAg
Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCBjYTVhNmMzMzQ4
ODk5MmFkZDQ2MjEwYzdmYTcxYjk4YjA2N2QzZDg3Li5mZjk2MTcyMzAxYTY4ZjBlNmVkMjgxYTdi
OGJjZjNkNmIwY2RhMDhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu
ZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApA
QCAtMjY5MSw5ICsyNjkxLDEwIEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlSW50cmlu
c2ljTG9naWNhbFdpZHRoVXNpbmcoTGVuZ3RoIGxvZ2ljYWxXaWR0aExlbmd0CiAKICAgICBMYXlv
dXRVbml0IG1pbkxvZ2ljYWxXaWR0aDsKICAgICBMYXlvdXRVbml0IG1heExvZ2ljYWxXaWR0aDsK
LSAgICBpZiAoIWxvZ2ljYWxXaWR0aExlbmd0aC5pc01pbkludHJpbnNpYygpICYmIHNob3VsZENv
bXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSkKKyAgICBpZiAoIWxvZ2ljYWxXaWR0
aExlbmd0aC5pc01pbkludHJpbnNpYygpICYmIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9t
QXNwZWN0UmF0aW8oKSkgewogICAgICAgICBtaW5Mb2dpY2FsV2lkdGggPSBtYXhMb2dpY2FsV2lk
dGggPSBjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCk7Ci0gICAgZWxzZQorICAg
ICAgICBib3JkZXJBbmRQYWRkaW5nID0gTGF5b3V0VW5pdCgpOworICAgIH0gZWxzZQogICAgICAg
ICBjb21wdXRlSW50cmluc2ljS2V5d29yZExvZ2ljYWxXaWR0aHMobWluTG9naWNhbFdpZHRoLCBt
YXhMb2dpY2FsV2lkdGgpOwogCiAgICAgaWYgKGxvZ2ljYWxXaWR0aExlbmd0aC5pc01pbkNvbnRl
bnQoKSB8fCBsb2dpY2FsV2lkdGhMZW5ndGguaXNNaW5JbnRyaW5zaWMoKSkKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2Uv
V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4IDJlN2M3NjRkNzcz
ZTZhOWUxMGZkYjA1OWZjNGM2YjA4ZjIwNTRmNzMuLmQwZDMyNDllZGY2NjBjMjc2ODE2OThlYmRi
ZWQxOTFlMjkwZmY4MGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k
ZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZs
ZXhpYmxlQm94LmNwcApAQCAtODY1LDkgKzg2NSw3IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGli
bGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJv
CiB7CiAgICAgQVNTRVJUKGNoaWxkSGFzQXNwZWN0UmF0aW8oY2hpbGQpKTsKIAotICAgIGF1dG8g
YWRqdXN0Rm9yQm94U2l6aW5nID0gW3RoaXNdIChjb25zdCBSZW5kZXJCb3gmIGJveCwgTGVuZ3Ro
IGxlbmd0aCkgLT4gTGF5b3V0VW5pdCB7Ci0gICAgICAgIEFTU0VSVChsZW5ndGguaXNGaXhlZCgp
KTsKLSAgICAgICAgYXV0byB2YWx1ZSA9IExheW91dFVuaXQobGVuZ3RoLnZhbHVlKCkpOworICAg
IGF1dG8gYWRqdXN0Rm9yQm94U2l6aW5nID0gW3RoaXNdIChjb25zdCBSZW5kZXJCb3gmIGJveCwg
TGF5b3V0VW5pdCB2YWx1ZSkgLT4gTGF5b3V0VW5pdCB7CiAgICAgICAgIC8vIFdlIG5lZWQgdG8g
c3Vic3RyYWN0IHRoZSBib3JkZXIgYW5kIHBhZGRpbmcgZXh0ZW50IGZyb20gdGhlIGNyb3NzIGF4
aXMuCiAgICAgICAgIC8vIEZ1cnRoZXJtb3JlLCB0aGUgc2l6aW5nIGNhbGN1bGF0aW9ucyB0aGF0
IGZsb29yIHRoZSBjb250ZW50IGJveCBzaXplIGF0IHplcm8gd2hlbiBhcHBseWluZyBib3gtc2l6
aW5nIGFyZSBhbHNvIGlnbm9yZWQuCiAgICAgICAgIC8vIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9y
Zy9jc3MtZmxleGJveC8jYWxnby1tYWluLWl0ZW0uCkBAIC04NzYsMjkgKzg3NCwzOCBAQCBMYXlv
dXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9V
c2luZyhjb25zdCBSZW5kZXJCbwogICAgICAgICByZXR1cm4gdmFsdWU7CiAgICAgfTsKIAotICAg
IHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gY3Jvc3NTaXplOworICAgIC8vIGNyb3NzU2l6ZSBp
cyBib3JkZXItYm94IHNpemUgaWYgYm94LXNpemluZyBpcyBib3JkZXItYm94LCBhbmQKKyAgICAv
LyBjb250ZW50LWJveCBvdGhlcndpc2UuCisgICAgTGF5b3V0VW5pdCBjcm9zc1NpemU7CiAgICAg
aWYgKGNyb3NzU2l6ZUxlbmd0aC5pc0ZpeGVkKCkpCi0gICAgICAgIGNyb3NzU2l6ZSA9IGFkanVz
dEZvckJveFNpemluZyhjaGlsZCwgY3Jvc3NTaXplTGVuZ3RoKTsKKyAgICAgICAgY3Jvc3NTaXpl
ID0gTGF5b3V0VW5pdChjcm9zc1NpemVMZW5ndGgudmFsdWUoKSk7CiAgICAgZWxzZSBpZiAoY3Jv
c3NTaXplTGVuZ3RoLmlzQXV0bygpKQogICAgICAgICBjcm9zc1NpemUgPSBjb21wdXRlQ3Jvc3NT
aXplRm9yQ2hpbGRVc2luZ0NvbnRhaW5lckNyb3NzU2l6ZShjaGlsZCk7CiAgICAgZWxzZSB7CiAg
ICAgICAgIEFTU0VSVChjcm9zc1NpemVMZW5ndGguaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkpOwot
ICAgICAgICBjcm9zc1NpemUgPSBtYWluQXhpc0lzQ2hpbGRJbmxpbmVBeGlzKGNoaWxkKSA/IGNo
aWxkLmNvbXB1dGVQZXJjZW50YWdlTG9naWNhbEhlaWdodChjcm9zc1NpemVMZW5ndGgpIDogYWRq
dXN0Qm9yZGVyQm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKHZhbHVlRm9yTGVuZ3RoKGNyb3Nz
U2l6ZUxlbmd0aCwgY29udGVudFdpZHRoKCkpLCBjcm9zc1NpemVMZW5ndGgudHlwZSgpKTsKLSAg
ICAgICAgaWYgKCFjcm9zc1NpemUpCisgICAgICAgIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4g
Y2hpbGRTaXplID0gbWFpbkF4aXNJc0NoaWxkSW5saW5lQXhpcyhjaGlsZCkgPyBjaGlsZC5jb21w
dXRlUGVyY2VudGFnZUxvZ2ljYWxIZWlnaHQoY3Jvc3NTaXplTGVuZ3RoKSA6IGFkanVzdEJvcmRl
ckJveExvZ2ljYWxXaWR0aEZvckJveFNpemluZyh2YWx1ZUZvckxlbmd0aChjcm9zc1NpemVMZW5n
dGgsIGNvbnRlbnRXaWR0aCgpKSwgY3Jvc3NTaXplTGVuZ3RoLnR5cGUoKSk7CisgICAgICAgIGlm
ICghY2hpbGRTaXplKQogICAgICAgICAgICAgcmV0dXJuIDBfbHU7CisgICAgICAgIGNyb3NzU2l6
ZSA9IGNoaWxkU2l6ZS52YWx1ZSgpOwogICAgIH0KIAogICAgIGNvbnN0IExheW91dFNpemUmIGNo
aWxkSW50cmluc2ljU2l6ZSA9IGNoaWxkLmludHJpbnNpY1NpemUoKTsKICAgICBkb3VibGUgcmF0
aW87Ci0gICAgaWYgKGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0
aW9UeXBlOjpSYXRpbyB8fCAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3Bl
Y3RSYXRpb1R5cGU6OkF1dG9BbmRSYXRpbyAmJiBjaGlsZEludHJpbnNpY1NpemUuaXNFbXB0eSgp
KSkKKyAgICBMYXlvdXRVbml0IGJvcmRlckFuZFBhZGRpbmc7CisgICAgaWYgKGNoaWxkLnN0eWxl
KCkuYXNwZWN0UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpSYXRpbyB8fCAoY2hpbGQu
c3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OkF1dG9BbmRSYXRp
byAmJiBjaGlsZEludHJpbnNpY1NpemUuaXNFbXB0eSgpKSkgewogICAgICAgICByYXRpbyA9IGNo
aWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9XaWR0aCgpIC8gY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRp
b0hlaWdodCgpOwotICAgIGVsc2UgeworICAgICAgICBpZiAoY2hpbGQuc3R5bGUoKS5ib3hTaXpp
bmdGb3JBc3BlY3RSYXRpbygpID09IEJveFNpemluZzo6Q29udGVudEJveCkKKyAgICAgICAgICAg
IGNyb3NzU2l6ZSAtPSBpc0hvcml6b250YWxGbG93KCkgPyBjaGlsZC52ZXJ0aWNhbEJvcmRlckFu
ZFBhZGRpbmdFeHRlbnQoKSA6IGNoaWxkLmhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50
KCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGJvcmRlckFuZFBhZGRpbmcgPSBpc0hvcml6
b250YWxGbG93KCkgPyBjaGlsZC5ob3Jpem9udGFsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpIDog
Y2hpbGQudmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCk7CisgICAgfSBlbHNlIHsKICAg
ICAgICAgQVNTRVJUKGNoaWxkSW50cmluc2ljU2l6ZS5oZWlnaHQoKSk7CiAgICAgICAgIHJhdGlv
ID0gY2hpbGRJbnRyaW5zaWNTaXplLndpZHRoKCkudG9GbG9hdCgpIC8gY2hpbGRJbnRyaW5zaWNT
aXplLmhlaWdodCgpLnRvRmxvYXQoKTsKKyAgICAgICAgY3Jvc3NTaXplID0gYWRqdXN0Rm9yQm94
U2l6aW5nKGNoaWxkLCBjcm9zc1NpemUpOwogICAgIH0KICAgICBpZiAoaXNIb3Jpem9udGFsRmxv
dygpKQotICAgICAgICByZXR1cm4gTGF5b3V0VW5pdChjcm9zc1NpemUudmFsdWUoKSAqIHJhdGlv
KTsKLSAgICByZXR1cm4gTGF5b3V0VW5pdChjcm9zc1NpemUudmFsdWUoKSAvIHJhdGlvKTsKKyAg
ICAgICAgcmV0dXJuIExheW91dFVuaXQoY3Jvc3NTaXplICogcmF0aW8pIC0gYm9yZGVyQW5kUGFk
ZGluZzsKKyAgICByZXR1cm4gTGF5b3V0VW5pdChjcm9zc1NpemUgLyByYXRpbykgLSBib3JkZXJB
bmRQYWRkaW5nOwogfQogCiB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpzZXRGbG93QXdhcmVMb2Nh
dGlvbkZvckNoaWxkKFJlbmRlckJveCYgY2hpbGQsIGNvbnN0IExheW91dFBvaW50JiBsb2NhdGlv
bikKQEAgLTEyNzEsNiArMTI3OCwxMSBAQCBzdGQ6OnBhaXI8TGF5b3V0VW5pdCwgTGF5b3V0VW5p
dD4gUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVGbGV4SXRlbU1pbk1heFNpemVzKAogICAgIHN0
ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gbWF4RXh0ZW50ID0gc3RkOjpudWxsb3B0OwogICAgIGlm
IChtYXguaXNTcGVjaWZpZWRPckludHJpbnNpYygpKQogICAgICAgICBtYXhFeHRlbnQgPSBjb21w
dXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjaGlsZCwgTWF4U2l6ZSwgbWF4KTsKKyAgICBlbHNl
IGlmIChjaGlsZC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpIHsKKyAgICAgICAgbWF4ID0gY3Jv
c3NTaXplTGVuZ3RoRm9yQ2hpbGQoTWF4U2l6ZSwgY2hpbGQpOworICAgICAgICBpZiAobWF4Lmlz
U3BlY2lmaWVkT3JJbnRyaW5zaWMoKSkKKyAgICAgICAgICAgIG1heEV4dGVudCA9IGNvbXB1dGVN
YWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNoaWxkLCBtYXgpOworICAgIH0KIAogICAgIExl
bmd0aCBtaW4gPSBtYWluU2l6ZUxlbmd0aEZvckNoaWxkKE1pblNpemUsIGNoaWxkKTsKICAgICAv
LyBJbnRyaW5zaWMgc2l6ZXMgaW4gY2hpbGQncyBibG9jayBheGlzIGFyZSBoYW5kbGVkIGJ5IHRo
ZSBtaW4tc2l6ZTphdXRvIGNvZGUgcGF0aC4KQEAgLTE0MTcsOCArMTQyOSw4IEBAIEZsZXhJdGVt
IFJlbmRlckZsZXhpYmxlQm94Ojpjb25zdHJ1Y3RGbGV4SXRlbShSZW5kZXJCb3gmIGNoaWxkLCBi
b29sIHJlbGF5b3V0Q2hpCiAgICAgTGF5b3V0VW5pdCBjaGlsZElubmVyRmxleEJhc2VTaXplOwog
ICAgIHsKICAgICAgICAgU2NvcGVkVW5ib3VuZGVkQm94IHVuYm91bmRlZChjaGlsZCwgbWFpbkF4
aXNJc0NoaWxkSW5saW5lQXhpcyhjaGlsZCkpOwotICAgICAgICBjaGlsZC5jbGVhck92ZXJyaWRp
bmdDb250ZW50U2l6ZSgpOwogICAgICAgICBpZiAoY2hpbGRIYXNJbnRyaW5zaWNNYWluQXhpc1Np
emUoY2hpbGQpKSB7CisgICAgICAgIC8vY2hpbGQuY2xlYXJPdmVycmlkaW5nQ29udGVudFNpemUo
KTsKICAgICAgICAgICAgIC8vIElmIHRoaXMgY29uZGl0aW9uIGlzIHRydWUsIHRoZW4gY29tcHV0
ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQgd2lsbCBjYWxsCiAgICAgICAgICAgICAvLyBjaGlsZC5p
bnRyaW5zaWNDb250ZW50TG9naWNhbEhlaWdodCgpIGFuZCBjaGlsZC5zY3JvbGxiYXJMb2dpY2Fs
SGVpZ2h0KCksCiAgICAgICAgICAgICAvLyBzbyBpZiB0aGUgY2hpbGQgaGFzIGludHJpbnNpYyBt
aW4vbWF4L3ByZWZlcnJlZCBzaXplLCBydW4gbGF5b3V0IG9uIGl0IG5vdyB0byBtYWtlIHN1cmUK
ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwppbmRleCBkMWM1MWI0YjU0NjYxZDEwYzQxOWU3YTJjZmQ2Yzc4ODk5MzU2Y2QzLi40YTA2ODg4
YThiMzViNzE1ZDI3MjE0YzQ1YzBmNWI1OTViOWY3MDAwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0
cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAK
KzIwMjEtMDYtMjkgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBGaXgg
ZmxleC1hc3BlY3QtcmF0aW8tMDI1KzI2Lmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjM1NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E
WSAoT09QUyEpLgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0wNi0yOSAg
Um9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIENyYXNoIGluIFNoYXJlZEJ1
ZmZlcjo6ZGF0YQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxv
ZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggNzU5ZmZjZmE5ZWZi
YjJjOWY2N2Y1OGY0NGUzNjAyMzQyNTgwMjA1OS4uMjUwZjM2NzFhYmJhZDFkMjg1M2UzN2E1MzMw
N2ZlZDI5MGUxOTY1NCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5n
ZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs
MTUgQEAKKzIwMjEtMDYtMjkgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAg
ICBGaXggZmxleC1hc3BlY3QtcmF0aW8tMDI1KzI2Lmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdz
LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjM1NworCisgICAgICAgIFJldmlld2VkIGJ5
IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcG9ydCB1cGRhdGVkIFdQVCB0ZXN0cy4KKwor
ICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v
ZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWw6CisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbDoK
KwogMjAyMS0wNi0yOSAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAK
ICAgICAgICAgQ1NTIHNjcm9sbCBzbmFwIHNob3VsZCBhbGxvdyBzY3JvbGxpbmcgdG8gdGhlIG1p
ZGRsZSBvZiBzbmFwIGFyZWFzIHRoYXQgb3ZlcmZsb3cgdGhlIHNuYXBwb3J0CmRpZmYgLS1naXQg
YS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0
aW9ucwppbmRleCAyOWY0NDdhZjI2NGEzNGQwYmI1OTFjZTJmMDAzODgwMWJmYzE2NzI0Li40ZTM5
OGI0YjRkYjY4ZmM3MmIwMDEzNGM3MGE3OWViNmRlNjhmNzA0IDEwMDY0NAotLS0gYS9MYXlvdXRU
ZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMK
QEAgLTQ1NjcsOCArNDU2Nyw2IEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vCiAjIGZsZXgtYmFz
aXM6Y29udGVudAogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjEu
aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFz
cGVjdC1yYXRpby0wMjIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIx
NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj
dC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQot
d2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbCBbIEltYWdl
T25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0w
MTguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlk
LWFzcGVjdC1yYXRpby0wMTkuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9i
LzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz
cGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMjAuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg
XQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWwg
Yi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6
aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbAppbmRleCBjNGZmODEx
MGQ3YmVkNzA3OWM4NjRkZGYxOTJmODI0MjkzMmU1ODhkLi5iZjhkYWFhMzVmMDhhNDEyODIyZGQ0
MWU3NDk5MDI1ZTQwNjVlMjg0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVj
dC1yYXRpby0wMjUuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0w
MjUuaHRtbApAQCAtNCw2ICs0LDggQEAKICAgPGxpbmsgcmVsPSJhdXRob3IiIHRpdGxlPSJUaW5n
LVl1IExpbiIgaHJlZj0ibWFpbHRvOnRsaW5AbW96aWxsYS5jb20iPgogICA8bGluayByZWw9ImF1
dGhvciIgdGl0bGU9Ik1vemlsbGEiIGhyZWY9Imh0dHBzOi8vd3d3Lm1vemlsbGEub3JnLyI+CiAg
IDxsaW5rIHJlbD0iaGVscCIgaHJlZj0iaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1zaXpp
bmctNC8jYXNwZWN0LXJhdGlvIj4KKyAgPGxpbmsgcmVsPSJoZWxwIiBocmVmPSJodHRwczovL2Ry
YWZ0cy5jc3N3Zy5vcmcvY3NzLXNpemluZy00LyNhc3BlY3QtcmF0aW8tbWluaW11bSI+CisgIDxs
aW5rIHJlbD0iaGVscCIgaHJlZj0iaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1mbGV4Ym94
LTEvI21pbi1zaXplLWF1dG8iPgogICA8bGluayByZWw9Im1hdGNoIiBocmVmPSIuLi8uLi9yZWZl
cmVuY2UvcmVmLWZpbGxlZC1ncmVlbi0yMDBweC1zcXVhcmUuaHRtbCIgLz4KICAgPHN0eWxlPgog
ICAuZmxleENvbnRhaW5lciB7CkBAIC0yMSwyOCArMjMsMzggQEAKIAogICA8cD5UZXN0IHBhc3Nl
cyBpZiB0aGVyZSBpcyBhIGZpbGxlZCBncmVlbiBzcXVhcmUgYW5kIDxzdHJvbmc+bm8gcmVkPC9z
dHJvbmc+LjwvcD4KIAorICA8IS0tIEluIGFsbCBvZiB0aGUgc3VidGVzdHMgaGVyZSwgZWFjaCBm
bGV4IGl0ZW0ncyBhdXRvbWF0aWMgbWluaW11bSB3aWR0aCBpcworICAgICAgIHJlc29sdmVkIGRp
cmVjdGx5IGZyb20gaXRzIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uLiBOb3RhYmx5LCB0aGVzZSBp
dGVtcworICAgICAgICpkbyBub3QqIGdldCBhICJ0cmFuc2ZlcnJlZCBzaXplIHN1Z2dlc3Rpb24i
LCBiZWNhdXNlIHRoZXkgYXJlIGFsbAorICAgICAgICpub24tcmVwbGFjZWQqIGVsZW1lbnRzOyBh
bmQgInRyYW5zZmVycmVkIHNpemUgc3VnZ2VzdGlvbiIgaXMgb25seSB1c2VkCisgICAgICAgZm9y
IHJlc29sdmluZyBhdXRvbWF0aWMgbWluaW11bSBzaXplcyBvbiAqcmVwbGFjZWQqIGVsZW1lbnRz
LiBIb3dldmVyLAorICAgICAgIG5vdGUgdGhhdCB3ZSBkbyAidHJhbnNmZXIiIHNpemVzIHRocm91
Z2ggdGhlIGFzcGVjdCByYXRpbywgYXMgcGFydCBvZgorICAgICAgIGNvbXB1dGluZyB0aGUgY29u
dGVudCBzaXplIHN1Z2dlc3Rpb24gYW5kL29yIGZsZXggYmFzZSBzaXplLiAtLT4KKwogICA8IS0t
IEluIHRoZSBmb2xsb3dpbmcgZm91ciBmbGV4IGNvbnRhaW5lcnMsIHRoZSBhc3BlY3QtcmF0aW8g
d29ya3Mgd2l0aCBib3JkZXItYm94LiAtLT4KICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciIg
c3R5bGU9IndpZHRoOiBhdXRvOyI+CiAgICAgPCEtLSBUaGUgYm9yZGVyLWJveCBoZWlnaHQgMjVw
eCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSBy
ZXNvbHZlZCBmbGV4IGJhc2Ugc2l6ZSBvZiAyMDBweC4gLS0+CisgICAgICAgICB5aWVsZGluZyBh
IHJlc29sdmVkIGZsZXggYmFzZSBzaXplIChib3JkZXItYm94KSBvZiAyMDBweC4gLS0+CiAgICAg
PGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi13aWR0aDowOyBoZWlnaHQ6IDI1cHg7IGFzcGVj
dC1yYXRpbzogOC8xOyI+PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250
YWluZXIiPgotICAgIDwhLS0gVGhlIGJvcmRlci1ib3ggaGVpZ2h0IDI1cHggaXMgdHJhbnNmZXJy
ZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLXdp
ZHRoOmF1dG8gb2YgMjAwcHguIC0tPgorICAgIDwhLS0gVGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0
aW9uIChib3JkZXItYm94KSBpcyAyMDBweCBiZWNhdXNlIHRoZQorICAgICAgICAgYm9yZGVyLWJv
eCBoZWlnaHQgMjVweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLiAtLT4KICAgICA8
ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0iaGVpZ2h0OiAyNXB4OyBhc3BlY3QtcmF0aW86IDgvMTsi
PjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAgICA8
IS0tIFRoZSBib3JkZXItYm94IG1pbi1oZWlnaHQgMjVweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUg
bWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4td2lkdGg6YXV0byBv
ZiAyMDBweC4gLS0+CisgICAgPCEtLSBUaGUgY29udGVudCBzaXplIHN1Z2dlc3Rpb24gKGJvcmRl
ci1ib3gpIGlzIDIwMHB4IGJlY2F1c2UgdGhlCisgICAgICAgICBib3JkZXItYm94IGhlaWdodCAy
NXB4IChlbmZvcmNlZCBieSBtaW4taGVpZ2h0KSBpcyB0cmFuc2ZlcnJlZCB0byB0aGUKKyAgICAg
ICAgIG1haW4gYXhpcy4gLS0+CiAgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi1oZWln
aHQ6IDI1cHg7IGFzcGVjdC1yYXRpbzogOC8xOyI+PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYg
Y2xhc3M9ImZsZXhDb250YWluZXIiPgotICAgIDwhLS0gVGhlIGJvcmRlci1ib3ggaGVpZ2h0IDI1
cHggKGNsYW1wZWQgYnkgbWF4LWhlaWdodCkgaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhp
cywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLXdpZHRoOmF1dG8gb2YgMjAwcHgu
IC0tPgorICAgIDwhLS0gVGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIChib3JkZXItYm94KSBp
cyAyMDBweCBiZWNhdXNlIHRoZQorICAgICAgICAgYm9yZGVyLWJveCBoZWlnaHQgMjVweCAoY2xh
bXBlZCBieSBtYXgtaGVpZ2h0KSBpcyB0cmFuc2ZlcnJlZCB0byB0aGUKKyAgICAgICAgIG1haW4g
YXhpcy4gLS0+CiAgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1heC1oZWlnaHQ6IDI1cHg7
IGhlaWdodDogMTAwcHg7IGFzcGVjdC1yYXRpbzogOC8xOyI+PC9kaXY+CiAgIDwvZGl2PgogCkBA
IC01MCwyNSArNjIsMjcgQEAKICAgICAgICBiZWNhdXNlIGl0cyB2YWx1ZSBjb250YWlucyAnYXV0
bycuIC0tPgogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIiBzdHlsZT0id2lkdGg6IGF1dG87
Ij4KICAgICA8IS0tIFRoZSBjb250ZW50LWJveCBoZWlnaHQgMTBweCBpcyB0cmFuc2ZlcnJlZCB0
byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBmbGV4IGJhc2Ug
c2l6ZSBvZiAxOTBweC4gLS0+CisgICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIGZsZXggYmFz
ZSBzaXplIChjb250ZW50LWJveCkgb2YgMTkwcHguIC0tPgogICAgIDxkaXYgY2xhc3M9Iml0ZW0i
IHN0eWxlPSJtaW4td2lkdGg6MDsgaGVpZ2h0OiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMTkv
MTsiPjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAg
ICA8IS0tIFRoZSBjb250ZW50LWJveCBoZWlnaHQgMTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUg
bWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4td2lkdGg6YXV0byBv
ZiAxOTBweC4gLS0+CisgICAgPCEtLSBUaGUgY29udGVudCBzaXplIHN1Z2dlc3Rpb24gKGNvbnRl
bnQtYm94KSBpcyAxOTBweCBiZWNhdXNlIHRoZQorICAgICAgICAgY29udGVudC1ib3ggaGVpZ2h0
IDEwcHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcy4gLS0+CiAgICAgPGRpdiBjbGFz
cz0iaXRlbSIgc3R5bGU9ImhlaWdodDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDE5LzE7Ij48
L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciI+Ci0gICAgPCEt
LSBUaGUgY29udGVudC1ib3ggbWluLWhlaWdodCAxMHB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBt
YWluIGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi13aWR0aDphdXRvIG9m
IDE5MHB4LiAtLT4KKyAgICA8IS0tIFRoZSBjb250ZW50IHNpemUgc3VnZ2VzdGlvbiAoY29udGVu
dC1ib3gpIGlzIDE5MHB4IGJlY2F1c2UgdGhlCisgICAgICAgICBjb250ZW50LWJveCBoZWlnaHQg
MTBweCAoZW5mb3JjZWQgYnkgbWluLWhlaWdodCkgaXMgdHJhbnNmZXJyZWQgdG8gdGhlCisgICAg
ICAgICBtYWluIGF4aXMuIC0tPgogICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4taGVp
Z2h0OiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMTkvMTsiPjwvZGl2PgogICA8L2Rpdj4KIAog
ICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAgICA8IS0tIFRoZSBjb250ZW50LWJveCBo
ZWlnaHQgMTBweCAoY2xhbXBlZCBieSBtYXgtaGVpZ2h0KSBpcyB0cmFuc2ZlcnJlZAotICAgICAg
ICAgdG8gdGhlIG1haW4gYXhpcywgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4td2lkdGg6YXV0byBv
ZiAxOTBweC4gLS0+CisgICAgPCEtLSBUaGUgY29udGVudCBzaXplIHN1Z2dlc3Rpb24gKGNvbnRl
bnQtYm94KSBpcyAxOTBweCBiZWNhdXNlIHRoZQorICAgICAgICAgY29udGVudC1ib3ggaGVpZ2h0
IDEwcHggKGNsYW1wZWQgYnkgbWF4LWhlaWdodCkgaXMgdHJhbnNmZXJyZWQgdG8gdGhlCisgICAg
ICAgICBtYWluIGF4aXMuIC0tPgogICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtYXgtaGVp
Z2h0OiAyNXB4OyBoZWlnaHQ6IDEwMHB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMTkvMTsiPjwvZGl2
PgogICA8L2Rpdj4KIDwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNw
ZWN0LXJhdGlvLTAyNi5odG1sIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2
Lmh0bWwKaW5kZXggYzRhMjUwODE4YmI3Nzg2ZTJmMzk1OTIyZDI4ZTNjNzUxOWI0ZWEzYS4uZmY2
YmYyYWE1NjkwNTUxODA4Yjk4ZTcxMTdlYzY1ZDkxNzhhMzQyNSAxMDA2NDQKLS0tIGEvTGF5b3V0
VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl
Y3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v
ZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwKQEAgLTQsNiArNCw4IEBACiAgIDxsaW5rIHJlbD0i
YXV0aG9yIiB0aXRsZT0iVGluZy1ZdSBMaW4iIGhyZWY9Im1haWx0bzp0bGluQG1vemlsbGEuY29t
Ij4KICAgPGxpbmsgcmVsPSJhdXRob3IiIHRpdGxlPSJNb3ppbGxhIiBocmVmPSJodHRwczovL3d3
dy5tb3ppbGxhLm9yZy8iPgogICA8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHBzOi8vZHJhZnRz
LmNzc3dnLm9yZy9jc3Mtc2l6aW5nLTQvI2FzcGVjdC1yYXRpbyI+CisgIDxsaW5rIHJlbD0iaGVs
cCIgaHJlZj0iaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1zaXppbmctNC8jYXNwZWN0LXJh
dGlvLW1pbmltdW0iPgorICA8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHBzOi8vZHJhZnRzLmNz
c3dnLm9yZy9jc3MtZmxleGJveC0xLyNtaW4tc2l6ZS1hdXRvIj4KICAgPGxpbmsgcmVsPSJtYXRj
aCIgaHJlZj0iLi4vLi4vcmVmZXJlbmNlL3JlZi1maWxsZWQtZ3JlZW4tMjAwcHgtc3F1YXJlLmh0
bWwiIC8+CiAgIDxzdHlsZT4KICAgLmZsZXhDb250YWluZXIgewpAQCAtMTksNjAgKzIxLDc0IEBA
CiAgICAgYm94LXNpemluZzogYm9yZGVyLWJveDsKICAgfQogICAuaXRlbSA+IGRpdiB7Ci0gICAg
aGVpZ2h0OiA1MDBweDsgLyogU2V0IGEgbGFyZ2UgY29udGVudCBzaXplIHN1Z2dlc3Rpb24gZm9y
IGZsZXggaXRlbS4gKi8KKyAgICBoZWlnaHQ6IDE5MHB4OyAvKiBTZXQgdGhlIGNvbnRlbnQgc2l6
ZSBzdWdnZXN0aW9uIGZvciBmbGV4IGl0ZW0uICovCiAgIH0KICAgPC9zdHlsZT4KIAogICA8cD5U
ZXN0IHBhc3NlcyBpZiB0aGVyZSBpcyBhIGZpbGxlZCBncmVlbiBzcXVhcmUgYW5kIDxzdHJvbmc+
bm8gcmVkPC9zdHJvbmc+LjwvcD4KIAorICA8IS0tIEluIGFsbCBvZiB0aGUgc3VidGVzdHMgaGVy
ZSwgZWFjaCBmbGV4IGl0ZW0ncyBhdXRvbWF0aWMgbWluaW11bSBoZWlnaHQgaXMKKyAgICAgICBy
ZXNvbHZlZCBkaXJlY3RseSBmcm9tIGl0cyBjb250ZW50IHNpemUgc3VnZ2VzdGlvbi4gTm90YWJs
eSwgdGhlc2UgaXRlbXMKKyAgICAgICAqZG8gbm90KiBnZXQgYSAidHJhbnNmZXJyZWQgc2l6ZSBz
dWdnZXN0aW9uIiwgYmVjYXVzZSB0aGV5IGFyZSBhbGwKKyAgICAgICAqbm9uLXJlcGxhY2VkKiBl
bGVtZW50czsgYW5kICJ0cmFuc2ZlcnJlZCBzaXplIHN1Z2dlc3Rpb24iIGlzIG9ubHkgdXNlZAor
ICAgICAgIGZvciByZXNvbHZpbmcgYXV0b21hdGljIG1pbmltdW0gc2l6ZXMgb24gKnJlcGxhY2Vk
KiBlbGVtZW50cy4gSG93ZXZlciwKKyAgICAgICBub3RlIHRoYXQgd2UgZG8gInRyYW5zZmVyIiBz
aXplcyB0aHJvdWdoIHRoZSBhc3BlY3QgcmF0aW8sIGFzIHBhcnQgb2YKKyAgICAgICBjb21wdXRp
bmcgdGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIGFuZC9vciBmbGV4IGJhc2Ugc2l6ZS4gLS0+
CisKICAgPCEtLSBJbiB0aGUgZm9sbG93aW5nIGZvdXIgZmxleCBjb250YWluZXJzLCB0aGUgYXNw
ZWN0LXJhdGlvIHdvcmtzIHdpdGggYm9yZGVyLWJveC4gLS0+CiAgIDxkaXYgY2xhc3M9ImZsZXhD
b250YWluZXIiIHN0eWxlPSJoZWlnaHQ6IGF1dG87Ij4KICAgICA8IS0tIFRoZSBib3JkZXItYm94
IHdpZHRoIDI1cHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlp
ZWxkaW5nIGEgcmVzb2x2ZWQgZmxleCBiYXNlIHNpemUgb2YgMjAwcHguIC0tPgorICAgICAgICAg
eWllbGRpbmcgYSByZXNvbHZlZCBmbGV4IGJhc2Ugc2l6ZSAoYm9yZGVyLWJveCkgb2YgMjAwcHgu
IC0tPgogICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4taGVpZ2h0OjA7IHdpZHRoOiAy
NXB4OyBhc3BlY3QtcmF0aW86IDEvODsiPjxkaXY+PC9kaXY+PC9kaXY+CiAgIDwvZGl2PgogCiAg
IDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgotICAgIDwhLS0gVGhlIGJvcmRlci1ib3ggd2lk
dGggMjVweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRp
bmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8gb2YgMjAwcHguIC0tPgotICAgIDxkaXYgY2xh
c3M9Iml0ZW0iIHN0eWxlPSJ3aWR0aDogMjVweDsgYXNwZWN0LXJhdGlvOiAxLzg7Ij48ZGl2Pjwv
ZGl2PjwvZGl2PgorICAgIDwhLS0gVGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIGlzIDE5MHB4
LCBpLmUuIHRoZSBoZWlnaHQgb2YgdGhlIGl0ZW0ncworICAgICAgICAgY2hpbGQgZGl2LiAtLT4K
KyAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0id2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzog
MS8xOyI+PGRpdj48L2Rpdj48L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRpdiBjbGFzcz0iZmxleENv
bnRhaW5lciI+Ci0gICAgPCEtLSBUaGUgYm9yZGVyLWJveCBtaW4td2lkdGggMjVweCBpcyB0cmFu
c2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBt
aW4taGVpZ2h0OmF1dG8gb2YgMjAwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxl
PSJtaW4td2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogMS84OyI+PGRpdj48L2Rpdj48L2Rpdj4K
KyAgICA8IS0tIFRoZSBjb250ZW50IHNpemUgc3VnZ2VzdGlvbiBpcyAxOTBweCwgaS5lLiB0aGUg
aGVpZ2h0IG9mIHRoZSBpdGVtJ3MKKyAgICAgICAgIGNoaWxkIGRpdi4gLS0+CisgICAgPGRpdiBj
bGFzcz0iaXRlbSIgc3R5bGU9Im1pbi13aWR0aDogMjVweDsgYXNwZWN0LXJhdGlvOiAxLzE7Ij48
ZGl2PjwvZGl2PjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVy
Ij4KLSAgICA8IS0tIFRoZSBib3JkZXItYm94IHdpZHRoIDI1cHggKGNsYW1wZWQgYnkgbWF4LXdp
ZHRoKSBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcg
YSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8gb2YgMjAwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9
Iml0ZW0iIHN0eWxlPSJtYXgtd2lkdGg6IDI1cHg7IHdpZHRoOiAxMDBweDsgYXNwZWN0LXJhdGlv
OiAxLzg7Ij48ZGl2PjwvZGl2PjwvZGl2PgorICAgIDwhLS0gVGhlIGNvbnRlbnQgc2l6ZSBzdWdn
ZXN0aW9uIGlzIDIwMHB4IGJlY2F1c2UgdGhlIGJvcmRlci1ib3ggbWF4LXdpZHRoCisgICAgICAg
ICAyNXB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMgYXMgdGhlIHVwcGVyIGJvdW5k
IG9mIGl0cworICAgICAgICAgYm9yZGVyLWJveCBoZWlnaHQuIC0tPgorICAgIDxkaXYgY2xhc3M9
Iml0ZW0iIHN0eWxlPSJtYXgtd2lkdGg6IDI1cHg7IHdpZHRoOiAxMDBweDsgYXNwZWN0LXJhdGlv
OiAxLzg7Ij4KKyAgICAgIDxkaXYgc3R5bGU9ImhlaWdodDogNTAwcHgiPjwvZGl2PgorICAgIDwv
ZGl2PgogICA8L2Rpdj4KIAogICA8IS0tIEluIHRoZSBmb2xsb3dpbmcgZm91ciBmbGV4IGNvbnRh
aW5lcnMsIHRoZSBhc3BlY3QtcmF0aW8gd29ya3Mgd2l0aCBjb250ZW50LWJveAogICAgICAgIGJl
Y2F1c2UgaXRzIHZhbHVlIGNvbnRhaW5zICdhdXRvJy4gLS0+CiAgIDxkaXYgY2xhc3M9ImZsZXhD
b250YWluZXIiIHN0eWxlPSJoZWlnaHQ6IGF1dG87Ij4KICAgICA8IS0tIFRoZSBjb250ZW50LWJv
eCB3aWR0aCAxMHB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMsCi0gICAgICAgICB5
aWVsZGluZyBhIHJlc29sdmVkIGZsZXggYmFzZSBzaXplIG9mIDE5MHB4LiAtLT4KKyAgICAgICAg
IHlpZWxkaW5nIGEgcmVzb2x2ZWQgZmxleCBiYXNlIHNpemUgKGNvbnRlbnQtYm94KSBvZiAxOTBw
eC4gLS0+CiAgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi1oZWlnaHQ6MDsgd2lkdGg6
IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE5OyI+PGRpdj48L2Rpdj48L2Rpdj4KICAgPC9k
aXY+CiAKICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciI+Ci0gICAgPCEtLSBUaGUgY29udGVu
dC1ib3ggd2lkdGggMTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAg
ICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8gb2YgMTkwcHguIC0tPgotICAg
IDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJ3aWR0aDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRv
IDEvMTk7Ij48ZGl2PjwvZGl2PjwvZGl2PgorICAgIDwhLS0gVGhlIGNvbnRlbnQgc2l6ZSBzdWdn
ZXN0aW9uIGlzIDE5MHB4LCBpLmUuIHRoZSBoZWlnaHQgb2YgdGhlIGl0ZW0ncworICAgICAgICAg
Y2hpbGQgZGl2LiAtLT4KKyAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0id2lkdGg6IDI1cHg7
IGFzcGVjdC1yYXRpbzogYXV0byAxLzE7Ij48ZGl2PjwvZGl2PjwvZGl2PgogICA8L2Rpdj4KIAog
ICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAgICA8IS0tIFRoZSBjb250ZW50LWJveCBt
aW4td2lkdGggMTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAg
eWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8gb2YgMTkwcHguIC0tPgotICAgIDxk
aXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4td2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0
byAxLzE5OyI+PGRpdj48L2Rpdj48L2Rpdj4KKyAgICA8IS0tIFRoZSBjb250ZW50IHNpemUgc3Vn
Z2VzdGlvbiBpcyAxOTBweCwgaS5lLiB0aGUgaGVpZ2h0IG9mIHRoZSBpdGVtJ3MKKyAgICAgICAg
IGNoaWxkIGRpdi4gLS0+CisgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi13aWR0aDog
MjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEvMTsiPjxkaXY+PC9kaXY+PC9kaXY+CiAgIDwvZGl2
PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgotICAgIDwhLS0gVGhlIGNvbnRlbnQt
Ym94IHdpZHRoIDEwcHggKGNsYW1wZWQgYnkgbWF4LXdpZHRoKSBpcyB0cmFuc2ZlcnJlZCB0byB0
aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1
dG8gb2YgMTkwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtYXgtd2lkdGg6
IDI1cHg7IHdpZHRoOiAxMDBweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEvMTk7Ij48ZGl2PjwvZGl2
PjwvZGl2PgorICAgIDwhLS0gVGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIGlzIDE5MHB4IGJl
Y2F1c2UgdGhlIGNvbnRlbnQtYm94IG1heC13aWR0aAorICAgICAgICAgMTBweCBpcyB0cmFuc2Zl
cnJlZCB0byB0aGUgbWFpbiBheGlzIGFzIHRoZSB1cHBlciBib3VuZCBvZiBpdHMKKyAgICAgICAg
IGNvbnRlbnQtYm94IGhlaWdodC4tLT4KKyAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWF4
LXdpZHRoOiAyNXB4OyB3aWR0aDogMTAwcHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE5OyI+Cisg
ICAgICA8ZGl2IHN0eWxlPSJoZWlnaHQ6IDUwMHB4Ij48L2Rpdj4KKyAgICA8L2Rpdj4KICAgPC9k
aXY+CiA8L2h0bWw+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>432574</attachid>
            <date>2021-06-30 01:36:41 -0700</date>
            <delta_ts>2021-06-30 08:31:28 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210630093639.patch</filename>
            <type>text/plain</type>
            <size>20375</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MzcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmRiZGJmZmY3NjhjMTVh
OWJhM2MwOGE2YWQwNDdhZmEyZGFjNDE2OS4uZDFjNWVjODZkNGZiNmI1ZDljZjAwYjAwNzliYTM3
MzQ3M2M4NDliMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA2LTI5ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBNYWtlIGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nIHRha2UgaW50byBh
Y2NvdW50CisgICAgICAgIGJveC1zaXppbmcgZm9yIHRoZSBjYXNlIHdoZXJlIENTUyBhc3BlY3Qt
cmF0aW8gaXMgYXBwbGllZC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRo
VXNpbmcgY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6
CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJv
bUFzcGVjdFJhdGlvVXNpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGli
bGVCb3g6OmNvbXB1dGVGbGV4SXRlbU1pbk1heFNpemVzKToKKwogMjAyMS0wNi0yOSAgUm9iIEJ1
aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIENyYXNoIGluIFNoYXJlZEJ1ZmZlcjo6
ZGF0YQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAg
Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCBjYTVhNmMzMzQ4
ODk5MmFkZDQ2MjEwYzdmYTcxYjk4YjA2N2QzZDg3Li5mZjk2MTcyMzAxYTY4ZjBlNmVkMjgxYTdi
OGJjZjNkNmIwY2RhMDhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu
ZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApA
QCAtMjY5MSw5ICsyNjkxLDEwIEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlSW50cmlu
c2ljTG9naWNhbFdpZHRoVXNpbmcoTGVuZ3RoIGxvZ2ljYWxXaWR0aExlbmd0CiAKICAgICBMYXlv
dXRVbml0IG1pbkxvZ2ljYWxXaWR0aDsKICAgICBMYXlvdXRVbml0IG1heExvZ2ljYWxXaWR0aDsK
LSAgICBpZiAoIWxvZ2ljYWxXaWR0aExlbmd0aC5pc01pbkludHJpbnNpYygpICYmIHNob3VsZENv
bXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSkKKyAgICBpZiAoIWxvZ2ljYWxXaWR0
aExlbmd0aC5pc01pbkludHJpbnNpYygpICYmIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9t
QXNwZWN0UmF0aW8oKSkgewogICAgICAgICBtaW5Mb2dpY2FsV2lkdGggPSBtYXhMb2dpY2FsV2lk
dGggPSBjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCk7Ci0gICAgZWxzZQorICAg
ICAgICBib3JkZXJBbmRQYWRkaW5nID0gTGF5b3V0VW5pdCgpOworICAgIH0gZWxzZQogICAgICAg
ICBjb21wdXRlSW50cmluc2ljS2V5d29yZExvZ2ljYWxXaWR0aHMobWluTG9naWNhbFdpZHRoLCBt
YXhMb2dpY2FsV2lkdGgpOwogCiAgICAgaWYgKGxvZ2ljYWxXaWR0aExlbmd0aC5pc01pbkNvbnRl
bnQoKSB8fCBsb2dpY2FsV2lkdGhMZW5ndGguaXNNaW5JbnRyaW5zaWMoKSkKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2Uv
V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4IDJlN2M3NjRkNzcz
ZTZhOWUxMGZkYjA1OWZjNGM2YjA4ZjIwNTRmNzMuLjhkNmEwNjliMTdjZDVlYmRjMWVmMjA5NWVj
YjdlY2Q2ZTFkOWI0OWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k
ZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZs
ZXhpYmxlQm94LmNwcApAQCAtODY1LDkgKzg2NSw3IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGli
bGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJv
CiB7CiAgICAgQVNTRVJUKGNoaWxkSGFzQXNwZWN0UmF0aW8oY2hpbGQpKTsKIAotICAgIGF1dG8g
YWRqdXN0Rm9yQm94U2l6aW5nID0gW3RoaXNdIChjb25zdCBSZW5kZXJCb3gmIGJveCwgTGVuZ3Ro
IGxlbmd0aCkgLT4gTGF5b3V0VW5pdCB7Ci0gICAgICAgIEFTU0VSVChsZW5ndGguaXNGaXhlZCgp
KTsKLSAgICAgICAgYXV0byB2YWx1ZSA9IExheW91dFVuaXQobGVuZ3RoLnZhbHVlKCkpOworICAg
IGF1dG8gYWRqdXN0Rm9yQm94U2l6aW5nID0gW3RoaXNdIChjb25zdCBSZW5kZXJCb3gmIGJveCwg
TGF5b3V0VW5pdCB2YWx1ZSkgLT4gTGF5b3V0VW5pdCB7CiAgICAgICAgIC8vIFdlIG5lZWQgdG8g
c3Vic3RyYWN0IHRoZSBib3JkZXIgYW5kIHBhZGRpbmcgZXh0ZW50IGZyb20gdGhlIGNyb3NzIGF4
aXMuCiAgICAgICAgIC8vIEZ1cnRoZXJtb3JlLCB0aGUgc2l6aW5nIGNhbGN1bGF0aW9ucyB0aGF0
IGZsb29yIHRoZSBjb250ZW50IGJveCBzaXplIGF0IHplcm8gd2hlbiBhcHBseWluZyBib3gtc2l6
aW5nIGFyZSBhbHNvIGlnbm9yZWQuCiAgICAgICAgIC8vIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9y
Zy9jc3MtZmxleGJveC8jYWxnby1tYWluLWl0ZW0uCkBAIC04NzYsMjkgKzg3NCwzOCBAQCBMYXlv
dXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9V
c2luZyhjb25zdCBSZW5kZXJCbwogICAgICAgICByZXR1cm4gdmFsdWU7CiAgICAgfTsKIAotICAg
IHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gY3Jvc3NTaXplOworICAgIC8vIGNyb3NzU2l6ZSBp
cyBib3JkZXItYm94IHNpemUgaWYgYm94LXNpemluZyBpcyBib3JkZXItYm94LCBhbmQKKyAgICAv
LyBjb250ZW50LWJveCBvdGhlcndpc2UuCisgICAgTGF5b3V0VW5pdCBjcm9zc1NpemU7CiAgICAg
aWYgKGNyb3NzU2l6ZUxlbmd0aC5pc0ZpeGVkKCkpCi0gICAgICAgIGNyb3NzU2l6ZSA9IGFkanVz
dEZvckJveFNpemluZyhjaGlsZCwgY3Jvc3NTaXplTGVuZ3RoKTsKKyAgICAgICAgY3Jvc3NTaXpl
ID0gTGF5b3V0VW5pdChjcm9zc1NpemVMZW5ndGgudmFsdWUoKSk7CiAgICAgZWxzZSBpZiAoY3Jv
c3NTaXplTGVuZ3RoLmlzQXV0bygpKQogICAgICAgICBjcm9zc1NpemUgPSBjb21wdXRlQ3Jvc3NT
aXplRm9yQ2hpbGRVc2luZ0NvbnRhaW5lckNyb3NzU2l6ZShjaGlsZCk7CiAgICAgZWxzZSB7CiAg
ICAgICAgIEFTU0VSVChjcm9zc1NpemVMZW5ndGguaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkpOwot
ICAgICAgICBjcm9zc1NpemUgPSBtYWluQXhpc0lzQ2hpbGRJbmxpbmVBeGlzKGNoaWxkKSA/IGNo
aWxkLmNvbXB1dGVQZXJjZW50YWdlTG9naWNhbEhlaWdodChjcm9zc1NpemVMZW5ndGgpIDogYWRq
dXN0Qm9yZGVyQm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKHZhbHVlRm9yTGVuZ3RoKGNyb3Nz
U2l6ZUxlbmd0aCwgY29udGVudFdpZHRoKCkpLCBjcm9zc1NpemVMZW5ndGgudHlwZSgpKTsKLSAg
ICAgICAgaWYgKCFjcm9zc1NpemUpCisgICAgICAgIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4g
Y2hpbGRTaXplID0gbWFpbkF4aXNJc0NoaWxkSW5saW5lQXhpcyhjaGlsZCkgPyBjaGlsZC5jb21w
dXRlUGVyY2VudGFnZUxvZ2ljYWxIZWlnaHQoY3Jvc3NTaXplTGVuZ3RoKSA6IGFkanVzdEJvcmRl
ckJveExvZ2ljYWxXaWR0aEZvckJveFNpemluZyh2YWx1ZUZvckxlbmd0aChjcm9zc1NpemVMZW5n
dGgsIGNvbnRlbnRXaWR0aCgpKSwgY3Jvc3NTaXplTGVuZ3RoLnR5cGUoKSk7CisgICAgICAgIGlm
ICghY2hpbGRTaXplKQogICAgICAgICAgICAgcmV0dXJuIDBfbHU7CisgICAgICAgIGNyb3NzU2l6
ZSA9IGNoaWxkU2l6ZS52YWx1ZSgpOwogICAgIH0KIAogICAgIGNvbnN0IExheW91dFNpemUmIGNo
aWxkSW50cmluc2ljU2l6ZSA9IGNoaWxkLmludHJpbnNpY1NpemUoKTsKICAgICBkb3VibGUgcmF0
aW87Ci0gICAgaWYgKGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0
aW9UeXBlOjpSYXRpbyB8fCAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3Bl
Y3RSYXRpb1R5cGU6OkF1dG9BbmRSYXRpbyAmJiBjaGlsZEludHJpbnNpY1NpemUuaXNFbXB0eSgp
KSkKKyAgICBMYXlvdXRVbml0IGJvcmRlckFuZFBhZGRpbmc7CisgICAgaWYgKGNoaWxkLnN0eWxl
KCkuYXNwZWN0UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpSYXRpbyB8fCAoY2hpbGQu
c3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OkF1dG9BbmRSYXRp
byAmJiBjaGlsZEludHJpbnNpY1NpemUuaXNFbXB0eSgpKSkgewogICAgICAgICByYXRpbyA9IGNo
aWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9XaWR0aCgpIC8gY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRp
b0hlaWdodCgpOwotICAgIGVsc2UgeworICAgICAgICBpZiAoY2hpbGQuc3R5bGUoKS5ib3hTaXpp
bmdGb3JBc3BlY3RSYXRpbygpID09IEJveFNpemluZzo6Q29udGVudEJveCkKKyAgICAgICAgICAg
IGNyb3NzU2l6ZSAtPSBpc0hvcml6b250YWxGbG93KCkgPyBjaGlsZC52ZXJ0aWNhbEJvcmRlckFu
ZFBhZGRpbmdFeHRlbnQoKSA6IGNoaWxkLmhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50
KCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGJvcmRlckFuZFBhZGRpbmcgPSBpc0hvcml6
b250YWxGbG93KCkgPyBjaGlsZC5ob3Jpem9udGFsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpIDog
Y2hpbGQudmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCk7CisgICAgfSBlbHNlIHsKICAg
ICAgICAgQVNTRVJUKGNoaWxkSW50cmluc2ljU2l6ZS5oZWlnaHQoKSk7CiAgICAgICAgIHJhdGlv
ID0gY2hpbGRJbnRyaW5zaWNTaXplLndpZHRoKCkudG9GbG9hdCgpIC8gY2hpbGRJbnRyaW5zaWNT
aXplLmhlaWdodCgpLnRvRmxvYXQoKTsKKyAgICAgICAgY3Jvc3NTaXplID0gYWRqdXN0Rm9yQm94
U2l6aW5nKGNoaWxkLCBjcm9zc1NpemUpOwogICAgIH0KICAgICBpZiAoaXNIb3Jpem9udGFsRmxv
dygpKQotICAgICAgICByZXR1cm4gTGF5b3V0VW5pdChjcm9zc1NpemUudmFsdWUoKSAqIHJhdGlv
KTsKLSAgICByZXR1cm4gTGF5b3V0VW5pdChjcm9zc1NpemUudmFsdWUoKSAvIHJhdGlvKTsKKyAg
ICAgICAgcmV0dXJuIExheW91dFVuaXQoY3Jvc3NTaXplICogcmF0aW8pIC0gYm9yZGVyQW5kUGFk
ZGluZzsKKyAgICByZXR1cm4gTGF5b3V0VW5pdChjcm9zc1NpemUgLyByYXRpbykgLSBib3JkZXJB
bmRQYWRkaW5nOwogfQogCiB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpzZXRGbG93QXdhcmVMb2Nh
dGlvbkZvckNoaWxkKFJlbmRlckJveCYgY2hpbGQsIGNvbnN0IExheW91dFBvaW50JiBsb2NhdGlv
bikKQEAgLTEwMjcsNiArMTAzNCw4IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNv
bXB1dGVJbm5lckZsZXhCYXNlU2l6ZUZvckNoaWxkKFJlbmRlckJveCYgY2hpbGQsCiAgICAgICAg
IC8vIHdpZHRoIGluY2x1ZGVzIHRoZSBzY3JvbGxiYXIsIGV2ZW4gZm9yIG92ZXJmbG93OiBhdXRv
LgogICAgICAgICBtYWluQXhpc0V4dGVudCA9IGNoaWxkLm1heFByZWZlcnJlZExvZ2ljYWxXaWR0
aCgpOwogICAgIH0KKyAgICBpZiAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBB
c3BlY3RSYXRpb1R5cGU6OkF1dG9BbmRSYXRpbykKKyAgICAgICAgcmV0dXJuIG1haW5BeGlzRXh0
ZW50ICsgbWFpbkF4aXNCb3JkZXJBbmRQYWRkaW5nOwogICAgIHJldHVybiBtYWluQXhpc0V4dGVu
dCAtIG1haW5BeGlzQm9yZGVyQW5kUGFkZGluZzsKIH0KIApAQCAtMTI3MSw2ICsxMjgwLDExIEBA
IHN0ZDo6cGFpcjxMYXlvdXRVbml0LCBMYXlvdXRVbml0PiBSZW5kZXJGbGV4aWJsZUJveDo6Y29t
cHV0ZUZsZXhJdGVtTWluTWF4U2l6ZXMoCiAgICAgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiBt
YXhFeHRlbnQgPSBzdGQ6Om51bGxvcHQ7CiAgICAgaWYgKG1heC5pc1NwZWNpZmllZE9ySW50cmlu
c2ljKCkpCiAgICAgICAgIG1heEV4dGVudCA9IGNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxk
KGNoaWxkLCBNYXhTaXplLCBtYXgpOworICAgIGVsc2UgaWYgKGNoaWxkLnN0eWxlKCkuaGFzQXNw
ZWN0UmF0aW8oKSkgeworICAgICAgICBtYXggPSBjcm9zc1NpemVMZW5ndGhGb3JDaGlsZChNYXhT
aXplLCBjaGlsZCk7CisgICAgICAgIGlmIChtYXguaXNTcGVjaWZpZWRPckludHJpbnNpYygpKQor
ICAgICAgICAgICAgbWF4RXh0ZW50ID0gY29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNp
bmcoY2hpbGQsIG1heCk7CisgICAgfQogCiAgICAgTGVuZ3RoIG1pbiA9IG1haW5TaXplTGVuZ3Ro
Rm9yQ2hpbGQoTWluU2l6ZSwgY2hpbGQpOwogICAgIC8vIEludHJpbnNpYyBzaXplcyBpbiBjaGls
ZCdzIGJsb2NrIGF4aXMgYXJlIGhhbmRsZWQgYnkgdGhlIG1pbi1zaXplOmF1dG8gY29kZSBwYXRo
LgpAQCAtMTQxNyw3ICsxNDMxLDggQEAgRmxleEl0ZW0gUmVuZGVyRmxleGlibGVCb3g6OmNvbnN0
cnVjdEZsZXhJdGVtKFJlbmRlckJveCYgY2hpbGQsIGJvb2wgcmVsYXlvdXRDaGkKICAgICBMYXlv
dXRVbml0IGNoaWxkSW5uZXJGbGV4QmFzZVNpemU7CiAgICAgewogICAgICAgICBTY29wZWRVbmJv
dW5kZWRCb3ggdW5ib3VuZGVkKGNoaWxkLCBtYWluQXhpc0lzQ2hpbGRJbmxpbmVBeGlzKGNoaWxk
KSk7Ci0gICAgICAgIGNoaWxkLmNsZWFyT3ZlcnJpZGluZ0NvbnRlbnRTaXplKCk7CisgICAgICAg
IGlmICghY2hpbGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKQorICAgICAgICAgICAgY2hpbGQu
Y2xlYXJPdmVycmlkaW5nQ29udGVudFNpemUoKTsKICAgICAgICAgaWYgKGNoaWxkSGFzSW50cmlu
c2ljTWFpbkF4aXNTaXplKGNoaWxkKSkgewogICAgICAgICAgICAgLy8gSWYgdGhpcyBjb25kaXRp
b24gaXMgdHJ1ZSwgdGhlbiBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZCB3aWxsIGNhbGwK
ICAgICAgICAgICAgIC8vIGNoaWxkLmludHJpbnNpY0NvbnRlbnRMb2dpY2FsSGVpZ2h0KCkgYW5k
IGNoaWxkLnNjcm9sbGJhckxvZ2ljYWxIZWlnaHQoKSwKQEAgLTE0NDEsNyArMTQ1Niw3IEBAIEZs
ZXhJdGVtIFJlbmRlckZsZXhpYmxlQm94Ojpjb25zdHJ1Y3RGbGV4SXRlbShSZW5kZXJCb3gmIGNo
aWxkLCBib29sIHJlbGF5b3V0Q2hpCiAgICAgICAgIH0KICAgICAgICAgY2hpbGRJbm5lckZsZXhC
YXNlU2l6ZSA9IGNvbXB1dGVJbm5lckZsZXhCYXNlU2l6ZUZvckNoaWxkKGNoaWxkLCBib3JkZXJB
bmRQYWRkaW5nKTsKICAgICB9Ci0gICAgCisKICAgICBMYXlvdXRVbml0IG1hcmdpbiA9IGlzSG9y
aXpvbnRhbEZsb3coKSA/IGNoaWxkLmhvcml6b250YWxNYXJnaW5FeHRlbnQoKSA6IGNoaWxkLnZl
cnRpY2FsTWFyZ2luRXh0ZW50KCk7CiAgICAgcmV0dXJuIEZsZXhJdGVtKGNoaWxkLCBjaGlsZElu
bmVyRmxleEJhc2VTaXplLCBib3JkZXJBbmRQYWRkaW5nLCBtYXJnaW4sIGNvbXB1dGVGbGV4SXRl
bU1pbk1heFNpemVzKGNoaWxkKSwgY2hpbGRIYWRMYXlvdXQpOwogfQpkaWZmIC0tZ2l0IGEvTGF5
b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGQxYzUxYjRi
NTQ2NjFkMTBjNDE5ZTdhMmNmZDZjNzg4OTkzNTZjZDMuLjRhMDY4ODhhOGIzNWI3MTVkMjcyMTRj
NDVjMGY1YjU5NWI5ZjcwMDAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysg
Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMS0wNi0yOSAgUm9i
IEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIEZpeCBmbGV4LWFzcGVjdC1yYXRp
by0wMjUrMjYuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MjIyMzU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTA2LTI5ICBSb2IgQnVpcyAgPHJidWlz
QGlnYWxpYS5jb20+CiAKICAgICAgICAgQ3Jhc2ggaW4gU2hhcmVkQnVmZmVyOjpkYXRhCmRpZmYg
LS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMv
aW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwppbmRleCA3NTlmZmNmYTllZmJiMmM5ZjY3ZjU4ZjQ0ZTM2
MDIzNDI1ODAyMDU5Li4yNTBmMzY3MWFiYmFkMWQyODUzZTM3YTUzMzA3ZmVkMjkwZTE5NjU0IDEw
MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91
dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMS0wNi0y
OSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIEZpeCBmbGV4LWFzcGVj
dC1yYXRpby0wMjUrMjYuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjIyMzU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgSW1wb3J0IHVwZGF0ZWQgV1BUIHRlc3RzLgorCisgICAgICAgICogd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRp
by0wMjUuaHRtbDoKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv
YXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sOgorCiAyMDIxLTA2LTI5ICBN
YXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBDU1Mgc2Ny
b2xsIHNuYXAgc2hvdWxkIGFsbG93IHNjcm9sbGluZyB0byB0aGUgbWlkZGxlIG9mIHNuYXAgYXJl
YXMgdGhhdCBvdmVyZmxvdyB0aGUgc25hcHBvcnQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rl
c3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDI5ZjQ0
N2FmMjY0YTM0ZDBiYjU5MWNlMmYwMDM4ODAxYmZjMTY3MjQuLjRlMzk4YjRiNGRiNjhmYzcyYjAw
MTM0YzcwYTc5ZWI2ZGU2OGY3MDQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3Rh
dGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDU2Nyw4ICs0NTY3
LDYgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby8KICMgZmxleC1iYXNpczpjb250ZW50CiB3ZWJr
aXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z
aXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMS5odG1sIFsgSW1hZ2VPbmx5
RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMi5o
dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNw
ZWN0LXJhdGlvLTAyNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0
NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0
LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3
ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxOC5odG1sIFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAx
OS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQt
YXNwZWN0LXJhdGlvLTAyMC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCmRpZmYgLS1naXQgYS9M
YXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n
L2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbCBiL0xheW91dFRlc3RzL2lt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv
L2ZsZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1sCmluZGV4IGM0ZmY4MTEwZDdiZWQ3MDc5Yzg2NGRk
ZjE5MmY4MjQyOTMyZTU4OGQuLmJmOGRhYWEzNWYwOGE0MTI4MjJkZDQxZTc0OTkwMjVlNDA2NWUy
ODQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1s
CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1sCkBAIC00LDYg
KzQsOCBAQAogICA8bGluayByZWw9ImF1dGhvciIgdGl0bGU9IlRpbmctWXUgTGluIiBocmVmPSJt
YWlsdG86dGxpbkBtb3ppbGxhLmNvbSI+CiAgIDxsaW5rIHJlbD0iYXV0aG9yIiB0aXRsZT0iTW96
aWxsYSIgaHJlZj0iaHR0cHM6Ly93d3cubW96aWxsYS5vcmcvIj4KICAgPGxpbmsgcmVsPSJoZWxw
IiBocmVmPSJodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLXNpemluZy00LyNhc3BlY3QtcmF0
aW8iPgorICA8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9j
c3Mtc2l6aW5nLTQvI2FzcGVjdC1yYXRpby1taW5pbXVtIj4KKyAgPGxpbmsgcmVsPSJoZWxwIiBo
cmVmPSJodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLWZsZXhib3gtMS8jbWluLXNpemUtYXV0
byI+CiAgIDxsaW5rIHJlbD0ibWF0Y2giIGhyZWY9Ii4uLy4uL3JlZmVyZW5jZS9yZWYtZmlsbGVk
LWdyZWVuLTIwMHB4LXNxdWFyZS5odG1sIiAvPgogICA8c3R5bGU+CiAgIC5mbGV4Q29udGFpbmVy
IHsKQEAgLTIxLDI4ICsyMywzOCBAQAogCiAgIDxwPlRlc3QgcGFzc2VzIGlmIHRoZXJlIGlzIGEg
ZmlsbGVkIGdyZWVuIHNxdWFyZSBhbmQgPHN0cm9uZz5ubyByZWQ8L3N0cm9uZz4uPC9wPgogCisg
IDwhLS0gSW4gYWxsIG9mIHRoZSBzdWJ0ZXN0cyBoZXJlLCBlYWNoIGZsZXggaXRlbSdzIGF1dG9t
YXRpYyBtaW5pbXVtIHdpZHRoIGlzCisgICAgICAgcmVzb2x2ZWQgZGlyZWN0bHkgZnJvbSBpdHMg
Y29udGVudCBzaXplIHN1Z2dlc3Rpb24uIE5vdGFibHksIHRoZXNlIGl0ZW1zCisgICAgICAgKmRv
IG5vdCogZ2V0IGEgInRyYW5zZmVycmVkIHNpemUgc3VnZ2VzdGlvbiIsIGJlY2F1c2UgdGhleSBh
cmUgYWxsCisgICAgICAgKm5vbi1yZXBsYWNlZCogZWxlbWVudHM7IGFuZCAidHJhbnNmZXJyZWQg
c2l6ZSBzdWdnZXN0aW9uIiBpcyBvbmx5IHVzZWQKKyAgICAgICBmb3IgcmVzb2x2aW5nIGF1dG9t
YXRpYyBtaW5pbXVtIHNpemVzIG9uICpyZXBsYWNlZCogZWxlbWVudHMuIEhvd2V2ZXIsCisgICAg
ICAgbm90ZSB0aGF0IHdlIGRvICJ0cmFuc2ZlciIgc2l6ZXMgdGhyb3VnaCB0aGUgYXNwZWN0IHJh
dGlvLCBhcyBwYXJ0IG9mCisgICAgICAgY29tcHV0aW5nIHRoZSBjb250ZW50IHNpemUgc3VnZ2Vz
dGlvbiBhbmQvb3IgZmxleCBiYXNlIHNpemUuIC0tPgorCiAgIDwhLS0gSW4gdGhlIGZvbGxvd2lu
ZyBmb3VyIGZsZXggY29udGFpbmVycywgdGhlIGFzcGVjdC1yYXRpbyB3b3JrcyB3aXRoIGJvcmRl
ci1ib3guIC0tPgogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIiBzdHlsZT0id2lkdGg6IGF1
dG87Ij4KICAgICA8IS0tIFRoZSBib3JkZXItYm94IGhlaWdodCAyNXB4IGlzIHRyYW5zZmVycmVk
IHRvIHRoZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIGZsZXggYmFz
ZSBzaXplIG9mIDIwMHB4LiAtLT4KKyAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgZmxleCBi
YXNlIHNpemUgKGJvcmRlci1ib3gpIG9mIDIwMHB4LiAtLT4KICAgICA8ZGl2IGNsYXNzPSJpdGVt
IiBzdHlsZT0ibWluLXdpZHRoOjA7IGhlaWdodDogMjVweDsgYXNwZWN0LXJhdGlvOiA4LzE7Ij48
L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciI+Ci0gICAgPCEt
LSBUaGUgYm9yZGVyLWJveCBoZWlnaHQgMjVweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBh
eGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4td2lkdGg6YXV0byBvZiAyMDBw
eC4gLS0+CisgICAgPCEtLSBUaGUgY29udGVudCBzaXplIHN1Z2dlc3Rpb24gKGJvcmRlci1ib3gp
IGlzIDIwMHB4IGJlY2F1c2UgdGhlCisgICAgICAgICBib3JkZXItYm94IGhlaWdodCAyNXB4IGlz
IHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMuIC0tPgogICAgIDxkaXYgY2xhc3M9Iml0ZW0i
IHN0eWxlPSJoZWlnaHQ6IDI1cHg7IGFzcGVjdC1yYXRpbzogOC8xOyI+PC9kaXY+CiAgIDwvZGl2
PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgotICAgIDwhLS0gVGhlIGJvcmRlci1i
b3ggbWluLWhlaWdodCAyNXB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMsCi0gICAg
ICAgICB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi13aWR0aDphdXRvIG9mIDIwMHB4LiAtLT4KKyAg
ICA8IS0tIFRoZSBjb250ZW50IHNpemUgc3VnZ2VzdGlvbiAoYm9yZGVyLWJveCkgaXMgMjAwcHgg
YmVjYXVzZSB0aGUKKyAgICAgICAgIGJvcmRlci1ib3ggaGVpZ2h0IDI1cHggKGVuZm9yY2VkIGJ5
IG1pbi1oZWlnaHQpIGlzIHRyYW5zZmVycmVkIHRvIHRoZQorICAgICAgICAgbWFpbiBheGlzLiAt
LT4KICAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWluLWhlaWdodDogMjVweDsgYXNwZWN0
LXJhdGlvOiA4LzE7Ij48L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRpdiBjbGFzcz0iZmxleENvbnRh
aW5lciI+Ci0gICAgPCEtLSBUaGUgYm9yZGVyLWJveCBoZWlnaHQgMjVweCAoY2xhbXBlZCBieSBt
YXgtaGVpZ2h0KSBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWll
bGRpbmcgYSByZXNvbHZlZCBtaW4td2lkdGg6YXV0byBvZiAyMDBweC4gLS0+CisgICAgPCEtLSBU
aGUgY29udGVudCBzaXplIHN1Z2dlc3Rpb24gKGJvcmRlci1ib3gpIGlzIDIwMHB4IGJlY2F1c2Ug
dGhlCisgICAgICAgICBib3JkZXItYm94IGhlaWdodCAyNXB4IChjbGFtcGVkIGJ5IG1heC1oZWln
aHQpIGlzIHRyYW5zZmVycmVkIHRvIHRoZQorICAgICAgICAgbWFpbiBheGlzLiAtLT4KICAgICA8
ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWF4LWhlaWdodDogMjVweDsgaGVpZ2h0OiAxMDBweDsg
YXNwZWN0LXJhdGlvOiA4LzE7Ij48L2Rpdj4KICAgPC9kaXY+CiAKQEAgLTUwLDI1ICs2MiwyNyBA
QAogICAgICAgIGJlY2F1c2UgaXRzIHZhbHVlIGNvbnRhaW5zICdhdXRvJy4gLS0+CiAgIDxkaXYg
Y2xhc3M9ImZsZXhDb250YWluZXIiIHN0eWxlPSJ3aWR0aDogYXV0bzsiPgogICAgIDwhLS0gVGhl
IGNvbnRlbnQtYm94IGhlaWdodCAxMHB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMs
Ci0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIGZsZXggYmFzZSBzaXplIG9mIDE5MHB4LiAt
LT4KKyAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgZmxleCBiYXNlIHNpemUgKGNvbnRlbnQt
Ym94KSBvZiAxOTBweC4gLS0+CiAgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi13aWR0
aDowOyBoZWlnaHQ6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxOS8xOyI+PC9kaXY+CiAgIDwv
ZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgotICAgIDwhLS0gVGhlIGNvbnRl
bnQtYm94IGhlaWdodCAxMHB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMsCi0gICAg
ICAgICB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi13aWR0aDphdXRvIG9mIDE5MHB4LiAtLT4KKyAg
ICA8IS0tIFRoZSBjb250ZW50IHNpemUgc3VnZ2VzdGlvbiAoY29udGVudC1ib3gpIGlzIDE5MHB4
IGJlY2F1c2UgdGhlCisgICAgICAgICBjb250ZW50LWJveCBoZWlnaHQgMTBweCBpcyB0cmFuc2Zl
cnJlZCB0byB0aGUgbWFpbiBheGlzLiAtLT4KICAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0i
aGVpZ2h0OiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMTkvMTsiPjwvZGl2PgogICA8L2Rpdj4K
IAogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAgICA8IS0tIFRoZSBjb250ZW50LWJv
eCBtaW4taGVpZ2h0IDEwcHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAg
ICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLXdpZHRoOmF1dG8gb2YgMTkwcHguIC0tPgorICAg
IDwhLS0gVGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIChjb250ZW50LWJveCkgaXMgMTkwcHgg
YmVjYXVzZSB0aGUKKyAgICAgICAgIGNvbnRlbnQtYm94IGhlaWdodCAxMHB4IChlbmZvcmNlZCBi
eSBtaW4taGVpZ2h0KSBpcyB0cmFuc2ZlcnJlZCB0byB0aGUKKyAgICAgICAgIG1haW4gYXhpcy4g
LS0+CiAgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi1oZWlnaHQ6IDI1cHg7IGFzcGVj
dC1yYXRpbzogYXV0byAxOS8xOyI+PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZs
ZXhDb250YWluZXIiPgotICAgIDwhLS0gVGhlIGNvbnRlbnQtYm94IGhlaWdodCAxMHB4IChjbGFt
cGVkIGJ5IG1heC1oZWlnaHQpIGlzIHRyYW5zZmVycmVkCi0gICAgICAgICB0byB0aGUgbWFpbiBh
eGlzLCB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi13aWR0aDphdXRvIG9mIDE5MHB4LiAtLT4KKyAg
ICA8IS0tIFRoZSBjb250ZW50IHNpemUgc3VnZ2VzdGlvbiAoY29udGVudC1ib3gpIGlzIDE5MHB4
IGJlY2F1c2UgdGhlCisgICAgICAgICBjb250ZW50LWJveCBoZWlnaHQgMTBweCAoY2xhbXBlZCBi
eSBtYXgtaGVpZ2h0KSBpcyB0cmFuc2ZlcnJlZCB0byB0aGUKKyAgICAgICAgIG1haW4gYXhpcy4g
LS0+CiAgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1heC1oZWlnaHQ6IDI1cHg7IGhlaWdo
dDogMTAwcHg7IGFzcGVjdC1yYXRpbzogYXV0byAxOS8xOyI+PC9kaXY+CiAgIDwvZGl2PgogPC9o
dG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0
bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
c2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbAppbmRleCBjNGEy
NTA4MThiYjc3ODZlMmYzOTU5MjJkMjhlM2M3NTE5YjRlYTNhLi4wNTNkNzVhMzllNGYyZWM1YzU2
M2FiY2VhYThlM2Q2MDIyNDhjODgxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFz
cGVjdC1yYXRpby0wMjYuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRp
by0wMjYuaHRtbApAQCAtNCw2ICs0LDggQEAKICAgPGxpbmsgcmVsPSJhdXRob3IiIHRpdGxlPSJU
aW5nLVl1IExpbiIgaHJlZj0ibWFpbHRvOnRsaW5AbW96aWxsYS5jb20iPgogICA8bGluayByZWw9
ImF1dGhvciIgdGl0bGU9Ik1vemlsbGEiIGhyZWY9Imh0dHBzOi8vd3d3Lm1vemlsbGEub3JnLyI+
CiAgIDxsaW5rIHJlbD0iaGVscCIgaHJlZj0iaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1z
aXppbmctNC8jYXNwZWN0LXJhdGlvIj4KKyAgPGxpbmsgcmVsPSJoZWxwIiBocmVmPSJodHRwczov
L2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLXNpemluZy00LyNhc3BlY3QtcmF0aW8tbWluaW11bSI+Cisg
IDxsaW5rIHJlbD0iaGVscCIgaHJlZj0iaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1mbGV4
Ym94LTEvI21pbi1zaXplLWF1dG8iPgogICA8bGluayByZWw9Im1hdGNoIiBocmVmPSIuLi8uLi9y
ZWZlcmVuY2UvcmVmLWZpbGxlZC1ncmVlbi0yMDBweC1zcXVhcmUuaHRtbCIgLz4KICAgPHN0eWxl
PgogICAuZmxleENvbnRhaW5lciB7CkBAIC0xOSw2MCArMjEsMzAgQEAKICAgICBib3gtc2l6aW5n
OiBib3JkZXItYm94OwogICB9CiAgIC5pdGVtID4gZGl2IHsKLSAgICBoZWlnaHQ6IDUwMHB4OyAv
KiBTZXQgYSBsYXJnZSBjb250ZW50IHNpemUgc3VnZ2VzdGlvbiBmb3IgZmxleCBpdGVtLiAqLwor
ICAgIGhlaWdodDogMTkwcHg7IC8qIFNldCB0aGUgY29udGVudCBzaXplIHN1Z2dlc3Rpb24gZm9y
IGZsZXggaXRlbS4gKi8KICAgfQogICA8L3N0eWxlPgogCiAgIDxwPlRlc3QgcGFzc2VzIGlmIHRo
ZXJlIGlzIGEgZmlsbGVkIGdyZWVuIHNxdWFyZSBhbmQgPHN0cm9uZz5ubyByZWQ8L3N0cm9uZz4u
PC9wPgogCi0gIDwhLS0gSW4gdGhlIGZvbGxvd2luZyBmb3VyIGZsZXggY29udGFpbmVycywgdGhl
IGFzcGVjdC1yYXRpbyB3b3JrcyB3aXRoIGJvcmRlci1ib3guIC0tPgotICA8ZGl2IGNsYXNzPSJm
bGV4Q29udGFpbmVyIiBzdHlsZT0iaGVpZ2h0OiBhdXRvOyI+Ci0gICAgPCEtLSBUaGUgYm9yZGVy
LWJveCB3aWR0aCAyNXB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMsCi0gICAgICAg
ICB5aWVsZGluZyBhIHJlc29sdmVkIGZsZXggYmFzZSBzaXplIG9mIDIwMHB4LiAtLT4KLSAgICA8
ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWluLWhlaWdodDowOyB3aWR0aDogMjVweDsgYXNwZWN0
LXJhdGlvOiAxLzg7Ij48ZGl2PjwvZGl2PjwvZGl2PgotICA8L2Rpdj4KLQotICA8ZGl2IGNsYXNz
PSJmbGV4Q29udGFpbmVyIj4KLSAgICA8IS0tIFRoZSBib3JkZXItYm94IHdpZHRoIDI1cHggaXMg
dHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2
ZWQgbWluLWhlaWdodDphdXRvIG9mIDIwMHB4LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJpdGVtIiBz
dHlsZT0id2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogMS84OyI+PGRpdj48L2Rpdj48L2Rpdj4K
LSAgPC9kaXY+Ci0KLSAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciI+Ci0gICAgPCEtLSBUaGUg
Ym9yZGVyLWJveCBtaW4td2lkdGggMjVweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlz
LAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8gb2YgMjAwcHgu
IC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4td2lkdGg6IDI1cHg7IGFzcGVj
dC1yYXRpbzogMS84OyI+PGRpdj48L2Rpdj48L2Rpdj4KLSAgPC9kaXY+CisgIDwhLS0gSW4gYWxs
IG9mIHRoZSBzdWJ0ZXN0cyBoZXJlLCBlYWNoIGZsZXggaXRlbSdzIGF1dG9tYXRpYyBtaW5pbXVt
IGhlaWdodCBpcworICAgICAgIHJlc29sdmVkIGRpcmVjdGx5IGZyb20gaXRzIGNvbnRlbnQgc2l6
ZSBzdWdnZXN0aW9uLiBOb3RhYmx5LCB0aGVzZSBpdGVtcworICAgICAgICpkbyBub3QqIGdldCBh
ICJ0cmFuc2ZlcnJlZCBzaXplIHN1Z2dlc3Rpb24iLCBiZWNhdXNlIHRoZXkgYXJlIGFsbAorICAg
ICAgICpub24tcmVwbGFjZWQqIGVsZW1lbnRzOyBhbmQgInRyYW5zZmVycmVkIHNpemUgc3VnZ2Vz
dGlvbiIgaXMgb25seSB1c2VkCisgICAgICAgZm9yIHJlc29sdmluZyBhdXRvbWF0aWMgbWluaW11
bSBzaXplcyBvbiAqcmVwbGFjZWQqIGVsZW1lbnRzLiBIb3dldmVyLAorICAgICAgIG5vdGUgdGhh
dCB3ZSBkbyAidHJhbnNmZXIiIHNpemVzIHRocm91Z2ggdGhlIGFzcGVjdCByYXRpbywgYXMgcGFy
dCBvZgorICAgICAgIGNvbXB1dGluZyB0aGUgY29udGVudCBzaXplIHN1Z2dlc3Rpb24gYW5kL29y
IGZsZXggYmFzZSBzaXplLiAtLT4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAg
ICA8IS0tIFRoZSBib3JkZXItYm94IHdpZHRoIDI1cHggKGNsYW1wZWQgYnkgbWF4LXdpZHRoKSBp
cyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNv
bHZlZCBtaW4taGVpZ2h0OmF1dG8gb2YgMjAwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0i
IHN0eWxlPSJtYXgtd2lkdGg6IDI1cHg7IHdpZHRoOiAxMDBweDsgYXNwZWN0LXJhdGlvOiAxLzg7
Ij48ZGl2PjwvZGl2PjwvZGl2PgotICA8L2Rpdj4KLQotICA8IS0tIEluIHRoZSBmb2xsb3dpbmcg
Zm91ciBmbGV4IGNvbnRhaW5lcnMsIHRoZSBhc3BlY3QtcmF0aW8gd29ya3Mgd2l0aCBjb250ZW50
LWJveAotICAgICAgIGJlY2F1c2UgaXRzIHZhbHVlIGNvbnRhaW5zICdhdXRvJy4gLS0+Ci0gIDxk
aXYgY2xhc3M9ImZsZXhDb250YWluZXIiIHN0eWxlPSJoZWlnaHQ6IGF1dG87Ij4KLSAgICA8IS0t
IFRoZSBjb250ZW50LWJveCB3aWR0aCAxMHB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4
aXMsCi0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIGZsZXggYmFzZSBzaXplIG9mIDE5MHB4
LiAtLT4KLSAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWluLWhlaWdodDowOyB3aWR0aDog
MjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEvMTk7Ij48ZGl2PjwvZGl2PjwvZGl2PgorICAgIDwh
LS0gVGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIGlzIDE5MHB4LCBpLmUuIHRoZSBoZWlnaHQg
b2YgdGhlIGl0ZW0ncworICAgICAgICAgY2hpbGQgZGl2LiAtLT4KKyAgICA8ZGl2IGNsYXNzPSJp
dGVtIiBzdHlsZT0id2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE7Ij48ZGl2Pjwv
ZGl2PjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAg
ICA8IS0tIFRoZSBjb250ZW50LWJveCB3aWR0aCAxMHB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBt
YWluIGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi1oZWlnaHQ6YXV0byBv
ZiAxOTBweC4gLS0+Ci0gICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9IndpZHRoOiAyNXB4OyBh
c3BlY3QtcmF0aW86IGF1dG8gMS8xOTsiPjxkaXY+PC9kaXY+PC9kaXY+CisgICAgPCEtLSBUaGUg
Y29udGVudCBzaXplIHN1Z2dlc3Rpb24gaXMgMTkwcHgsIGkuZS4gdGhlIGhlaWdodCBvZiB0aGUg
aXRlbSdzCisgICAgICAgICBjaGlsZCBkaXYuIC0tPgorICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0
eWxlPSJtaW4td2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE7Ij48ZGl2PjwvZGl2
PjwvZGl2PgogICA8L2Rpdj4KIAotICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAgICA8
IS0tIFRoZSBjb250ZW50LWJveCBtaW4td2lkdGggMTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUg
bWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8g
b2YgMTkwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4td2lkdGg6IDI1
cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE5OyI+PGRpdj48L2Rpdj48L2Rpdj4KLSAgPC9kaXY+
Ci0KLSAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciI+Ci0gICAgPCEtLSBUaGUgY29udGVudC1i
b3ggd2lkdGggMTBweCAoY2xhbXBlZCBieSBtYXgtd2lkdGgpIGlzIHRyYW5zZmVycmVkIHRvIHRo
ZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIG1pbi1oZWlnaHQ6YXV0
byBvZiAxOTBweC4gLS0+Ci0gICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1heC13aWR0aDog
MjVweDsgd2lkdGg6IDEwMHB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMS8xOTsiPjxkaXY+PC9kaXY+
PC9kaXY+Ci0gIDwvZGl2PgogPC9odG1sPgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>432596</attachid>
            <date>2021-06-30 08:31:34 -0700</date>
            <delta_ts>2021-07-19 06:04:34 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210630163132.patch</filename>
            <type>text/plain</type>
            <size>25525</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MzcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmRiZGJmZmY3NjhjMTVh
OWJhM2MwOGE2YWQwNDdhZmEyZGFjNDE2OS4uZDFjNWVjODZkNGZiNmI1ZDljZjAwYjAwNzliYTM3
MzQ3M2M4NDliMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA2LTI5ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBNYWtlIGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nIHRha2UgaW50byBh
Y2NvdW50CisgICAgICAgIGJveC1zaXppbmcgZm9yIHRoZSBjYXNlIHdoZXJlIENTUyBhc3BlY3Qt
cmF0aW8gaXMgYXBwbGllZC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRo
VXNpbmcgY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6
CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJv
bUFzcGVjdFJhdGlvVXNpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGli
bGVCb3g6OmNvbXB1dGVGbGV4SXRlbU1pbk1heFNpemVzKToKKwogMjAyMS0wNi0yOSAgUm9iIEJ1
aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIENyYXNoIGluIFNoYXJlZEJ1ZmZlcjo6
ZGF0YQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNw
cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKaW5kZXggOTJlOWY0
YjI4MTc3NzI1NTMzZWRkZjM4ODExMTZiOGUxNDg1M2QyYi4uYjMyYTE2N2Y4ODFmNDVmNDI5YmQy
ZGJmMTAzNTU0ZDFmZmU0YzkzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n
L1JlbmRlckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv
Y2suY3BwCkBAIC0zNDU3LDcgKzM0NTcsNyBAQCBMYXlvdXRVbml0IFJlbmRlckJsb2NrOjphZGp1
c3RDb250ZW50Qm94TG9naWNhbEhlaWdodEZvckJveFNpemluZyhzdGQ6Om9wdGlvbmFsPAogICAg
IGlmICghaGVpZ2h0KQogICAgICAgICByZXR1cm4gMDsKICAgICBMYXlvdXRVbml0IHJlc3VsdCA9
IGhlaWdodC52YWx1ZSgpOwotICAgIGlmIChzdHlsZSgpLmJveFNpemluZygpID09IEJveFNpemlu
Zzo6Qm9yZGVyQm94KQorICAgIGlmIChzdHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJhdGlvKCkg
PT0gQm94U2l6aW5nOjpCb3JkZXJCb3gpCiAgICAgICAgIHJlc3VsdCAtPSBib3JkZXJBbmRQYWRk
aW5nTG9naWNhbEhlaWdodCgpOwogICAgIGVsc2UKICAgICAgICAgcmVzdWx0IC09IGludHJpbnNp
Y0JvcmRlckZvckZpZWxkc2V0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp
bmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3Bw
CmluZGV4IGNhNWE2YzMzNDg4OTkyYWRkNDYyMTBjN2ZhNzFiOThiMDY3ZDNkODcuLjA0NmVmMjdk
OTRlNzc1OTNiZTY1ZGM4MGJiYjcxZmNmMWMzNjc4ZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu
Zy9SZW5kZXJCb3guY3BwCkBAIC0xMzE1LDcgKzEzMTUsNyBAQCBMYXlvdXRVbml0IFJlbmRlckJv
eDo6YWRqdXN0Qm9yZGVyQm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKGNvbnN0IExlbmd0aCYg
bG9naQogewogICAgIGF1dG8gd2lkdGggPSBMYXlvdXRVbml0IHsgbG9naWNhbFdpZHRoLnZhbHVl
KCkgfTsKICAgICBMYXlvdXRVbml0IGJvcmRlcnNQbHVzUGFkZGluZyA9IGJvcmRlckFuZFBhZGRp
bmdMb2dpY2FsV2lkdGgoKTsKLSAgICBpZiAoc3R5bGUoKS5ib3hTaXppbmcoKSA9PSBCb3hTaXpp
bmc6OkNvbnRlbnRCb3ggfHwgbG9naWNhbFdpZHRoLmlzSW50cmluc2ljT3JBdXRvKCkpCisgICAg
aWYgKHN0eWxlKCkuYm94U2l6aW5nRm9yQXNwZWN0UmF0aW8oKSA9PSBCb3hTaXppbmc6OkNvbnRl
bnRCb3ggfHwgbG9naWNhbFdpZHRoLmlzSW50cmluc2ljT3JBdXRvKCkpCiAgICAgICAgIHJldHVy
biB3aWR0aCArIGJvcmRlcnNQbHVzUGFkZGluZzsKICAgICByZXR1cm4gc3RkOjptYXgod2lkdGgs
IGJvcmRlcnNQbHVzUGFkZGluZyk7CiB9CkBAIC0xMzMwLDcgKzEzMzAsNyBAQCBMYXlvdXRVbml0
IFJlbmRlckJveDo6YWRqdXN0Qm9yZGVyQm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKExheW91
dFVuaXQgY29tcHV0ZQogTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmFkanVzdEJvcmRlckJveExvZ2lj
YWxIZWlnaHRGb3JCb3hTaXppbmcoTGF5b3V0VW5pdCBoZWlnaHQpIGNvbnN0CiB7CiAgICAgTGF5
b3V0VW5pdCBib3JkZXJzUGx1c1BhZGRpbmcgPSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdo
dCgpOwotICAgIGlmIChzdHlsZSgpLmJveFNpemluZygpID09IEJveFNpemluZzo6Q29udGVudEJv
eCkKKyAgICBpZiAoc3R5bGUoKS5ib3hTaXppbmdGb3JBc3BlY3RSYXRpbygpID09IEJveFNpemlu
Zzo6Q29udGVudEJveCkKICAgICAgICAgcmV0dXJuIGhlaWdodCArIGJvcmRlcnNQbHVzUGFkZGlu
ZzsKICAgICByZXR1cm4gc3RkOjptYXgoaGVpZ2h0LCBib3JkZXJzUGx1c1BhZGRpbmcpOwogfQpA
QCAtMTMzOCw3ICsxMzM4LDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmFkanVzdEJvcmRlckJv
eExvZ2ljYWxIZWlnaHRGb3JCb3hTaXppbmcoTGF5b3V0VW5pdCBoZWlnaHQKIExheW91dFVuaXQg
UmVuZGVyQm94OjphZGp1c3RDb250ZW50Qm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKGNvbnN0
IExlbmd0aCYgbG9naWNhbFdpZHRoKSBjb25zdAogewogICAgIGF1dG8gd2lkdGggPSBMYXlvdXRV
bml0IHsgbG9naWNhbFdpZHRoLnZhbHVlKCkgfTsKLSAgICBpZiAoc3R5bGUoKS5ib3hTaXppbmco
KSA9PSBCb3hTaXppbmc6OkNvbnRlbnRCb3ggfHwgbG9naWNhbFdpZHRoLmlzSW50cmluc2ljT3JB
dXRvKCkpCisgICAgaWYgKHN0eWxlKCkuYm94U2l6aW5nRm9yQXNwZWN0UmF0aW8oKSA9PSBCb3hT
aXppbmc6OkNvbnRlbnRCb3ggfHwgbG9naWNhbFdpZHRoLmlzSW50cmluc2ljT3JBdXRvKCkpCiAg
ICAgICAgIHJldHVybiBzdGQ6Om1heCgwX2x1LCB3aWR0aCk7CiAgICAgcmV0dXJuIHN0ZDo6bWF4
KDBfbHUsIHdpZHRoIC0gYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxXaWR0aCgpKTsKIH0KQEAgLTEz
NTUsNyArMTM1NSw3IEBAIExheW91dFVuaXQgUmVuZGVyQm94OjphZGp1c3RDb250ZW50Qm94TG9n
aWNhbEhlaWdodEZvckJveFNpemluZyhzdGQ6Om9wdGlvbmFsPExhCiAgICAgaWYgKCFoZWlnaHQp
CiAgICAgICAgIHJldHVybiAwOwogICAgIExheW91dFVuaXQgcmVzdWx0ID0gaGVpZ2h0LnZhbHVl
KCk7Ci0gICAgaWYgKHN0eWxlKCkuYm94U2l6aW5nKCkgPT0gQm94U2l6aW5nOjpCb3JkZXJCb3gp
CisgICAgaWYgKHN0eWxlKCkuYm94U2l6aW5nRm9yQXNwZWN0UmF0aW8oKSA9PSBCb3hTaXppbmc6
OkJvcmRlckJveCkKICAgICAgICAgcmVzdWx0IC09IGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsSGVp
Z2h0KCk7CiAgICAgcmV0dXJuIHN0ZDo6bWF4KDBfbHUsIHJlc3VsdCk7CiB9CkBAIC0yNjkxLDkg
KzI2OTEsMTAgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbXB1dGVJbnRyaW5zaWNMb2dpY2Fs
V2lkdGhVc2luZyhMZW5ndGggbG9naWNhbFdpZHRoTGVuZ3QKIAogICAgIExheW91dFVuaXQgbWlu
TG9naWNhbFdpZHRoOwogICAgIExheW91dFVuaXQgbWF4TG9naWNhbFdpZHRoOwotICAgIGlmICgh
bG9naWNhbFdpZHRoTGVuZ3RoLmlzTWluSW50cmluc2ljKCkgJiYgc2hvdWxkQ29tcHV0ZUxvZ2lj
YWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpKQorICAgIGlmICghbG9naWNhbFdpZHRoTGVuZ3RoLmlz
TWluSW50cmluc2ljKCkgJiYgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRp
bygpKSB7CiAgICAgICAgIG1pbkxvZ2ljYWxXaWR0aCA9IG1heExvZ2ljYWxXaWR0aCA9IGNvbXB1
dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKTsKLSAgICBlbHNlCisgICAgICAgIGJvcmRl
ckFuZFBhZGRpbmcgPSBMYXlvdXRVbml0KCk7CisgICAgfSBlbHNlCiAgICAgICAgIGNvbXB1dGVJ
bnRyaW5zaWNLZXl3b3JkTG9naWNhbFdpZHRocyhtaW5Mb2dpY2FsV2lkdGgsIG1heExvZ2ljYWxX
aWR0aCk7CiAKICAgICBpZiAobG9naWNhbFdpZHRoTGVuZ3RoLmlzTWluQ29udGVudCgpIHx8IGxv
Z2ljYWxXaWR0aExlbmd0aC5pc01pbkludHJpbnNpYygpKQpAQCAtMzExNSw3ICszMTE2LDcgQEAg
c3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiBSZW5kZXJCb3g6OmNvbXB1dGVJbnRyaW5zaWNMb2dp
Y2FsQ29udGVudEhlaWdodFVzaW5nKEwKICAgICAvLyBGSVhNRTogVGhlIENTUyBzaXppbmcgc3Bl
YyBpcyBjb25zaWRlcmluZyBjaGFuZ2luZyB3aGF0IG1pbi1jb250ZW50L21heC1jb250ZW50IHNo
b3VsZCByZXNvbHZlIHRvLgogICAgIC8vIElmIHRoYXQgaGFwcGVucywgdGhpcyBjb2RlIHdpbGwg
aGF2ZSB0byBjaGFuZ2UuCiAgICAgaWYgKGxvZ2ljYWxIZWlnaHRMZW5ndGguaXNNaW5Db250ZW50
KCkgfHwgbG9naWNhbEhlaWdodExlbmd0aC5pc01heENvbnRlbnQoKSB8fCBsb2dpY2FsSGVpZ2h0
TGVuZ3RoLmlzRml0Q29udGVudCgpIHx8IGxvZ2ljYWxIZWlnaHRMZW5ndGguaXNMZWdhY3lJbnRy
aW5zaWMoKSkgewotICAgICAgICBpZiAoaW50cmluc2ljQ29udGVudEhlaWdodCAmJiBzdHlsZSgp
LmJveFNpemluZygpID09IEJveFNpemluZzo6Qm9yZGVyQm94KQorICAgICAgICBpZiAoaW50cmlu
c2ljQ29udGVudEhlaWdodCAmJiBzdHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJhdGlvKCkgPT0g
Qm94U2l6aW5nOjpCb3JkZXJCb3gpCiAgICAgICAgICAgICByZXR1cm4gaW50cmluc2ljQ29udGVu
dEhlaWdodC52YWx1ZSgpICsgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQoKTsKICAgICAg
ICAgcmV0dXJuIGludHJpbnNpY0NvbnRlbnRIZWlnaHQ7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJD
b3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKaW5kZXggMmU3Yzc2NGQ3NzNlNmE5
ZTEwZmRiMDU5ZmM0YzZiMDhmMjA1NGY3My4uYjkzNjNiYmQwNmUyNjYzMTg2MjgyMTIyNDUyOTky
MTUzNWE1YTc3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZs
ZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGli
bGVCb3guY3BwCkBAIC02NDMsNiArNjQzLDggQEAgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiBS
ZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQoUmVuZGUKICAg
ICAgICAgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiBoZWlnaHQgPSBjaGlsZC5jb21wdXRlQ29u
dGVudExvZ2ljYWxIZWlnaHQoc2l6ZVR5cGUsIHNpemUsIGNhY2hlZENoaWxkSW50cmluc2ljQ29u
dGVudExvZ2ljYWxIZWlnaHQoY2hpbGQpKTsKICAgICAgICAgaWYgKCFoZWlnaHQpCiAgICAgICAg
ICAgICByZXR1cm4gaGVpZ2h0OworICAgICAgICAvL2lmIChjaGlsZC5zdHlsZSgpLmFzcGVjdFJh
dGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6QXV0b0FuZFJhdGlvKQorICAgICAgICAvLyAg
ICAgcmV0dXJuIGhlaWdodC52YWx1ZSgpIC0gY2hpbGQuYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxI
ZWlnaHQoKSArIGNoaWxkLnNjcm9sbGJhckxvZ2ljYWxIZWlnaHQoKTsKICAgICAgICAgcmV0dXJu
IGhlaWdodC52YWx1ZSgpICsgY2hpbGQuc2Nyb2xsYmFyTG9naWNhbEhlaWdodCgpOwogICAgIH0K
IApAQCAtODY1LDkgKzg2Nyw3IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1
dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJvCiB7CiAgICAgQVNT
RVJUKGNoaWxkSGFzQXNwZWN0UmF0aW8oY2hpbGQpKTsKIAotICAgIGF1dG8gYWRqdXN0Rm9yQm94
U2l6aW5nID0gW3RoaXNdIChjb25zdCBSZW5kZXJCb3gmIGJveCwgTGVuZ3RoIGxlbmd0aCkgLT4g
TGF5b3V0VW5pdCB7Ci0gICAgICAgIEFTU0VSVChsZW5ndGguaXNGaXhlZCgpKTsKLSAgICAgICAg
YXV0byB2YWx1ZSA9IExheW91dFVuaXQobGVuZ3RoLnZhbHVlKCkpOworICAgIGF1dG8gYWRqdXN0
Rm9yQm94U2l6aW5nID0gW3RoaXNdIChjb25zdCBSZW5kZXJCb3gmIGJveCwgTGF5b3V0VW5pdCB2
YWx1ZSkgLT4gTGF5b3V0VW5pdCB7CiAgICAgICAgIC8vIFdlIG5lZWQgdG8gc3Vic3RyYWN0IHRo
ZSBib3JkZXIgYW5kIHBhZGRpbmcgZXh0ZW50IGZyb20gdGhlIGNyb3NzIGF4aXMuCiAgICAgICAg
IC8vIEZ1cnRoZXJtb3JlLCB0aGUgc2l6aW5nIGNhbGN1bGF0aW9ucyB0aGF0IGZsb29yIHRoZSBj
b250ZW50IGJveCBzaXplIGF0IHplcm8gd2hlbiBhcHBseWluZyBib3gtc2l6aW5nIGFyZSBhbHNv
IGlnbm9yZWQuCiAgICAgICAgIC8vIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZmxleGJv
eC8jYWxnby1tYWluLWl0ZW0uCkBAIC04NzYsMjkgKzg3NiwzOCBAQCBMYXlvdXRVbml0IFJlbmRl
ckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjb25zdCBS
ZW5kZXJCbwogICAgICAgICByZXR1cm4gdmFsdWU7CiAgICAgfTsKIAotICAgIHN0ZDo6b3B0aW9u
YWw8TGF5b3V0VW5pdD4gY3Jvc3NTaXplOworICAgIC8vIGNyb3NzU2l6ZSBpcyBib3JkZXItYm94
IHNpemUgaWYgYm94LXNpemluZyBpcyBib3JkZXItYm94LCBhbmQKKyAgICAvLyBjb250ZW50LWJv
eCBvdGhlcndpc2UuCisgICAgTGF5b3V0VW5pdCBjcm9zc1NpemU7CiAgICAgaWYgKGNyb3NzU2l6
ZUxlbmd0aC5pc0ZpeGVkKCkpCi0gICAgICAgIGNyb3NzU2l6ZSA9IGFkanVzdEZvckJveFNpemlu
ZyhjaGlsZCwgY3Jvc3NTaXplTGVuZ3RoKTsKKyAgICAgICAgY3Jvc3NTaXplID0gTGF5b3V0VW5p
dChjcm9zc1NpemVMZW5ndGgudmFsdWUoKSk7CiAgICAgZWxzZSBpZiAoY3Jvc3NTaXplTGVuZ3Ro
LmlzQXV0bygpKQogICAgICAgICBjcm9zc1NpemUgPSBjb21wdXRlQ3Jvc3NTaXplRm9yQ2hpbGRV
c2luZ0NvbnRhaW5lckNyb3NzU2l6ZShjaGlsZCk7CiAgICAgZWxzZSB7CiAgICAgICAgIEFTU0VS
VChjcm9zc1NpemVMZW5ndGguaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkpOwotICAgICAgICBjcm9z
c1NpemUgPSBtYWluQXhpc0lzQ2hpbGRJbmxpbmVBeGlzKGNoaWxkKSA/IGNoaWxkLmNvbXB1dGVQ
ZXJjZW50YWdlTG9naWNhbEhlaWdodChjcm9zc1NpemVMZW5ndGgpIDogYWRqdXN0Qm9yZGVyQm94
TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKHZhbHVlRm9yTGVuZ3RoKGNyb3NzU2l6ZUxlbmd0aCwg
Y29udGVudFdpZHRoKCkpLCBjcm9zc1NpemVMZW5ndGgudHlwZSgpKTsKLSAgICAgICAgaWYgKCFj
cm9zc1NpemUpCisgICAgICAgIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gY2hpbGRTaXplID0g
bWFpbkF4aXNJc0NoaWxkSW5saW5lQXhpcyhjaGlsZCkgPyBjaGlsZC5jb21wdXRlUGVyY2VudGFn
ZUxvZ2ljYWxIZWlnaHQoY3Jvc3NTaXplTGVuZ3RoKSA6IGFkanVzdEJvcmRlckJveExvZ2ljYWxX
aWR0aEZvckJveFNpemluZyh2YWx1ZUZvckxlbmd0aChjcm9zc1NpemVMZW5ndGgsIGNvbnRlbnRX
aWR0aCgpKSwgY3Jvc3NTaXplTGVuZ3RoLnR5cGUoKSk7CisgICAgICAgIGlmICghY2hpbGRTaXpl
KQogICAgICAgICAgICAgcmV0dXJuIDBfbHU7CisgICAgICAgIGNyb3NzU2l6ZSA9IGNoaWxkU2l6
ZS52YWx1ZSgpOwogICAgIH0KIAogICAgIGNvbnN0IExheW91dFNpemUmIGNoaWxkSW50cmluc2lj
U2l6ZSA9IGNoaWxkLmludHJpbnNpY1NpemUoKTsKICAgICBkb3VibGUgcmF0aW87Ci0gICAgaWYg
KGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpSYXRp
byB8fCAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6
OkF1dG9BbmRSYXRpbyAmJiBjaGlsZEludHJpbnNpY1NpemUuaXNFbXB0eSgpKSkKKyAgICBMYXlv
dXRVbml0IGJvcmRlckFuZFBhZGRpbmc7CisgICAgaWYgKGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0
aW9UeXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpSYXRpbyB8fCAoY2hpbGQuc3R5bGUoKS5hc3Bl
Y3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OkF1dG9BbmRSYXRpbyAmJiBjaGlsZElu
dHJpbnNpY1NpemUuaXNFbXB0eSgpKSkgewogICAgICAgICByYXRpbyA9IGNoaWxkLnN0eWxlKCku
YXNwZWN0UmF0aW9XaWR0aCgpIC8gY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb0hlaWdodCgpOwot
ICAgIGVsc2UgeworICAgICAgICBpZiAoY2hpbGQuc3R5bGUoKS5ib3hTaXppbmdGb3JBc3BlY3RS
YXRpbygpID09IEJveFNpemluZzo6Q29udGVudEJveCkKKyAgICAgICAgICAgIGNyb3NzU2l6ZSAt
PSBpc0hvcml6b250YWxGbG93KCkgPyBjaGlsZC52ZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmdFeHRl
bnQoKSA6IGNoaWxkLmhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCk7CisgICAgICAg
IGVsc2UKKyAgICAgICAgICAgIGJvcmRlckFuZFBhZGRpbmcgPSBpc0hvcml6b250YWxGbG93KCkg
PyBjaGlsZC5ob3Jpem9udGFsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpIDogY2hpbGQudmVydGlj
YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCk7CisgICAgfSBlbHNlIHsKICAgICAgICAgQVNTRVJU
KGNoaWxkSW50cmluc2ljU2l6ZS5oZWlnaHQoKSk7CiAgICAgICAgIHJhdGlvID0gY2hpbGRJbnRy
aW5zaWNTaXplLndpZHRoKCkudG9GbG9hdCgpIC8gY2hpbGRJbnRyaW5zaWNTaXplLmhlaWdodCgp
LnRvRmxvYXQoKTsKKyAgICAgICAgY3Jvc3NTaXplID0gYWRqdXN0Rm9yQm94U2l6aW5nKGNoaWxk
LCBjcm9zc1NpemUpOwogICAgIH0KICAgICBpZiAoaXNIb3Jpem9udGFsRmxvdygpKQotICAgICAg
ICByZXR1cm4gTGF5b3V0VW5pdChjcm9zc1NpemUudmFsdWUoKSAqIHJhdGlvKTsKLSAgICByZXR1
cm4gTGF5b3V0VW5pdChjcm9zc1NpemUudmFsdWUoKSAvIHJhdGlvKTsKKyAgICAgICAgcmV0dXJu
IExheW91dFVuaXQoY3Jvc3NTaXplICogcmF0aW8pIC0gYm9yZGVyQW5kUGFkZGluZzsKKyAgICBy
ZXR1cm4gTGF5b3V0VW5pdChjcm9zc1NpemUgLyByYXRpbykgLSBib3JkZXJBbmRQYWRkaW5nOwog
fQogCiB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpzZXRGbG93QXdhcmVMb2NhdGlvbkZvckNoaWxk
KFJlbmRlckJveCYgY2hpbGQsIGNvbnN0IExheW91dFBvaW50JiBsb2NhdGlvbikKQEAgLTEwMjcs
NiArMTAzNiw4IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVJbm5lckZs
ZXhCYXNlU2l6ZUZvckNoaWxkKFJlbmRlckJveCYgY2hpbGQsCiAgICAgICAgIC8vIHdpZHRoIGlu
Y2x1ZGVzIHRoZSBzY3JvbGxiYXIsIGV2ZW4gZm9yIG92ZXJmbG93OiBhdXRvLgogICAgICAgICBt
YWluQXhpc0V4dGVudCA9IGNoaWxkLm1heFByZWZlcnJlZExvZ2ljYWxXaWR0aCgpOwogICAgIH0K
KyAgICAvL2lmIChjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvVHlwZSgpID09IEFzcGVjdFJhdGlv
VHlwZTo6QXV0b0FuZFJhdGlvKQorICAgIC8vICAgIHJldHVybiBtYWluQXhpc0V4dGVudCArIG1h
aW5BeGlzQm9yZGVyQW5kUGFkZGluZzsKICAgICByZXR1cm4gbWFpbkF4aXNFeHRlbnQgLSBtYWlu
QXhpc0JvcmRlckFuZFBhZGRpbmc7CiB9CiAKQEAgLTEyNzEsNiArMTI4MiwxMSBAQCBzdGQ6OnBh
aXI8TGF5b3V0VW5pdCwgTGF5b3V0VW5pdD4gUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVGbGV4
SXRlbU1pbk1heFNpemVzKAogICAgIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gbWF4RXh0ZW50
ID0gc3RkOjpudWxsb3B0OwogICAgIGlmIChtYXguaXNTcGVjaWZpZWRPckludHJpbnNpYygpKQog
ICAgICAgICBtYXhFeHRlbnQgPSBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjaGlsZCwg
TWF4U2l6ZSwgbWF4KTsKKyAgICBlbHNlIGlmIChjaGlsZC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlv
KCkpIHsKKyAgICAgICAgbWF4ID0gY3Jvc3NTaXplTGVuZ3RoRm9yQ2hpbGQoTWF4U2l6ZSwgY2hp
bGQpOworICAgICAgICBpZiAobWF4LmlzU3BlY2lmaWVkT3JJbnRyaW5zaWMoKSkKKyAgICAgICAg
ICAgIG1heEV4dGVudCA9IGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNoaWxk
LCBtYXgpOworICAgIH0KIAogICAgIExlbmd0aCBtaW4gPSBtYWluU2l6ZUxlbmd0aEZvckNoaWxk
KE1pblNpemUsIGNoaWxkKTsKICAgICAvLyBJbnRyaW5zaWMgc2l6ZXMgaW4gY2hpbGQncyBibG9j
ayBheGlzIGFyZSBoYW5kbGVkIGJ5IHRoZSBtaW4tc2l6ZTphdXRvIGNvZGUgcGF0aC4KQEAgLTE0
MTcsNyArMTQzMyw4IEBAIEZsZXhJdGVtIFJlbmRlckZsZXhpYmxlQm94Ojpjb25zdHJ1Y3RGbGV4
SXRlbShSZW5kZXJCb3gmIGNoaWxkLCBib29sIHJlbGF5b3V0Q2hpCiAgICAgTGF5b3V0VW5pdCBj
aGlsZElubmVyRmxleEJhc2VTaXplOwogICAgIHsKICAgICAgICAgU2NvcGVkVW5ib3VuZGVkQm94
IHVuYm91bmRlZChjaGlsZCwgbWFpbkF4aXNJc0NoaWxkSW5saW5lQXhpcyhjaGlsZCkpOwotICAg
ICAgICBjaGlsZC5jbGVhck92ZXJyaWRpbmdDb250ZW50U2l6ZSgpOworICAgICAgICBpZiAoIWNo
aWxkLnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSkKKyAgICAgICAgICAgIGNoaWxkLmNsZWFyT3Zl
cnJpZGluZ0NvbnRlbnRTaXplKCk7CiAgICAgICAgIGlmIChjaGlsZEhhc0ludHJpbnNpY01haW5B
eGlzU2l6ZShjaGlsZCkpIHsKICAgICAgICAgICAgIC8vIElmIHRoaXMgY29uZGl0aW9uIGlzIHRy
dWUsIHRoZW4gY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQgd2lsbCBjYWxsCiAgICAgICAg
ICAgICAvLyBjaGlsZC5pbnRyaW5zaWNDb250ZW50TG9naWNhbEhlaWdodCgpIGFuZCBjaGlsZC5z
Y3JvbGxiYXJMb2dpY2FsSGVpZ2h0KCksCkBAIC0xNDQxLDcgKzE0NTgsNyBAQCBGbGV4SXRlbSBS
ZW5kZXJGbGV4aWJsZUJveDo6Y29uc3RydWN0RmxleEl0ZW0oUmVuZGVyQm94JiBjaGlsZCwgYm9v
bCByZWxheW91dENoaQogICAgICAgICB9CiAgICAgICAgIGNoaWxkSW5uZXJGbGV4QmFzZVNpemUg
PSBjb21wdXRlSW5uZXJGbGV4QmFzZVNpemVGb3JDaGlsZChjaGlsZCwgYm9yZGVyQW5kUGFkZGlu
Zyk7CiAgICAgfQotICAgIAorCiAgICAgTGF5b3V0VW5pdCBtYXJnaW4gPSBpc0hvcml6b250YWxG
bG93KCkgPyBjaGlsZC5ob3Jpem9udGFsTWFyZ2luRXh0ZW50KCkgOiBjaGlsZC52ZXJ0aWNhbE1h
cmdpbkV4dGVudCgpOwogICAgIHJldHVybiBGbGV4SXRlbShjaGlsZCwgY2hpbGRJbm5lckZsZXhC
YXNlU2l6ZSwgYm9yZGVyQW5kUGFkZGluZywgbWFyZ2luLCBjb21wdXRlRmxleEl0ZW1NaW5NYXhT
aXplcyhjaGlsZCksIGNoaWxkSGFkTGF5b3V0KTsKIH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz
L0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkMWM1MWI0YjU0NjYxZDEw
YzQxOWU3YTJjZmQ2Yzc4ODk5MzU2Y2QzLi40YTA2ODg4YThiMzViNzE1ZDI3MjE0YzQ1YzBmNWI1
OTViOWY3MDAwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0
VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjEtMDYtMjkgIFJvYiBCdWlzICA8
cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBGaXggZmxleC1hc3BlY3QtcmF0aW8tMDI1KzI2
Lmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy
MjM1NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog
VGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0wNi0yOSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEu
Y29tPgogCiAgICAgICAgIENyYXNoIGluIFNoYXJlZEJ1ZmZlcjo6ZGF0YQpkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVk
L3czYy9DaGFuZ2VMb2cKaW5kZXggNzU5ZmZjZmE5ZWZiYjJjOWY2N2Y1OGY0NGUzNjAyMzQyNTgw
MjA1OS4uMjUwZjM2NzFhYmJhZDFkMjg1M2UzN2E1MzMwN2ZlZDI5MGUxOTY1NCAxMDA2NDQKLS0t
IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9p
bXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMDYtMjkgIFJvYiBC
dWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBGaXggZmxleC1hc3BlY3QtcmF0aW8t
MDI1KzI2Lmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp
P2lkPTIyMjM1NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg
ICAgIEltcG9ydCB1cGRhdGVkIFdQVCB0ZXN0cy4KKworICAgICAgICAqIHdlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0
bWw6CisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y
YXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbDoKKwogMjAyMS0wNi0yOSAgTWFydGluIFJv
Ymluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgQ1NTIHNjcm9sbCBzbmFw
IHNob3VsZCBhbGxvdyBzY3JvbGxpbmcgdG8gdGhlIG1pZGRsZSBvZiBzbmFwIGFyZWFzIHRoYXQg
b3ZlcmZsb3cgdGhlIHNuYXBwb3J0CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0
YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCAyOWY0NDdhZjI2NGEz
NGQwYmI1OTFjZTJmMDAzODgwMWJmYzE2NzI0Li40ZTM5OGI0YjRkYjY4ZmM3MmIwMDEzNGM3MGE3
OWViNmRlNjhmNzA0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisr
KyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTQ1NjcsOCArNDU2Nyw2IEBAIHdl
YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXNpemluZy9hc3BlY3QtcmF0aW8vCiAjIGZsZXgtYmFzaXM6Y29udGVudAogd2Via2l0Lm9yZy9i
LzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz
cGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg
XQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjIuaHRtbCBbIElt
YWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRp
by0wMjUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9m
bGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9y
Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n
L2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTguaHRtbCBbIEltYWdlT25seUZhaWx1
cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTkuaHRtbCBb
IEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1y
YXRpby0wMjAuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz
dHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt
cmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFz
cGVjdC1yYXRpby0wMjUuaHRtbAppbmRleCBjNGZmODExMGQ3YmVkNzA3OWM4NjRkZGYxOTJmODI0
MjkzMmU1ODhkLi5iZjhkYWFhMzVmMDhhNDEyODIyZGQ0MWU3NDk5MDI1ZTQwNjVlMjg0IDEwMDY0
NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbAorKysgYi9M
YXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n
L2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbApAQCAtNCw2ICs0LDggQEAK
ICAgPGxpbmsgcmVsPSJhdXRob3IiIHRpdGxlPSJUaW5nLVl1IExpbiIgaHJlZj0ibWFpbHRvOnRs
aW5AbW96aWxsYS5jb20iPgogICA8bGluayByZWw9ImF1dGhvciIgdGl0bGU9Ik1vemlsbGEiIGhy
ZWY9Imh0dHBzOi8vd3d3Lm1vemlsbGEub3JnLyI+CiAgIDxsaW5rIHJlbD0iaGVscCIgaHJlZj0i
aHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1zaXppbmctNC8jYXNwZWN0LXJhdGlvIj4KKyAg
PGxpbmsgcmVsPSJoZWxwIiBocmVmPSJodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLXNpemlu
Zy00LyNhc3BlY3QtcmF0aW8tbWluaW11bSI+CisgIDxsaW5rIHJlbD0iaGVscCIgaHJlZj0iaHR0
cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1mbGV4Ym94LTEvI21pbi1zaXplLWF1dG8iPgogICA8
bGluayByZWw9Im1hdGNoIiBocmVmPSIuLi8uLi9yZWZlcmVuY2UvcmVmLWZpbGxlZC1ncmVlbi0y
MDBweC1zcXVhcmUuaHRtbCIgLz4KICAgPHN0eWxlPgogICAuZmxleENvbnRhaW5lciB7CkBAIC0y
MSwyOCArMjMsMzggQEAKIAogICA8cD5UZXN0IHBhc3NlcyBpZiB0aGVyZSBpcyBhIGZpbGxlZCBn
cmVlbiBzcXVhcmUgYW5kIDxzdHJvbmc+bm8gcmVkPC9zdHJvbmc+LjwvcD4KIAorICA8IS0tIElu
IGFsbCBvZiB0aGUgc3VidGVzdHMgaGVyZSwgZWFjaCBmbGV4IGl0ZW0ncyBhdXRvbWF0aWMgbWlu
aW11bSB3aWR0aCBpcworICAgICAgIHJlc29sdmVkIGRpcmVjdGx5IGZyb20gaXRzIGNvbnRlbnQg
c2l6ZSBzdWdnZXN0aW9uLiBOb3RhYmx5LCB0aGVzZSBpdGVtcworICAgICAgICpkbyBub3QqIGdl
dCBhICJ0cmFuc2ZlcnJlZCBzaXplIHN1Z2dlc3Rpb24iLCBiZWNhdXNlIHRoZXkgYXJlIGFsbAor
ICAgICAgICpub24tcmVwbGFjZWQqIGVsZW1lbnRzOyBhbmQgInRyYW5zZmVycmVkIHNpemUgc3Vn
Z2VzdGlvbiIgaXMgb25seSB1c2VkCisgICAgICAgZm9yIHJlc29sdmluZyBhdXRvbWF0aWMgbWlu
aW11bSBzaXplcyBvbiAqcmVwbGFjZWQqIGVsZW1lbnRzLiBIb3dldmVyLAorICAgICAgIG5vdGUg
dGhhdCB3ZSBkbyAidHJhbnNmZXIiIHNpemVzIHRocm91Z2ggdGhlIGFzcGVjdCByYXRpbywgYXMg
cGFydCBvZgorICAgICAgIGNvbXB1dGluZyB0aGUgY29udGVudCBzaXplIHN1Z2dlc3Rpb24gYW5k
L29yIGZsZXggYmFzZSBzaXplLiAtLT4KKwogICA8IS0tIEluIHRoZSBmb2xsb3dpbmcgZm91ciBm
bGV4IGNvbnRhaW5lcnMsIHRoZSBhc3BlY3QtcmF0aW8gd29ya3Mgd2l0aCBib3JkZXItYm94LiAt
LT4KICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciIgc3R5bGU9IndpZHRoOiBhdXRvOyI+CiAg
ICAgPCEtLSBUaGUgYm9yZGVyLWJveCBoZWlnaHQgMjVweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUg
bWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBmbGV4IGJhc2Ugc2l6ZSBv
ZiAyMDBweC4gLS0+CisgICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIGZsZXggYmFzZSBzaXpl
IChib3JkZXItYm94KSBvZiAyMDBweC4gLS0+CiAgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9
Im1pbi13aWR0aDowOyBoZWlnaHQ6IDI1cHg7IGFzcGVjdC1yYXRpbzogOC8xOyI+PC9kaXY+CiAg
IDwvZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgotICAgIDwhLS0gVGhlIGJv
cmRlci1ib3ggaGVpZ2h0IDI1cHggaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAg
ICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgbWluLXdpZHRoOmF1dG8gb2YgMjAwcHguIC0tPgor
ICAgIDwhLS0gVGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIChib3JkZXItYm94KSBpcyAyMDBw
eCBiZWNhdXNlIHRoZQorICAgICAgICAgYm9yZGVyLWJveCBoZWlnaHQgMjVweCBpcyB0cmFuc2Zl
cnJlZCB0byB0aGUgbWFpbiBheGlzLiAtLT4KICAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0i
aGVpZ2h0OiAyNXB4OyBhc3BlY3QtcmF0aW86IDgvMTsiPjwvZGl2PgogICA8L2Rpdj4KIAogICA8
ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAgICA8IS0tIFRoZSBib3JkZXItYm94IG1pbi1o
ZWlnaHQgMjVweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWll
bGRpbmcgYSByZXNvbHZlZCBtaW4td2lkdGg6YXV0byBvZiAyMDBweC4gLS0+CisgICAgPCEtLSBU
aGUgY29udGVudCBzaXplIHN1Z2dlc3Rpb24gKGJvcmRlci1ib3gpIGlzIDIwMHB4IGJlY2F1c2Ug
dGhlCisgICAgICAgICBib3JkZXItYm94IGhlaWdodCAyNXB4IChlbmZvcmNlZCBieSBtaW4taGVp
Z2h0KSBpcyB0cmFuc2ZlcnJlZCB0byB0aGUKKyAgICAgICAgIG1haW4gYXhpcy4gLS0+CiAgICAg
PGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi1oZWlnaHQ6IDI1cHg7IGFzcGVjdC1yYXRpbzog
OC8xOyI+PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiPgot
ICAgIDwhLS0gVGhlIGJvcmRlci1ib3ggaGVpZ2h0IDI1cHggKGNsYW1wZWQgYnkgbWF4LWhlaWdo
dCkgaXMgdHJhbnNmZXJyZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEg
cmVzb2x2ZWQgbWluLXdpZHRoOmF1dG8gb2YgMjAwcHguIC0tPgorICAgIDwhLS0gVGhlIGNvbnRl
bnQgc2l6ZSBzdWdnZXN0aW9uIChib3JkZXItYm94KSBpcyAyMDBweCBiZWNhdXNlIHRoZQorICAg
ICAgICAgYm9yZGVyLWJveCBoZWlnaHQgMjVweCAoY2xhbXBlZCBieSBtYXgtaGVpZ2h0KSBpcyB0
cmFuc2ZlcnJlZCB0byB0aGUKKyAgICAgICAgIG1haW4gYXhpcy4gLS0+CiAgICAgPGRpdiBjbGFz
cz0iaXRlbSIgc3R5bGU9Im1heC1oZWlnaHQ6IDI1cHg7IGhlaWdodDogMTAwcHg7IGFzcGVjdC1y
YXRpbzogOC8xOyI+PC9kaXY+CiAgIDwvZGl2PgogCkBAIC01MCwyNSArNjIsMjcgQEAKICAgICAg
ICBiZWNhdXNlIGl0cyB2YWx1ZSBjb250YWlucyAnYXV0bycuIC0tPgogICA8ZGl2IGNsYXNzPSJm
bGV4Q29udGFpbmVyIiBzdHlsZT0id2lkdGg6IGF1dG87Ij4KICAgICA8IS0tIFRoZSBjb250ZW50
LWJveCBoZWlnaHQgMTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAg
ICAgeWllbGRpbmcgYSByZXNvbHZlZCBmbGV4IGJhc2Ugc2l6ZSBvZiAxOTBweC4gLS0+CisgICAg
ICAgICB5aWVsZGluZyBhIHJlc29sdmVkIGZsZXggYmFzZSBzaXplIChjb250ZW50LWJveCkgb2Yg
MTkwcHguIC0tPgogICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4td2lkdGg6MDsgaGVp
Z2h0OiAyNXB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMTkvMTsiPjwvZGl2PgogICA8L2Rpdj4KIAog
ICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAgICA8IS0tIFRoZSBjb250ZW50LWJveCBo
ZWlnaHQgMTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWll
bGRpbmcgYSByZXNvbHZlZCBtaW4td2lkdGg6YXV0byBvZiAxOTBweC4gLS0+CisgICAgPCEtLSBU
aGUgY29udGVudCBzaXplIHN1Z2dlc3Rpb24gKGNvbnRlbnQtYm94KSBpcyAxOTBweCBiZWNhdXNl
IHRoZQorICAgICAgICAgY29udGVudC1ib3ggaGVpZ2h0IDEwcHggaXMgdHJhbnNmZXJyZWQgdG8g
dGhlIG1haW4gYXhpcy4gLS0+CiAgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9ImhlaWdodDog
MjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDE5LzE7Ij48L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRp
diBjbGFzcz0iZmxleENvbnRhaW5lciI+Ci0gICAgPCEtLSBUaGUgY29udGVudC1ib3ggbWluLWhl
aWdodCAxMHB4IGlzIHRyYW5zZmVycmVkIHRvIHRoZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVs
ZGluZyBhIHJlc29sdmVkIG1pbi13aWR0aDphdXRvIG9mIDE5MHB4LiAtLT4KKyAgICA8IS0tIFRo
ZSBjb250ZW50IHNpemUgc3VnZ2VzdGlvbiAoY29udGVudC1ib3gpIGlzIDE5MHB4IGJlY2F1c2Ug
dGhlCisgICAgICAgICBjb250ZW50LWJveCBoZWlnaHQgMTBweCAoZW5mb3JjZWQgYnkgbWluLWhl
aWdodCkgaXMgdHJhbnNmZXJyZWQgdG8gdGhlCisgICAgICAgICBtYWluIGF4aXMuIC0tPgogICAg
IDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4taGVpZ2h0OiAyNXB4OyBhc3BlY3QtcmF0aW86
IGF1dG8gMTkvMTsiPjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFp
bmVyIj4KLSAgICA8IS0tIFRoZSBjb250ZW50LWJveCBoZWlnaHQgMTBweCAoY2xhbXBlZCBieSBt
YXgtaGVpZ2h0KSBpcyB0cmFuc2ZlcnJlZAotICAgICAgICAgdG8gdGhlIG1haW4gYXhpcywgeWll
bGRpbmcgYSByZXNvbHZlZCBtaW4td2lkdGg6YXV0byBvZiAxOTBweC4gLS0+CisgICAgPCEtLSBU
aGUgY29udGVudCBzaXplIHN1Z2dlc3Rpb24gKGNvbnRlbnQtYm94KSBpcyAxOTBweCBiZWNhdXNl
IHRoZQorICAgICAgICAgY29udGVudC1ib3ggaGVpZ2h0IDEwcHggKGNsYW1wZWQgYnkgbWF4LWhl
aWdodCkgaXMgdHJhbnNmZXJyZWQgdG8gdGhlCisgICAgICAgICBtYWluIGF4aXMuIC0tPgogICAg
IDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtYXgtaGVpZ2h0OiAyNXB4OyBoZWlnaHQ6IDEwMHB4
OyBhc3BlY3QtcmF0aW86IGF1dG8gMTkvMTsiPjwvZGl2PgogICA8L2Rpdj4KIDwvaHRtbD4KZGlm
ZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sIGIvTGF5
b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h
c3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwKaW5kZXggYzRhMjUwODE4YmI3
Nzg2ZTJmMzk1OTIyZDI4ZTNjNzUxOWI0ZWEzYS4uZmY2YmYyYWE1NjkwNTUxODA4Yjk4ZTcxMTdl
YzY1ZDkxNzhhMzQyNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0
aW8tMDI2Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0
bWwKQEAgLTQsNiArNCw4IEBACiAgIDxsaW5rIHJlbD0iYXV0aG9yIiB0aXRsZT0iVGluZy1ZdSBM
aW4iIGhyZWY9Im1haWx0bzp0bGluQG1vemlsbGEuY29tIj4KICAgPGxpbmsgcmVsPSJhdXRob3Ii
IHRpdGxlPSJNb3ppbGxhIiBocmVmPSJodHRwczovL3d3dy5tb3ppbGxhLm9yZy8iPgogICA8bGlu
ayByZWw9ImhlbHAiIGhyZWY9Imh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3Mtc2l6aW5nLTQv
I2FzcGVjdC1yYXRpbyI+CisgIDxsaW5rIHJlbD0iaGVscCIgaHJlZj0iaHR0cHM6Ly9kcmFmdHMu
Y3Nzd2cub3JnL2Nzcy1zaXppbmctNC8jYXNwZWN0LXJhdGlvLW1pbmltdW0iPgorICA8bGluayBy
ZWw9ImhlbHAiIGhyZWY9Imh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZmxleGJveC0xLyNt
aW4tc2l6ZS1hdXRvIj4KICAgPGxpbmsgcmVsPSJtYXRjaCIgaHJlZj0iLi4vLi4vcmVmZXJlbmNl
L3JlZi1maWxsZWQtZ3JlZW4tMjAwcHgtc3F1YXJlLmh0bWwiIC8+CiAgIDxzdHlsZT4KICAgLmZs
ZXhDb250YWluZXIgewpAQCAtMTksNjAgKzIxLDc0IEBACiAgICAgYm94LXNpemluZzogYm9yZGVy
LWJveDsKICAgfQogICAuaXRlbSA+IGRpdiB7Ci0gICAgaGVpZ2h0OiA1MDBweDsgLyogU2V0IGEg
bGFyZ2UgY29udGVudCBzaXplIHN1Z2dlc3Rpb24gZm9yIGZsZXggaXRlbS4gKi8KKyAgICBoZWln
aHQ6IDE5MHB4OyAvKiBTZXQgdGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIGZvciBmbGV4IGl0
ZW0uICovCiAgIH0KICAgPC9zdHlsZT4KIAogICA8cD5UZXN0IHBhc3NlcyBpZiB0aGVyZSBpcyBh
IGZpbGxlZCBncmVlbiBzcXVhcmUgYW5kIDxzdHJvbmc+bm8gcmVkPC9zdHJvbmc+LjwvcD4KIAor
ICA8IS0tIEluIGFsbCBvZiB0aGUgc3VidGVzdHMgaGVyZSwgZWFjaCBmbGV4IGl0ZW0ncyBhdXRv
bWF0aWMgbWluaW11bSBoZWlnaHQgaXMKKyAgICAgICByZXNvbHZlZCBkaXJlY3RseSBmcm9tIGl0
cyBjb250ZW50IHNpemUgc3VnZ2VzdGlvbi4gTm90YWJseSwgdGhlc2UgaXRlbXMKKyAgICAgICAq
ZG8gbm90KiBnZXQgYSAidHJhbnNmZXJyZWQgc2l6ZSBzdWdnZXN0aW9uIiwgYmVjYXVzZSB0aGV5
IGFyZSBhbGwKKyAgICAgICAqbm9uLXJlcGxhY2VkKiBlbGVtZW50czsgYW5kICJ0cmFuc2ZlcnJl
ZCBzaXplIHN1Z2dlc3Rpb24iIGlzIG9ubHkgdXNlZAorICAgICAgIGZvciByZXNvbHZpbmcgYXV0
b21hdGljIG1pbmltdW0gc2l6ZXMgb24gKnJlcGxhY2VkKiBlbGVtZW50cy4gSG93ZXZlciwKKyAg
ICAgICBub3RlIHRoYXQgd2UgZG8gInRyYW5zZmVyIiBzaXplcyB0aHJvdWdoIHRoZSBhc3BlY3Qg
cmF0aW8sIGFzIHBhcnQgb2YKKyAgICAgICBjb21wdXRpbmcgdGhlIGNvbnRlbnQgc2l6ZSBzdWdn
ZXN0aW9uIGFuZC9vciBmbGV4IGJhc2Ugc2l6ZS4gLS0+CisKICAgPCEtLSBJbiB0aGUgZm9sbG93
aW5nIGZvdXIgZmxleCBjb250YWluZXJzLCB0aGUgYXNwZWN0LXJhdGlvIHdvcmtzIHdpdGggYm9y
ZGVyLWJveC4gLS0+CiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiIHN0eWxlPSJoZWlnaHQ6
IGF1dG87Ij4KICAgICA8IS0tIFRoZSBib3JkZXItYm94IHdpZHRoIDI1cHggaXMgdHJhbnNmZXJy
ZWQgdG8gdGhlIG1haW4gYXhpcywKLSAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgZmxleCBi
YXNlIHNpemUgb2YgMjAwcHguIC0tPgorICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBmbGV4
IGJhc2Ugc2l6ZSAoYm9yZGVyLWJveCkgb2YgMjAwcHguIC0tPgogICAgIDxkaXYgY2xhc3M9Iml0
ZW0iIHN0eWxlPSJtaW4taGVpZ2h0OjA7IHdpZHRoOiAyNXB4OyBhc3BlY3QtcmF0aW86IDEvODsi
PjxkaXY+PC9kaXY+PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWlu
ZXIiPgotICAgIDwhLS0gVGhlIGJvcmRlci1ib3ggd2lkdGggMjVweCBpcyB0cmFuc2ZlcnJlZCB0
byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0
OmF1dG8gb2YgMjAwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJ3aWR0aDog
MjVweDsgYXNwZWN0LXJhdGlvOiAxLzg7Ij48ZGl2PjwvZGl2PjwvZGl2PgorICAgIDwhLS0gVGhl
IGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIGlzIDE5MHB4LCBpLmUuIHRoZSBoZWlnaHQgb2YgdGhl
IGl0ZW0ncworICAgICAgICAgY2hpbGQgZGl2LiAtLT4KKyAgICA8ZGl2IGNsYXNzPSJpdGVtIiBz
dHlsZT0id2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogMS8xOyI+PGRpdj48L2Rpdj48L2Rpdj4K
ICAgPC9kaXY+CiAKICAgPGRpdiBjbGFzcz0iZmxleENvbnRhaW5lciI+Ci0gICAgPCEtLSBUaGUg
Ym9yZGVyLWJveCBtaW4td2lkdGggMjVweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlz
LAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8gb2YgMjAwcHgu
IC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtaW4td2lkdGg6IDI1cHg7IGFzcGVj
dC1yYXRpbzogMS84OyI+PGRpdj48L2Rpdj48L2Rpdj4KKyAgICA8IS0tIFRoZSBjb250ZW50IHNp
emUgc3VnZ2VzdGlvbiBpcyAxOTBweCwgaS5lLiB0aGUgaGVpZ2h0IG9mIHRoZSBpdGVtJ3MKKyAg
ICAgICAgIGNoaWxkIGRpdi4gLS0+CisgICAgPGRpdiBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi13
aWR0aDogMjVweDsgYXNwZWN0LXJhdGlvOiAxLzE7Ij48ZGl2PjwvZGl2PjwvZGl2PgogICA8L2Rp
dj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFpbmVyIj4KLSAgICA8IS0tIFRoZSBib3JkZXIt
Ym94IHdpZHRoIDI1cHggKGNsYW1wZWQgYnkgbWF4LXdpZHRoKSBpcyB0cmFuc2ZlcnJlZCB0byB0
aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1
dG8gb2YgMjAwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtYXgtd2lkdGg6
IDI1cHg7IHdpZHRoOiAxMDBweDsgYXNwZWN0LXJhdGlvOiAxLzg7Ij48ZGl2PjwvZGl2PjwvZGl2
PgorICAgIDwhLS0gVGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIGlzIDIwMHB4IGJlY2F1c2Ug
dGhlIGJvcmRlci1ib3ggbWF4LXdpZHRoCisgICAgICAgICAyNXB4IGlzIHRyYW5zZmVycmVkIHRv
IHRoZSBtYWluIGF4aXMgYXMgdGhlIHVwcGVyIGJvdW5kIG9mIGl0cworICAgICAgICAgYm9yZGVy
LWJveCBoZWlnaHQuIC0tPgorICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtYXgtd2lkdGg6
IDI1cHg7IHdpZHRoOiAxMDBweDsgYXNwZWN0LXJhdGlvOiAxLzg7Ij4KKyAgICAgIDxkaXYgc3R5
bGU9ImhlaWdodDogNTAwcHgiPjwvZGl2PgorICAgIDwvZGl2PgogICA8L2Rpdj4KIAogICA8IS0t
IEluIHRoZSBmb2xsb3dpbmcgZm91ciBmbGV4IGNvbnRhaW5lcnMsIHRoZSBhc3BlY3QtcmF0aW8g
d29ya3Mgd2l0aCBjb250ZW50LWJveAogICAgICAgIGJlY2F1c2UgaXRzIHZhbHVlIGNvbnRhaW5z
ICdhdXRvJy4gLS0+CiAgIDxkaXYgY2xhc3M9ImZsZXhDb250YWluZXIiIHN0eWxlPSJoZWlnaHQ6
IGF1dG87Ij4KICAgICA8IS0tIFRoZSBjb250ZW50LWJveCB3aWR0aCAxMHB4IGlzIHRyYW5zZmVy
cmVkIHRvIHRoZSBtYWluIGF4aXMsCi0gICAgICAgICB5aWVsZGluZyBhIHJlc29sdmVkIGZsZXgg
YmFzZSBzaXplIG9mIDE5MHB4LiAtLT4KKyAgICAgICAgIHlpZWxkaW5nIGEgcmVzb2x2ZWQgZmxl
eCBiYXNlIHNpemUgKGNvbnRlbnQtYm94KSBvZiAxOTBweC4gLS0+CiAgICAgPGRpdiBjbGFzcz0i
aXRlbSIgc3R5bGU9Im1pbi1oZWlnaHQ6MDsgd2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0
byAxLzE5OyI+PGRpdj48L2Rpdj48L2Rpdj4KICAgPC9kaXY+CiAKICAgPGRpdiBjbGFzcz0iZmxl
eENvbnRhaW5lciI+Ci0gICAgPCEtLSBUaGUgY29udGVudC1ib3ggd2lkdGggMTBweCBpcyB0cmFu
c2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBt
aW4taGVpZ2h0OmF1dG8gb2YgMTkwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxl
PSJ3aWR0aDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEvMTk7Ij48ZGl2PjwvZGl2PjwvZGl2
PgorICAgIDwhLS0gVGhlIGNvbnRlbnQgc2l6ZSBzdWdnZXN0aW9uIGlzIDE5MHB4LCBpLmUuIHRo
ZSBoZWlnaHQgb2YgdGhlIGl0ZW0ncworICAgICAgICAgY2hpbGQgZGl2LiAtLT4KKyAgICA8ZGl2
IGNsYXNzPSJpdGVtIiBzdHlsZT0id2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE7
Ij48ZGl2PjwvZGl2PjwvZGl2PgogICA8L2Rpdj4KIAogICA8ZGl2IGNsYXNzPSJmbGV4Q29udGFp
bmVyIj4KLSAgICA8IS0tIFRoZSBjb250ZW50LWJveCBtaW4td2lkdGggMTBweCBpcyB0cmFuc2Zl
cnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAgeWllbGRpbmcgYSByZXNvbHZlZCBtaW4t
aGVpZ2h0OmF1dG8gb2YgMTkwcHguIC0tPgotICAgIDxkaXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJt
aW4td2lkdGg6IDI1cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE5OyI+PGRpdj48L2Rpdj48L2Rp
dj4KKyAgICA8IS0tIFRoZSBjb250ZW50IHNpemUgc3VnZ2VzdGlvbiBpcyAxOTBweCwgaS5lLiB0
aGUgaGVpZ2h0IG9mIHRoZSBpdGVtJ3MKKyAgICAgICAgIGNoaWxkIGRpdi4gLS0+CisgICAgPGRp
diBjbGFzcz0iaXRlbSIgc3R5bGU9Im1pbi13aWR0aDogMjVweDsgYXNwZWN0LXJhdGlvOiBhdXRv
IDEvMTsiPjxkaXY+PC9kaXY+PC9kaXY+CiAgIDwvZGl2PgogCiAgIDxkaXYgY2xhc3M9ImZsZXhD
b250YWluZXIiPgotICAgIDwhLS0gVGhlIGNvbnRlbnQtYm94IHdpZHRoIDEwcHggKGNsYW1wZWQg
YnkgbWF4LXdpZHRoKSBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzLAotICAgICAgICAg
eWllbGRpbmcgYSByZXNvbHZlZCBtaW4taGVpZ2h0OmF1dG8gb2YgMTkwcHguIC0tPgotICAgIDxk
aXYgY2xhc3M9Iml0ZW0iIHN0eWxlPSJtYXgtd2lkdGg6IDI1cHg7IHdpZHRoOiAxMDBweDsgYXNw
ZWN0LXJhdGlvOiBhdXRvIDEvMTk7Ij48ZGl2PjwvZGl2PjwvZGl2PgorICAgIDwhLS0gVGhlIGNv
bnRlbnQgc2l6ZSBzdWdnZXN0aW9uIGlzIDE5MHB4IGJlY2F1c2UgdGhlIGNvbnRlbnQtYm94IG1h
eC13aWR0aAorICAgICAgICAgMTBweCBpcyB0cmFuc2ZlcnJlZCB0byB0aGUgbWFpbiBheGlzIGFz
IHRoZSB1cHBlciBib3VuZCBvZiBpdHMKKyAgICAgICAgIGNvbnRlbnQtYm94IGhlaWdodC4tLT4K
KyAgICA8ZGl2IGNsYXNzPSJpdGVtIiBzdHlsZT0ibWF4LXdpZHRoOiAyNXB4OyB3aWR0aDogMTAw
cHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzE5OyI+CisgICAgICA8ZGl2IHN0eWxlPSJoZWlnaHQ6
IDUwMHB4Ij48L2Rpdj4KKyAgICA8L2Rpdj4KICAgPC9kaXY+CiA8L2h0bWw+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>433785</attachid>
            <date>2021-07-19 06:04:39 -0700</date>
            <delta_ts>2021-09-06 23:36:57 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210719150438.patch</filename>
            <type>text/plain</type>
            <size>9321</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMDIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2M0YTFlMGQ5N2E0OTJl
MzFhYzEwZjk4ZmIxODBlYmVlMGQxZWQwNy4uNjQyZTU4ZWMyZDlhNzk2NmJjNzZkOTE3YjA2NmY4
MzQxMmU3MDMxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA3LTE5ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBNYWtlIGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nIHRha2UgaW50byBh
Y2NvdW50CisgICAgICAgIGJveC1zaXppbmcgZm9yIHRoZSBjYXNlIHdoZXJlIENTUyBhc3BlY3Qt
cmF0aW8gaXMgYXBwbGllZC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRo
VXNpbmcgY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6
CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJv
bUFzcGVjdFJhdGlvVXNpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGli
bGVCb3g6OmNvbXB1dGVJbm5lckZsZXhCYXNlU2l6ZUZvckNoaWxkKToKKyAgICAgICAgKFdlYkNv
cmU6OlJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlRmxleEl0ZW1NaW5NYXhTaXplcyk6CisgICAg
ICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29uc3RydWN0RmxleEl0ZW0pOgorCiAy
MDIxLTA3LTE5ICBaaXJhbiBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0NTUy1n
cmlkXSBJZ25vcmUgdGhlIGFzcGVjdC1yYXRpbyBvZiBhIHJlcGxhY2VkIGVsZW1lbnQgaWYgc3Ry
ZXRjaCBhbGlnbm1lbnRzIGFyZSBhcHBsaWVkIHRvIGJvdGggYXhlcwpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCAwYWMwZjEzM2IzZjNmYTY0YzYwNzJlYTE1MDUyNjVk
M2RlMzcyOWQ1Li4wN2YwNmZiN2QwOGQxNWIyOGIzZmZiZWUxOTdjNTY4ZmRlY2QxNjRhIDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3Vy
Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtMjY4OSw5ICsyNjg5LDEwIEBA
IExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRoVXNpbmco
TGVuZ3RoIGxvZ2ljYWxXaWR0aExlbmd0CiAKICAgICBMYXlvdXRVbml0IG1pbkxvZ2ljYWxXaWR0
aDsKICAgICBMYXlvdXRVbml0IG1heExvZ2ljYWxXaWR0aDsKLSAgICBpZiAoIWxvZ2ljYWxXaWR0
aExlbmd0aC5pc01pbkludHJpbnNpYygpICYmIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9t
QXNwZWN0UmF0aW8oKSkKKyAgICBpZiAoIWxvZ2ljYWxXaWR0aExlbmd0aC5pc01pbkludHJpbnNp
YygpICYmIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSkgewogICAg
ICAgICBtaW5Mb2dpY2FsV2lkdGggPSBtYXhMb2dpY2FsV2lkdGggPSBjb21wdXRlTG9naWNhbFdp
ZHRoRnJvbUFzcGVjdFJhdGlvKCk7Ci0gICAgZWxzZQorICAgICAgICBib3JkZXJBbmRQYWRkaW5n
ID0gTGF5b3V0VW5pdCgpOworICAgIH0gZWxzZQogICAgICAgICBjb21wdXRlSW50cmluc2ljS2V5
d29yZExvZ2ljYWxXaWR0aHMobWluTG9naWNhbFdpZHRoLCBtYXhMb2dpY2FsV2lkdGgpOwogCiAg
ICAgaWYgKGxvZ2ljYWxXaWR0aExlbmd0aC5pc01pbkNvbnRlbnQoKSB8fCBsb2dpY2FsV2lkdGhM
ZW5ndGguaXNNaW5JbnRyaW5zaWMoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl
cmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu
ZGVyRmxleGlibGVCb3guY3BwCmluZGV4IGVmOWVkNDJhYjUwMjBhMDViZGUzMmU1NTU0OGQ0ZjY5
ZGVmMmEzOWQuLmRlN2YzZjllOTY0ZWE2NjFiMjc0M2U1YjJjMGMxM2VlYTk0Y2Q2NDUgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysr
IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtODY1
LDkgKzg2NSw3IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6
ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJvCiB7CiAgICAgQVNTRVJUKGNoaWxk
SGFzQXNwZWN0UmF0aW8oY2hpbGQpKTsKIAotICAgIGF1dG8gYWRqdXN0Rm9yQm94U2l6aW5nID0g
W3RoaXNdIChjb25zdCBSZW5kZXJCb3gmIGJveCwgTGVuZ3RoIGxlbmd0aCkgLT4gTGF5b3V0VW5p
dCB7Ci0gICAgICAgIEFTU0VSVChsZW5ndGguaXNGaXhlZCgpKTsKLSAgICAgICAgYXV0byB2YWx1
ZSA9IExheW91dFVuaXQobGVuZ3RoLnZhbHVlKCkpOworICAgIGF1dG8gYWRqdXN0Rm9yQm94U2l6
aW5nID0gW3RoaXNdIChjb25zdCBSZW5kZXJCb3gmIGJveCwgTGF5b3V0VW5pdCB2YWx1ZSkgLT4g
TGF5b3V0VW5pdCB7CiAgICAgICAgIC8vIFdlIG5lZWQgdG8gc3Vic3RyYWN0IHRoZSBib3JkZXIg
YW5kIHBhZGRpbmcgZXh0ZW50IGZyb20gdGhlIGNyb3NzIGF4aXMuCiAgICAgICAgIC8vIEZ1cnRo
ZXJtb3JlLCB0aGUgc2l6aW5nIGNhbGN1bGF0aW9ucyB0aGF0IGZsb29yIHRoZSBjb250ZW50IGJv
eCBzaXplIGF0IHplcm8gd2hlbiBhcHBseWluZyBib3gtc2l6aW5nIGFyZSBhbHNvIGlnbm9yZWQu
CiAgICAgICAgIC8vIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZmxleGJveC8jYWxnby1t
YWluLWl0ZW0uCkBAIC04NzYsMjkgKzg3NCwzOCBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxl
Qm94Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjb25zdCBSZW5kZXJCbwog
ICAgICAgICByZXR1cm4gdmFsdWU7CiAgICAgfTsKIAotICAgIHN0ZDo6b3B0aW9uYWw8TGF5b3V0
VW5pdD4gY3Jvc3NTaXplOworICAgIExheW91dFVuaXQgY3Jvc3NTaXplOworICAgIC8vIGNyb3Nz
U2l6ZSBpcyBib3JkZXItYm94IHNpemUgaWYgYm94LXNpemluZyBpcyBib3JkZXItYm94LCBhbmQK
KyAgICAvLyBjb250ZW50LWJveCBvdGhlcndpc2UuCiAgICAgaWYgKGNyb3NzU2l6ZUxlbmd0aC5p
c0ZpeGVkKCkpCi0gICAgICAgIGNyb3NzU2l6ZSA9IGFkanVzdEZvckJveFNpemluZyhjaGlsZCwg
Y3Jvc3NTaXplTGVuZ3RoKTsKKyAgICAgICAgY3Jvc3NTaXplID0gTGF5b3V0VW5pdChjcm9zc1Np
emVMZW5ndGgudmFsdWUoKSk7CiAgICAgZWxzZSBpZiAoY3Jvc3NTaXplTGVuZ3RoLmlzQXV0bygp
KQogICAgICAgICBjcm9zc1NpemUgPSBjb21wdXRlQ3Jvc3NTaXplRm9yQ2hpbGRVc2luZ0NvbnRh
aW5lckNyb3NzU2l6ZShjaGlsZCk7CiAgICAgZWxzZSB7CiAgICAgICAgIEFTU0VSVChjcm9zc1Np
emVMZW5ndGguaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkpOwotICAgICAgICBjcm9zc1NpemUgPSBt
YWluQXhpc0lzQ2hpbGRJbmxpbmVBeGlzKGNoaWxkKSA/IGNoaWxkLmNvbXB1dGVQZXJjZW50YWdl
TG9naWNhbEhlaWdodChjcm9zc1NpemVMZW5ndGgpIDogYWRqdXN0Qm9yZGVyQm94TG9naWNhbFdp
ZHRoRm9yQm94U2l6aW5nKHZhbHVlRm9yTGVuZ3RoKGNyb3NzU2l6ZUxlbmd0aCwgY29udGVudFdp
ZHRoKCkpLCBjcm9zc1NpemVMZW5ndGgudHlwZSgpKTsKLSAgICAgICAgaWYgKCFjcm9zc1NpemUp
CisgICAgICAgIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gY2hpbGRTaXplID0gbWFpbkF4aXNJ
c0NoaWxkSW5saW5lQXhpcyhjaGlsZCkgPyBjaGlsZC5jb21wdXRlUGVyY2VudGFnZUxvZ2ljYWxI
ZWlnaHQoY3Jvc3NTaXplTGVuZ3RoKSA6IGFkanVzdEJvcmRlckJveExvZ2ljYWxXaWR0aEZvckJv
eFNpemluZyh2YWx1ZUZvckxlbmd0aChjcm9zc1NpemVMZW5ndGgsIGNvbnRlbnRXaWR0aCgpKSwg
Y3Jvc3NTaXplTGVuZ3RoLnR5cGUoKSk7CisgICAgICAgIGlmICghY2hpbGRTaXplKQogICAgICAg
ICAgICAgcmV0dXJuIDBfbHU7CisgICAgICAgIGNyb3NzU2l6ZSA9IGNoaWxkU2l6ZS52YWx1ZSgp
OwogICAgIH0KIAogICAgIGNvbnN0IExheW91dFNpemUmIGNoaWxkSW50cmluc2ljU2l6ZSA9IGNo
aWxkLmludHJpbnNpY1NpemUoKTsKICAgICBkb3VibGUgcmF0aW87Ci0gICAgaWYgKGNoaWxkLnN0
eWxlKCkuYXNwZWN0UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpSYXRpbyB8fCAoY2hp
bGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OkF1dG9BbmRS
YXRpbyAmJiBjaGlsZEludHJpbnNpY1NpemUuaXNFbXB0eSgpKSkKKyAgICBMYXlvdXRVbml0IGJv
cmRlckFuZFBhZGRpbmc7CisgICAgaWYgKGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9UeXBlKCkg
PT0gQXNwZWN0UmF0aW9UeXBlOjpSYXRpbyB8fCAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5
cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OkF1dG9BbmRSYXRpbyAmJiBjaGlsZEludHJpbnNpY1Np
emUuaXNFbXB0eSgpKSkgewogICAgICAgICByYXRpbyA9IGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0
aW9XaWR0aCgpIC8gY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb0hlaWdodCgpOwotICAgIGVsc2Ug
eworICAgICAgICBpZiAoY2hpbGQuc3R5bGUoKS5ib3hTaXppbmdGb3JBc3BlY3RSYXRpbygpID09
IEJveFNpemluZzo6Q29udGVudEJveCkKKyAgICAgICAgICAgIGNyb3NzU2l6ZSAtPSBpc0hvcml6
b250YWxGbG93KCkgPyBjaGlsZC52ZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKSA6IGNo
aWxkLmhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCk7CisgICAgICAgIGVsc2UKKyAg
ICAgICAgICAgIGJvcmRlckFuZFBhZGRpbmcgPSBpc0hvcml6b250YWxGbG93KCkgPyBjaGlsZC5o
b3Jpem9udGFsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpIDogY2hpbGQudmVydGljYWxCb3JkZXJB
bmRQYWRkaW5nRXh0ZW50KCk7CisgICAgfSBlbHNlIHsKICAgICAgICAgQVNTRVJUKGNoaWxkSW50
cmluc2ljU2l6ZS5oZWlnaHQoKSk7CiAgICAgICAgIHJhdGlvID0gY2hpbGRJbnRyaW5zaWNTaXpl
LndpZHRoKCkudG9GbG9hdCgpIC8gY2hpbGRJbnRyaW5zaWNTaXplLmhlaWdodCgpLnRvRmxvYXQo
KTsKKyAgICAgICAgY3Jvc3NTaXplID0gYWRqdXN0Rm9yQm94U2l6aW5nKGNoaWxkLCBjcm9zc1Np
emUpOwogICAgIH0KICAgICBpZiAoaXNIb3Jpem9udGFsRmxvdygpKQotICAgICAgICByZXR1cm4g
TGF5b3V0VW5pdChjcm9zc1NpemUudmFsdWUoKSAqIHJhdGlvKTsKLSAgICByZXR1cm4gTGF5b3V0
VW5pdChjcm9zc1NpemUudmFsdWUoKSAvIHJhdGlvKTsKKyAgICAgICAgcmV0dXJuIExheW91dFVu
aXQoY3Jvc3NTaXplICogcmF0aW8pIC0gYm9yZGVyQW5kUGFkZGluZzsKKyAgICByZXR1cm4gTGF5
b3V0VW5pdChjcm9zc1NpemUgLyByYXRpbykgLSBib3JkZXJBbmRQYWRkaW5nOwogfQogCiB2b2lk
IFJlbmRlckZsZXhpYmxlQm94OjpzZXRGbG93QXdhcmVMb2NhdGlvbkZvckNoaWxkKFJlbmRlckJv
eCYgY2hpbGQsIGNvbnN0IExheW91dFBvaW50JiBsb2NhdGlvbikKQEAgLTEwMjcsNiArMTAzNCw4
IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVJbm5lckZsZXhCYXNlU2l6
ZUZvckNoaWxkKFJlbmRlckJveCYgY2hpbGQsCiAgICAgICAgIC8vIHdpZHRoIGluY2x1ZGVzIHRo
ZSBzY3JvbGxiYXIsIGV2ZW4gZm9yIG92ZXJmbG93OiBhdXRvLgogICAgICAgICBtYWluQXhpc0V4
dGVudCA9IGNoaWxkLm1heFByZWZlcnJlZExvZ2ljYWxXaWR0aCgpOwogICAgIH0KKyAgICBpZiAo
Y2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OkF1dG9B
bmRSYXRpbykKKyAgICAgICAgcmV0dXJuIG1haW5BeGlzRXh0ZW50ICsgbWFpbkF4aXNCb3JkZXJB
bmRQYWRkaW5nOwogICAgIHJldHVybiBtYWluQXhpc0V4dGVudCAtIG1haW5BeGlzQm9yZGVyQW5k
UGFkZGluZzsKIH0KIApAQCAtMTI3MSw2ICsxMjgwLDExIEBAIHN0ZDo6cGFpcjxMYXlvdXRVbml0
LCBMYXlvdXRVbml0PiBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZUZsZXhJdGVtTWluTWF4U2l6
ZXMoCiAgICAgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiBtYXhFeHRlbnQgPSBzdGQ6Om51bGxv
cHQ7CiAgICAgaWYgKG1heC5pc1NwZWNpZmllZE9ySW50cmluc2ljKCkpCiAgICAgICAgIG1heEV4
dGVudCA9IGNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNoaWxkLCBNYXhTaXplLCBtYXgp
OworICAgIGVsc2UgaWYgKGNoaWxkLnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSkgeworICAgICAg
ICBtYXggPSBjcm9zc1NpemVMZW5ndGhGb3JDaGlsZChNYXhTaXplLCBjaGlsZCk7CisgICAgICAg
IGlmIChtYXguaXNTcGVjaWZpZWRPckludHJpbnNpYygpKQorICAgICAgICAgICAgbWF4RXh0ZW50
ID0gY29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoY2hpbGQsIG1heCk7CisgICAg
fQogCiAgICAgTGVuZ3RoIG1pbiA9IG1haW5TaXplTGVuZ3RoRm9yQ2hpbGQoTWluU2l6ZSwgY2hp
bGQpOwogICAgIC8vIEludHJpbnNpYyBzaXplcyBpbiBjaGlsZCdzIGJsb2NrIGF4aXMgYXJlIGhh
bmRsZWQgYnkgdGhlIG1pbi1zaXplOmF1dG8gY29kZSBwYXRoLgpAQCAtMTM3MSw3ICsxMzg1LDgg
QEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6YWRqdXN0Q2hpbGRTaXplRm9yQXNwZWN0
UmF0aW9Dcm9zc0F4aXNNaW5BbmRNYXgoY28KIEZsZXhJdGVtIFJlbmRlckZsZXhpYmxlQm94Ojpj
b25zdHJ1Y3RGbGV4SXRlbShSZW5kZXJCb3gmIGNoaWxkLCBib29sIHJlbGF5b3V0Q2hpbGRyZW4p
CiB7CiAgICAgYXV0byBjaGlsZEhhZExheW91dCA9IGNoaWxkLmV2ZXJIYWRMYXlvdXQoKTsKLSAg
ICBjaGlsZC5jbGVhck92ZXJyaWRpbmdDb250ZW50U2l6ZSgpOworICAgIGlmICghY2hpbGQuc3R5
bGUoKS5oYXNBc3BlY3RSYXRpbygpKQorICAgICAgICBjaGlsZC5jbGVhck92ZXJyaWRpbmdDb250
ZW50U2l6ZSgpOwogICAgIGlmIChjaGlsZEhhc0ludHJpbnNpY01haW5BeGlzU2l6ZShjaGlsZCkp
IHsKICAgICAgICAgLy8gSWYgdGhpcyBjb25kaXRpb24gaXMgdHJ1ZSwgdGhlbiBjb21wdXRlTWFp
bkF4aXNFeHRlbnRGb3JDaGlsZCB3aWxsIGNhbGwKICAgICAgICAgLy8gY2hpbGQuaW50cmluc2lj
Q29udGVudExvZ2ljYWxIZWlnaHQoKSBhbmQgY2hpbGQuc2Nyb2xsYmFyTG9naWNhbEhlaWdodCgp
LApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdl
TG9nCmluZGV4IDJiZjIyOGZhNzhhOTY1NWYxNDIxMGIwM2NlMGY4NTAyMDdjZmU5YzMuLjg2Yjcw
MzhkYWExOTQ1ODY3MTk3MmY3ZjkwNWIyOWFiMDFlYjBlODQgMTAwNjQ0Ci0tLSBhL0xheW91dFRl
c3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBA
QAorMjAyMS0wNy0xOSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIEZp
eCBmbGV4LWFzcGVjdC1yYXRpby0wMjUrMjYuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyMzU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C
T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTA3LTE5
ICBaaXJhbiBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0NTUy1ncmlkXSBJZ25v
cmUgdGhlIGFzcGVjdC1yYXRpbyBvZiBhIHJlcGxhY2VkIGVsZW1lbnQgaWYgc3RyZXRjaCBhbGln
bm1lbnRzIGFyZSBhcHBsaWVkIHRvIGJvdGggYXhlcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv
VGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggOTcz
OTA4MzUzMWI2ZDdjNzNlMzg5OTQ2ZGM0NzU4NDg2ZWNlYTkyNS4uZjliOWU4ODJlMmI5YWMyYmEw
MzgyMDY2MTdmYTVjMzdiYjkyN2MyZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVj
dGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NzMyLDcgKzQ3
MzIsNiBAQCB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvLwogIyBmbGV4LWJhc2lzOmNvbnRlbnQKIHdl
YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDIxLmh0bWwgWyBJbWFnZU9u
bHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDIy
Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1h
c3BlY3QtcmF0aW8tMDI1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8y
MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl
Y3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
IHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE4Lmh0bWwgWyBJbWFn
ZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8t
MDE5Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>437454</attachid>
            <date>2021-09-06 23:37:05 -0700</date>
            <delta_ts>2021-09-08 07:09:13 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210907083703.patch</filename>
            <type>text/plain</type>
            <size>1728</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMDU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDYzMDY3ZjhiZjBiYjNj
YTg0ZjE3YmE4M2I5M2I1YzUxOTk3Y2FkOC4uYmQ0MGM1YmJlYjA3MTcxNmUwMmIxMDQ1MTBkYWE1
YjIzNmYyZTQwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA5LTA2ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBXSVAuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwOgorICAgICAg
ICAoV2ViQ29yZTo6UmVuZGVyVGhlbWU6OmFkanVzdFN0eWxlKToKKwogMjAyMS0wOS0wNiAgRW5y
aXF1ZSBPY2HDsWEgR29uesOhbGV6ICA8ZW9jYW5oYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtH
U3RyZWFtZXJdW01TRV0gQ2hlY2sgQ29udGVudFR5cGUgcGFyYW1ldGVycyB3aGVuIGNoZWNraW5n
IHN1cHBvcnRlZCB0eXBlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl
bmRlclRoZW1lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHAK
aW5kZXggOGZiZGI1NmMzYTBmNzBkODdiNDU2ZjcwMWI3MWQ5N2QyYTNhZGZmOS4uZThkNDBiYTY0
NWEyOGQ3YWExMzY4OWIwZjRlZjY5OTIwYWFhOWNjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv
cmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp
bmcvUmVuZGVyVGhlbWUuY3BwCkBAIC0xNjcsOSArMTY3LDkgQEAgdm9pZCBSZW5kZXJUaGVtZTo6
YWRqdXN0U3R5bGUoUmVuZGVyU3R5bGUmIHN0eWxlLCBjb25zdCBFbGVtZW50KiBlbGVtZW50LCBj
b25zdAogCiAgICAgICAgIC8vIE1pbi1XaWR0aCAvIE1pbi1IZWlnaHQKICAgICAgICAgTGVuZ3Ro
U2l6ZSBtaW5Db250cm9sU2l6ZSA9IFRoZW1lOjpzaW5nbGV0b24oKS5taW5pbXVtQ29udHJvbFNp
emUocGFydCwgc3R5bGUuZm9udENhc2NhZGUoKSwgeyBzdHlsZS5taW5XaWR0aCgpLCBzdHlsZS5t
aW5IZWlnaHQoKSB9LCB7IHN0eWxlLndpZHRoKCksIHN0eWxlLmhlaWdodCgpIH0sIHN0eWxlLmVm
ZmVjdGl2ZVpvb20oKSk7Ci0gICAgICAgIGlmIChtaW5Db250cm9sU2l6ZS53aWR0aCAhPSBzdHls
ZS5taW5XaWR0aCgpKQorICAgICAgICBpZiAobWluQ29udHJvbFNpemUud2lkdGgudmFsdWUoKSA+
IHN0eWxlLm1pbldpZHRoKCkudmFsdWUoKSkKICAgICAgICAgICAgIHN0eWxlLnNldE1pbldpZHRo
KFdURk1vdmUobWluQ29udHJvbFNpemUud2lkdGgpKTsKLSAgICAgICAgaWYgKG1pbkNvbnRyb2xT
aXplLmhlaWdodCAhPSBzdHlsZS5taW5IZWlnaHQoKSkKKyAgICAgICAgaWYgKG1pbkNvbnRyb2xT
aXplLmhlaWdodC52YWx1ZSgpID4gc3R5bGUubWluSGVpZ2h0KCkudmFsdWUoKSkKICAgICAgICAg
ICAgIHN0eWxlLnNldE1pbkhlaWdodChXVEZNb3ZlKG1pbkNvbnRyb2xTaXplLmhlaWdodCkpOwog
CiAgICAgICAgIC8vIEZvbnQK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>437625</attachid>
            <date>2021-09-08 07:09:22 -0700</date>
            <delta_ts>2021-09-08 08:09:16 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222357-20210908160921.patch</filename>
            <type>text/plain</type>
            <size>1322</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMTQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjk3NzcxYzE4NjY2MGE4
NDRiMDE2YWZkNDY1NmRhMjYwOGYzOWE4Yy4uOTkxZWYxMTRmNzc1OWNjZTIwMTU3OThjZWVlMTc4
OWMyYTBhOWNkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA5LTA4ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGZsZXgtYXNwZWN0LXJhdGlv
LTAyNSsyNi5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjIzNTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBXSVAuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAg
KFdlYkNvcmU6OlJlbmRlckJveDo6cmVxdWlyZXNMYXllcldpdGhTY3JvbGxhYmxlQXJlYSBjb25z
dCk6CisKIDIwMjEtMDktMDggIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+
CiAKICAgICAgICAgQWRkIGEgZmFzdCBwYXRoIGZvciBhdG9taXppbmcgc3RyaW5ncyB3aGVuIHBh
cnNpbmcgSFRNTApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJv
eC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCAwZDc5
YjQ0N2E3N2E4YTcxZDI2MWE4Y2Q1ODQzZWU3MDQxZWRjN2ZiLi5hNzE3MjU5NjhhYjk2NjU0MmQ4
YWY4N2ZhNDQyNzBiYWFlMjJjNjkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp
bmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94
LmNwcApAQCAtOTU5LDcgKzk1OSw3IEBAIGJvb2wgUmVuZGVyQm94OjpyZXF1aXJlc0xheWVyV2l0
aFNjcm9sbGFibGVBcmVhKCkgY29uc3QKIHsKICAgICAvLyBGSVhNRTogVGhpcyBpcyB3cm9uZzsg
dGhlc2UgYm94ZXMnIGxheWVycyBzaG91bGQgbm90IG5lZWQgU2Nyb2xsYWJsZUFyZWFzIHZpYSBS
ZW5kZXJMYXllci4KICAgICBpZiAoaXNSZW5kZXJWaWV3KCkgfHwgaXNEb2N1bWVudEVsZW1lbnRS
ZW5kZXJlcigpKQotICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwog
CiAgICAgaWYgKGhhc1BvdGVudGlhbGx5U2Nyb2xsYWJsZU92ZXJmbG93KCkpCiAgICAgICAgIHJl
dHVybiB0cnVlOwo=
</data>
<flag name="commit-queue"
          id="460829"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
      

    </bug>

</bugzilla>