<?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>232012</bug_id>
          
          <creation_ts>2021-10-20 06:33:58 -0700</creation_ts>
          <short_desc>Add over-constrained direction check to computePositionedLogicalHeightUsing</short_desc>
          <delta_ts>2022-09-09 13:53:56 -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>Layout and Rendering</component>
          <version>WebKit Local Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          <see_also>https://bugs.webkit.org/show_bug.cgi?id=209080</see_also>
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Rob Buis">rbuis</reporter>
          <assigned_to name="Rob Buis">rbuis</assigned_to>
          <cc>bfulgham</cc>
    
    <cc>changseok</cc>
    
    <cc>darin</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>glenn</cc>
    
    <cc>kondapallykalyan</cc>
    
    <cc>pdr</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>svillar</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>zalan</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1806594</commentid>
    <comment_count>0</comment_count>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-10-20 06:33:58 -0700</bug_when>
    <thetext>Fix abspos-020.html</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1806597</commentid>
    <comment_count>1</comment_count>
      <attachid>441875</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-10-20 06:37:07 -0700</bug_when>
    <thetext>Created attachment 441875
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1808244</commentid>
    <comment_count>2</comment_count>
      <attachid>442315</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-10-24 12:06:01 -0700</bug_when>
    <thetext>Created attachment 442315
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1808303</commentid>
    <comment_count>3</comment_count>
      <attachid>442340</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-10-24 23:34:07 -0700</bug_when>
    <thetext>Created attachment 442340
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1808360</commentid>
    <comment_count>4</comment_count>
      <attachid>442363</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-10-25 05:53:16 -0700</bug_when>
    <thetext>Created attachment 442363
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1808483</commentid>
    <comment_count>5</comment_count>
      <attachid>442387</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-10-25 10:58:59 -0700</bug_when>
    <thetext>Created attachment 442387
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1808521</commentid>
    <comment_count>6</comment_count>
      <attachid>442397</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-10-25 12:20:54 -0700</bug_when>
    <thetext>Created attachment 442397
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1808537</commentid>
    <comment_count>7</comment_count>
      <attachid>442402</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-10-25 12:50:25 -0700</bug_when>
    <thetext>Created attachment 442402
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1808560</commentid>
    <comment_count>8</comment_count>
      <attachid>442406</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-10-25 13:41:59 -0700</bug_when>
    <thetext>Created attachment 442406
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1809228</commentid>
    <comment_count>9</comment_count>
      <attachid>442581</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-10-27 05:14:47 -0700</bug_when>
    <thetext>Created attachment 442581
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1809235</commentid>
    <comment_count>10</comment_count>
      <attachid>442582</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-10-27 06:19:10 -0700</bug_when>
    <thetext>Created attachment 442582
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1809242</commentid>
    <comment_count>11</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-10-27 06:34:19 -0700</bug_when>
    <thetext>&lt;rdar://problem/84707554&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1809260</commentid>
    <comment_count>12</comment_count>
      <attachid>442593</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-10-27 08:20:21 -0700</bug_when>
    <thetext>Created attachment 442593
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1809311</commentid>
    <comment_count>13</comment_count>
      <attachid>442605</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-10-27 10:35:37 -0700</bug_when>
    <thetext>Created attachment 442605
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1810505</commentid>
    <comment_count>14</comment_count>
      <attachid>442936</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-10-31 07:48:57 -0700</bug_when>
    <thetext>Created attachment 442936
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1811634</commentid>
    <comment_count>15</comment_count>
      <attachid>443233</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-11-03 13:26:28 -0700</bug_when>
    <thetext>Created attachment 443233
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1811661</commentid>
    <comment_count>16</comment_count>
      <attachid>443242</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-11-03 14:47:51 -0700</bug_when>
    <thetext>Created attachment 443242
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1811784</commentid>
    <comment_count>17</comment_count>
      <attachid>443282</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-11-04 00:58:04 -0700</bug_when>
    <thetext>Created attachment 443282
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1811817</commentid>
    <comment_count>18</comment_count>
      <attachid>443291</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-11-04 04:05:02 -0700</bug_when>
    <thetext>Created attachment 443291
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1811821</commentid>
    <comment_count>19</comment_count>
      <attachid>443295</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-11-04 04:49:20 -0700</bug_when>
    <thetext>Created attachment 443295
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1811965</commentid>
    <comment_count>20</comment_count>
      <attachid>443339</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-11-04 14:23:16 -0700</bug_when>
    <thetext>Created attachment 443339
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1815378</commentid>
    <comment_count>21</comment_count>
      <attachid>443339</attachid>
    <who name="Sergio Villar Senin">svillar</who>
    <bug_when>2021-11-16 00:34:41 -0800</bug_when>
    <thetext>Comment on attachment 443339
Patch

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

The patch looks sane and correct overall. I wonder whether we&apos;re fixing too many cases in a single patch. Would it be possible to split the patch in 2-3 ones or does it only make sense when all the changes are in place?

I was wondering whether we could use an iterative approach fixing case by case.

&gt; Source/WebCore/rendering/RenderBox.cpp:4036
&gt; +            if (isLeftRightOverconstrained &amp;&amp; containerDirection == TextDirection::RTL)

Nit: perhaps it&apos;s enough to directly use the !isOrthogonal in the if condition and avoid having that extra variable

&gt; Source/WebCore/rendering/RenderBox.cpp:4396
&gt; +            if (isLeftRightOverconstrained) {

Ditto.

&gt; LayoutTests/ChangeLog:9
&gt; +        * platform/ios/TestExpectations:

Add something here about the tests the patch is fixing. Also the new iOS failures require an explanation.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1815508</commentid>
    <comment_count>22</comment_count>
      <attachid>444394</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-11-16 08:43:07 -0800</bug_when>
    <thetext>Created attachment 444394
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1815859</commentid>
    <comment_count>23</comment_count>
      <attachid>443339</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-11-17 01:15:44 -0800</bug_when>
    <thetext>Comment on attachment 443339
Patch

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

&gt;&gt; Source/WebCore/rendering/RenderBox.cpp:4036
&gt;&gt; +            if (isLeftRightOverconstrained &amp;&amp; containerDirection == TextDirection::RTL)
&gt; 
&gt; Nit: perhaps it&apos;s enough to directly use the !isOrthogonal in the if condition and avoid having that extra variable

Sure, fixed.

&gt;&gt; Source/WebCore/rendering/RenderBox.cpp:4396
&gt;&gt; +            if (isLeftRightOverconstrained) {
&gt; 
&gt; Ditto.

Done.

&gt;&gt; LayoutTests/ChangeLog:9
&gt;&gt; +        * platform/ios/TestExpectations:
&gt; 
&gt; Add something here about the tests the patch is fixing. Also the new iOS failures require an explanation.

Done.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1815860</commentid>
    <comment_count>24</comment_count>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-11-17 01:16:38 -0800</bug_when>
    <thetext>(In reply to Sergio Villar Senin from comment #21)
&gt; Comment on attachment 443339 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=443339&amp;action=review
&gt; 
&gt; The patch looks sane and correct overall. I wonder whether we&apos;re fixing too
&gt; many cases in a single patch. Would it be possible to split the patch in 2-3
&gt; ones or does it only make sense when all the changes are in place?
&gt; 
&gt; I was wondering whether we could use an iterative approach fixing case by
&gt; case.

Good idea, I created https://bugs.webkit.org/show_bug.cgi?id=233189 which probably should go in first.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1815862</commentid>
    <comment_count>25</comment_count>
      <attachid>444494</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-11-17 01:19:42 -0800</bug_when>
    <thetext>Created attachment 444494
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1819629</commentid>
    <comment_count>26</comment_count>
      <attachid>444494</attachid>
    <who name="Sergio Villar Senin">svillar</who>
    <bug_when>2021-12-02 01:57:49 -0800</bug_when>
    <thetext>Comment on attachment 444494
Patch

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

Thanks for your patience.

&gt; Source/WebCore/rendering/RenderBox.cpp:4453
&gt; +                    logicalTopValue = (availableSpace + logicalTopValue) - computedValues.m_margins.m_before - computedValues.m_margins.m_after;

I don&apos;t understand why we&apos;re using the availableSpace here. The available space makes sense in the block direction of the container. But the container block direction is orthogonal to the child&apos;s top-bottom direction. If any we should use the available space in the child&apos;s block direction (since we&apos;re looking for the logical top).

&gt; Source/WebCore/rendering/RenderBox.cpp:4455
&gt; +                    logicalTopValue = valueForLength(style().left(), containerLogicalHeight);

I don&apos;t understand this too.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1820066</commentid>
    <comment_count>27</comment_count>
      <attachid>445824</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-12-03 02:15:40 -0800</bug_when>
    <thetext>Created attachment 445824
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1820082</commentid>
    <comment_count>28</comment_count>
      <attachid>444494</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-12-03 03:16:08 -0800</bug_when>
    <thetext>Comment on attachment 444494
Patch

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

&gt;&gt; Source/WebCore/rendering/RenderBox.cpp:4453
&gt;&gt; +                    logicalTopValue = (availableSpace + logicalTopValue) - computedValues.m_margins.m_before - computedValues.m_margins.m_after;
&gt; 
&gt; I don&apos;t understand why we&apos;re using the availableSpace here. The available space makes sense in the block direction of the container. But the container block direction is orthogonal to the child&apos;s top-bottom direction. If any we should use the available space in the child&apos;s block direction (since we&apos;re looking for the logical top).

I applied the same principle as in the similar over-constrained case in computePositionedLogicalWidthUsing.

&gt;&gt; Source/WebCore/rendering/RenderBox.cpp:4455
&gt;&gt; +                    logicalTopValue = valueForLength(style().left(), containerLogicalHeight);
&gt; 
&gt; I don&apos;t understand this too.

This is to chose explicit left instead of logical left, to implement the substitution rules explained in for example abs-pos-non-replaced-vrl-220.xht.
I noticed this was not done in case the direction is rtf, so I fixed that in the latest patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1820945</commentid>
    <comment_count>29</comment_count>
      <attachid>446140</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-12-07 02:12:48 -0800</bug_when>
    <thetext>Created attachment 446140
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1830841</commentid>
    <comment_count>30</comment_count>
      <attachid>449148</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-01-14 01:38:51 -0800</bug_when>
    <thetext>Created attachment 449148
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1863233</commentid>
    <comment_count>31</comment_count>
      <attachid>458043</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-04-21 01:46:13 -0700</bug_when>
    <thetext>Created attachment 458043
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1892923</commentid>
    <comment_count>32</comment_count>
      <attachid>461793</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-08-22 03:20:50 -0700</bug_when>
    <thetext>Created attachment 461793
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1896791</commentid>
    <comment_count>33</comment_count>
      <attachid>462183</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-09-07 06:43:16 -0700</bug_when>
    <thetext>Created attachment 462183
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1897374</commentid>
    <comment_count>34</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-09-09 13:53:53 -0700</bug_when>
    <thetext>Committed 254324@main (1787f669ccb1): &lt;https://commits.webkit.org/254324@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 462183.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>441875</attachid>
            <date>2021-10-20 06:37:07 -0700</date>
            <delta_ts>2021-10-24 12:05:55 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232012-20211020153706.patch</filename>
            <type>text/plain</type>
            <size>3213</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0NDU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWY0MGM1ZDJmOWRmODI0
YjBlMzBkNTY2NDlhZDc0YzQ3MTgzYTgzZS4uZGFhMzcxMWQ3NTUyNTU1ZWQ1YmY5YzEzMDU5NWJl
NmJlNTA4MmMwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTEwLTIwICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFic3Bvcy0wMjAuaHRtbAor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDEyCisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0lQLgorCisg
ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb21w
dXRlTG9naWNhbFRvcFBvc2l0aW9uZWRPZmZzZXQpOgorCiAyMDIxLTEwLTE5ICBUeWxlciBXaWxj
b2NrICA8dHlsZXJfd0BhcHBsZS5jb20+CiAKICAgICAgICAgQVg6IEZpeCBicm9rZW4gc3BlYyBs
aW5rcyBpbiBBY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcCBhbmQgQWNjZXNzaWJpbGl0eVRyZWUuY3Bw
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1Nv
dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IGRiYTI0ZmU0YTBlMWI2
ZWRkYzQzNTRmYTFiNTRkMGFiNmI0YmY5ODUuLmEwNmYwM2I4ZDM4ODkxZDk3ODA3YmFmNDVmNDlm
ZTgwZTY5YTRhZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC
b3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC00
Mjg4LDcgKzQyODgsNyBAQCBzdGF0aWMgdm9pZCBjb21wdXRlTG9naWNhbFRvcFBvc2l0aW9uZWRP
ZmZzZXQoTGF5b3V0VW5pdCYgbG9naWNhbFRvcFBvcywgY29uc3QgUgogCiAgICAgLy8gRGVhbCB3
aXRoIGRpZmZlcmluZyB3cml0aW5nIG1vZGVzIGhlcmUuICBPdXIgb2Zmc2V0IG5lZWRzIHRvIGJl
IGluIHRoZSBjb250YWluaW5nIGJsb2NrJ3MgY29vcmRpbmF0ZSBzcGFjZS4gSWYgdGhlIGNvbnRh
aW5pbmcgYmxvY2sgaXMgZmxpcHBlZAogICAgIC8vIGFsb25nIHRoaXMgYXhpcywgdGhlbiB3ZSBu
ZWVkIHRvIGZsaXAgdGhlIGNvb3JkaW5hdGUuICBUaGlzIGNhbiBvbmx5IGhhcHBlbiBpZiB0aGUg
Y29udGFpbmluZyBibG9jayBpcyBib3RoIGEgZmxpcHBlZCBtb2RlIGFuZCBwZXJwZW5kaWN1bGFy
IHRvIHVzLgotICAgIGlmICgoaGF2ZU9ydGhvZ29uYWxXcml0aW5nTW9kZXMgJiYgIWxvZ2ljYWxU
b3BBbmRCb3R0b21BcmVBdXRvICYmIGNoaWxkLT5zdHlsZSgpLmlzRmxpcHBlZEJsb2Nrc1dyaXRp
bmdNb2RlKCkpCisgICAgaWYgKChoYXZlT3J0aG9nb25hbFdyaXRpbmdNb2RlcyAmJiAhbG9naWNh
bFRvcEFuZEJvdHRvbUFyZUF1dG8gJiYgY29udGFpbmVyQmxvY2suc3R5bGUoKS5pc0ZsaXBwZWRC
bG9ja3NXcml0aW5nTW9kZSgpKQogICAgICAgICB8fCAoaGF2ZUZsaXBwZWRCbG9ja0F4aXMgJiYg
IWhhdmVPcnRob2dvbmFsV3JpdGluZ01vZGVzKSkKICAgICAgICAgbG9naWNhbFRvcFBvcyA9IGNv
bnRhaW5lckxvZ2ljYWxIZWlnaHRGb3JQb3NpdGlvbmVkIC0gbG9naWNhbEhlaWdodFZhbHVlIC0g
bG9naWNhbFRvcFBvczsKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5
b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDY3MmIwNGY2MzNlZDdkYjk4NmRjZjg3MGZkOGYyOTg1
MmUzNjE3NDcuLjRiNWJmNjAyOTljNDM4Zjg5MjUwYzUzNTc2NmMyNWExYjRjZGZkZDIgMTAwNjQ0
Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK
QEAgLTEsMyArMSwxMiBAQAorMjAyMS0xMC0yMCAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29t
PgorCisgICAgICAgIEZpeCBhYnNwb3MtMDIwLmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjAxMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P
Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0xMC0x
OSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFVuc2tpcCBwYXNzaW5n
IGZsZXgtYmFzaXM6IGNvbnRlbnQgKyBhc3BlY3QgcmF0aW8gV1BUIHRlc3RzCmRpZmYgLS1naXQg
YS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0
aW9ucwppbmRleCBjNzliYjJmMGQwZDgzOWZjYzc3YzU4ZWUxYWVjZTRjMjJiMGU5ODU3Li5jNDI4
MTA2YTczYjBhZmM5MDEwNzFiZjNiNmI3MDYyYzRiMzMyMDBjIDEwMDY0NAotLS0gYS9MYXlvdXRU
ZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMK
QEAgLTQ2NTUsNyArNDY1NSw2IEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2xvdHRlZC1wbGFjCiAKICMgIGNvbnRh
aW4taW50cmluc2ljLXNpemUKIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAxNC5odG1s
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMjAu
aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogIyBmbGV4LWJhc2lzOmNvbnRlbnQKIHdlYmtpdC5v
cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu
Zy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwg
WyBJbWFnZU9ubHlGYWlsdXJlIF0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>442315</attachid>
            <date>2021-10-24 12:06:01 -0700</date>
            <delta_ts>2021-10-24 23:34:01 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232012-20211024210559.patch</filename>
            <type>text/plain</type>
            <size>6617</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0NzUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjMyYWViNTVmOTFmODU1
MDgwZDliNTQyY2MxMDdlOTdkNzg0OGIxMC4uZWRkNjBlODljMjQ0NGIxOWQ1ZTBlOTgyMzgyYWE3
MTE0YWI3MjdmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTEwLTI0ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFic3Bvcy0wMjAuaHRtbAor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDEyCisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0lQLgorCisg
ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k
ZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoVXNpbmcgY29uc3QpOgorICAgICAg
ICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2lu
ZyBjb25zdCk6CisKIDIwMjEtMTAtMjMgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgog
CiAgICAgICAgIEFkZHJlc3NpbmcgcG9zdC1jb21taXQgcmV2aWV3IChyMjg0NzQ0KS4KZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dl
YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggZDE3YmJiYmIxZTFkZDU2MDVhNzdk
Zjg0OTBkYjU0Nzg1MDljMjkwYi4uYTBlNzQzMzk1ODRlOTljMWUxZWY0YzY0ZTQ5YWFhZDY3N2Y5
NzhlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAK
KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTQwMzAsNyAr
NDAzMCw3IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxXaWR0aFVz
aW5nKFNpemVUeXBlIHdpZHRoVHlwZSwgTGVuZ3RoIGxvCiAKICAgICAgICAgICAgIC8vIFVzZSB0
aGUgY29udGFpbmluZyBibG9jaydzIGRpcmVjdGlvbiByYXRoZXIgdGhhbiB0aGUgcGFyZW50IGJs
b2NrJ3MKICAgICAgICAgICAgIC8vIHBlciBDU1MgMi4xIHJlZmVyZW5jZSB0ZXN0IGFic3Bvcy1u
b24tcmVwbGFjZWQtd2lkdGgtbWFyZ2luLTAwMC4KLSAgICAgICAgICAgIGlmIChjb250YWluZXJE
aXJlY3Rpb24gPT0gVGV4dERpcmVjdGlvbjo6UlRMKQorICAgICAgICAgICAgaWYgKChpc0hvcml6
b250YWxXcml0aW5nTW9kZSgpIHx8ICFjb250YWluZXJCbG9jay5pc0hvcml6b250YWxXcml0aW5n
TW9kZSgpKSAmJiBjb250YWluZXJEaXJlY3Rpb24gPT0gVGV4dERpcmVjdGlvbjo6UlRMKQogICAg
ICAgICAgICAgICAgIGxvZ2ljYWxMZWZ0VmFsdWUgPSAoYXZhaWxhYmxlU3BhY2UgKyBsb2dpY2Fs
TGVmdFZhbHVlKSAtIG1hcmdpbkxvZ2ljYWxMZWZ0VmFsdWUgLSBtYXJnaW5Mb2dpY2FsUmlnaHRW
YWx1ZTsKICAgICAgICAgfQogICAgIH0gZWxzZSB7CkBAIC00MzUwLDYgKzQzNTAsNyBAQCB2b2lk
IFJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0VXNpbmcoU2l6ZVR5cGUg
aGVpZ2h0VHlwZSwgTGVuZ3RoCiAgICAgICAgICAgICByZXNvbHZlZExvZ2ljYWxIZWlnaHQgPSBh
ZGp1c3RDb250ZW50Qm94TG9naWNhbEhlaWdodEZvckJveFNpemluZyh2YWx1ZUZvckxlbmd0aChs
b2dpY2FsSGVpZ2h0TGVuZ3RoLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0KSk7CiAgICAgfQogCisg
ICAgYm9vbCBvdmVyY29uc3RyYWluZWQgPSBmYWxzZTsKICAgICBpZiAoIWxvZ2ljYWxUb3BJc0F1
dG8gJiYgIWxvZ2ljYWxIZWlnaHRJc0F1dG8gJiYgIWxvZ2ljYWxCb3R0b21Jc0F1dG8pIHsKICAg
ICAgICAgLyotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLSpcCiAgICAgICAgICAqIElmIG5vbmUgb2YgdGhlIHRocmVl
IGFyZSAnYXV0byc6IElmIGJvdGggJ21hcmdpbi10b3AnIGFuZCAnbWFyZ2luLQpAQCAtNDM4NSw2
ICs0Mzg2LDEwIEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWln
aHRVc2luZyhTaXplVHlwZSBoZWlnaHRUeXBlLCBMZW5ndGgKICAgICAgICAgICAgIC8vIE92ZXIt
Y29uc3RyYWluZWQsIChubyBuZWVkIHNvbHZlIGZvciBib3R0b20pCiAgICAgICAgICAgICBjb21w
dXRlZFZhbHVlcy5tX21hcmdpbnMubV9iZWZvcmUgPSB2YWx1ZUZvckxlbmd0aChtYXJnaW5CZWZv
cmUsIGNvbnRhaW5lclJlbGF0aXZlTG9naWNhbFdpZHRoKTsKICAgICAgICAgICAgIGNvbXB1dGVk
VmFsdWVzLm1fbWFyZ2lucy5tX2FmdGVyID0gdmFsdWVGb3JMZW5ndGgobWFyZ2luQWZ0ZXIsIGNv
bnRhaW5lclJlbGF0aXZlTG9naWNhbFdpZHRoKTsKKyAgICAgICAgICAgIG92ZXJjb25zdHJhaW5l
ZCA9IHRydWU7CisKKyAgICAgICAgICAgIGlmICgoIWlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkg
JiYgY29udGFpbmVyQmxvY2suaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkgJiYgY29udGFpbmVy
QmxvY2suc3R5bGUoKS5kaXJlY3Rpb24oKSA9PSBUZXh0RGlyZWN0aW9uOjpSVEwpCisgICAgICAg
ICAgICAgICAgbG9naWNhbFRvcFZhbHVlID0gKGF2YWlsYWJsZVNwYWNlICsgbG9naWNhbFRvcFZh
bHVlKSAtIGNvbXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5tX2JlZm9yZSAtIGNvbXB1dGVkVmFsdWVz
Lm1fbWFyZ2lucy5tX2FmdGVyOwogICAgICAgICB9CiAgICAgfSBlbHNlIHsKICAgICAgICAgLyot
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLSpcCkBAIC00NDQ1LDcgKzQ0NTAsNyBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0
ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0VXNpbmcoU2l6ZVR5cGUgaGVpZ2h0VHlwZSwgTGVuZ3Ro
CiAKICAgICAvLyBVc2UgY29tcHV0ZWQgdmFsdWVzIHRvIGNhbGN1bGF0ZSB0aGUgdmVydGljYWwg
cG9zaXRpb24uCiAgICAgY29tcHV0ZWRWYWx1ZXMubV9wb3NpdGlvbiA9IGxvZ2ljYWxUb3BWYWx1
ZSArIGNvbXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5tX2JlZm9yZTsKLSAgICBjb21wdXRlTG9naWNh
bFRvcFBvc2l0aW9uZWRPZmZzZXQoY29tcHV0ZWRWYWx1ZXMubV9wb3NpdGlvbiwgdGhpcywgbG9n
aWNhbEhlaWdodFZhbHVlICsgYm9yZGVyc1BsdXNQYWRkaW5nLCBjb250YWluZXJCbG9jaywgY29u
dGFpbmVyTG9naWNhbEhlaWdodCk7CisgICAgaWYgKCFvdmVyY29uc3RyYWluZWQpIGNvbXB1dGVM
b2dpY2FsVG9wUG9zaXRpb25lZE9mZnNldChjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9uLCB0aGlz
LCBsb2dpY2FsSGVpZ2h0VmFsdWUgKyBib3JkZXJzUGx1c1BhZGRpbmcsIGNvbnRhaW5lckJsb2Nr
LCBjb250YWluZXJMb2dpY2FsSGVpZ2h0KTsKIH0KIAogdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQ
b3NpdGlvbmVkTG9naWNhbFdpZHRoUmVwbGFjZWQoTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVz
JiBjb21wdXRlZFZhbHVlcykgY29uc3QKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv
ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBiMmRlYmM2NjAyZDA2ZGU1Y2UzYmQxZDFj
NzYwMGJjN2YzYWRmZjAyLi40ZDc0YWE1YzFiYTgxNjcwZmU4MjBjNzMwZjI0OGMyY2M1MTM1MDZl
IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjEtMTAtMjQgIFJvYiBCdWlzICA8cmJ1aXNAaWdh
bGlhLmNvbT4KKworICAgICAgICBGaXggYWJzcG9zLTAyMC5odG1sCisgICAgICAgIGh0dHBzOi8v
YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIwMTIKKworICAgICAgICBSZXZpZXdl
ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIw
MjEtMTAtMjMgIENhbWVyb24gTWNDb3JtYWNrICA8aGV5Y2FtQGFwcGxlLmNvbT4KIAogICAgICAg
ICBVcGRhdGUgV1BUIHRlc3QgdG9sZXJhbmNlIGFuZCBtYXJrIHNvbWUgZmFpbHVyZXMgYXMgc2lt
dWxhdG9yLW9ubHkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9M
YXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDMyZWFhZGNjZWRkOTllMWEwZDVhZGZl
MWRkYWEyZWU5ZmEyMDZmYjEuLjA0YWNlYzQyZjk5MTJmZjE3ZmIzYjJmYjg1OTkyYmQwOWIxMzIw
NDYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0
VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDA5NCwxNCArNDA5NCw5IEBAIHdlYmtpdC5vcmcv
Yi8yMzAwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRyYW5zZm9y
bXMvdHR3Zi10cmFuCiAKIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvY2VudHJhbC1iYXNlbGluZS1hbGlnbm1l
bnQtMDAzLnhodCBbIEltYWdlT25seUZhaWx1cmUgUGFzcyBdCiB3ZWJraXQub3JnL2IvMjA5MDgw
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ns
ZWFyYW5jZS1jYWxjdWxhdGlvbnMtdnJsLTAwMi54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIFBhc3Mg
XQotd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC1pY2ItdmxyLTAzMy54aHQg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFj
ZWQtaWNiLXZybC0wMzAueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA5
MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVz
L2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZsci0wOTUueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13
ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZsci0yMjUueGh0IFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZsci0y
MjkueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9u
LXJlcGxhY2VkLXZybC0wODgueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2Iv
MjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1v
ZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZybC0yMjAueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBd
Ci13ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZybC0yMjQueGh0IFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2F2YWlsYWJsZS1zaXplLTAwMS5odG1s
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2F2YWlsYWJsZS1zaXplLTAw
Mi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2F2YWlsYWJsZS1z
aXplLTAwMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCkBAIC01MTkzLDQgKzUxODgsNCBAQCBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9tb3Rpb24vb2Zmc2V0LXJvdGF0ZS0w
MDQuaHRtbCBbIEltYWdlT25seUZhaQogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvbW90aW9uL29mZnNldC1yb3RhdGUtMDA1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIAog
IyBJUEMgdGVzdCBmYWlsaW5nIGluIERlYnVnIG1vZGUgZHVlIHRvIGFzc2VydC4KLVsgRGVidWcg
XSBpcGMvc2VuZC1pbnZhbGlkLW1lc3NhZ2UuaHRtbCBbIFNraXAgXQpcIE5vIG5ld2xpbmUgYXQg
ZW5kIG9mIGZpbGUKK1sgRGVidWcgXSBpcGMvc2VuZC1pbnZhbGlkLW1lc3NhZ2UuaHRtbCBbIFNr
aXAgXQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>442340</attachid>
            <date>2021-10-24 23:34:07 -0700</date>
            <delta_ts>2021-10-25 05:53:10 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232012-20211025083406.patch</filename>
            <type>text/plain</type>
            <size>1627</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0NzUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjMyYWViNTVmOTFmODU1
MDgwZDliNTQyY2MxMDdlOTdkNzg0OGIxMC4uZWRkNjBlODljMjQ0NGIxOWQ1ZTBlOTgyMzgyYWE3
MTE0YWI3MjdmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTEwLTI0ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFic3Bvcy0wMjAuaHRtbAor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDEyCisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0lQLgorCisg
ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k
ZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoVXNpbmcgY29uc3QpOgorICAgICAg
ICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2lu
ZyBjb25zdCk6CisKIDIwMjEtMTAtMjMgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgog
CiAgICAgICAgIEFkZHJlc3NpbmcgcG9zdC1jb21taXQgcmV2aWV3IChyMjg0NzQ0KS4KZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dl
YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggZDE3YmJiYmIxZTFkZDU2MDVhNzdk
Zjg0OTBkYjU0Nzg1MDljMjkwYi4uOWM0YzllMDNkMzYwMzM3NTUwOTY0YTg4MTE3OTA5YmRhNTI0
ZGVjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAK
KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTQwMzAsNyAr
NDAzMCw3IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxXaWR0aFVz
aW5nKFNpemVUeXBlIHdpZHRoVHlwZSwgTGVuZ3RoIGxvCiAKICAgICAgICAgICAgIC8vIFVzZSB0
aGUgY29udGFpbmluZyBibG9jaydzIGRpcmVjdGlvbiByYXRoZXIgdGhhbiB0aGUgcGFyZW50IGJs
b2NrJ3MKICAgICAgICAgICAgIC8vIHBlciBDU1MgMi4xIHJlZmVyZW5jZSB0ZXN0IGFic3Bvcy1u
b24tcmVwbGFjZWQtd2lkdGgtbWFyZ2luLTAwMC4KLSAgICAgICAgICAgIGlmIChjb250YWluZXJE
aXJlY3Rpb24gPT0gVGV4dERpcmVjdGlvbjo6UlRMKQorICAgICAgICAgICAgaWYgKChpc0hvcml6
b250YWxXcml0aW5nTW9kZSgpIHx8ICFjb250YWluZXJCbG9jay5pc0hvcml6b250YWxXcml0aW5n
TW9kZSgpKSAmJiBjb250YWluZXJEaXJlY3Rpb24gPT0gVGV4dERpcmVjdGlvbjo6UlRMKQogICAg
ICAgICAgICAgICAgIGxvZ2ljYWxMZWZ0VmFsdWUgPSAoYXZhaWxhYmxlU3BhY2UgKyBsb2dpY2Fs
TGVmdFZhbHVlKSAtIG1hcmdpbkxvZ2ljYWxMZWZ0VmFsdWUgLSBtYXJnaW5Mb2dpY2FsUmlnaHRW
YWx1ZTsKICAgICAgICAgfQogICAgIH0gZWxzZSB7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>442363</attachid>
            <date>2021-10-25 05:53:16 -0700</date>
            <delta_ts>2021-10-25 11:22:06 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232012-20211025145314.patch</filename>
            <type>text/plain</type>
            <size>6087</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0NzUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjMyYWViNTVmOTFmODU1
MDgwZDliNTQyY2MxMDdlOTdkNzg0OGIxMC4uZjQyNjcwMDgzODY5MTc1M2FjOTYzNGJkMGNhNzBh
ODE1MDBmYTBlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTEwLTI1ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFic3Bvcy0wMjAuaHRtbAor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDEyCisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0lQLgorCisg
ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k
ZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoVXNpbmcgY29uc3QpOgorCiAyMDIx
LTEwLTIzICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGRyZXNz
aW5nIHBvc3QtY29tbWl0IHJldmlldyAocjI4NDc0NCkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S
ZW5kZXJCb3guY3BwCmluZGV4IGQxN2JiYmJiMWUxZGQ1NjA1YTc3ZGY4NDkwZGI1NDc4NTA5YzI5
MGIuLjljNGM5ZTAzZDM2MDMzNzU1MDk2NGE4ODExNzkwOWJkYTUyNGRlYzYgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJD
b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC00MDMwLDcgKzQwMzAsNyBAQCB2b2lkIFJl
bmRlckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsV2lkdGhVc2luZyhTaXplVHlwZSB3aWR0
aFR5cGUsIExlbmd0aCBsbwogCiAgICAgICAgICAgICAvLyBVc2UgdGhlIGNvbnRhaW5pbmcgYmxv
Y2sncyBkaXJlY3Rpb24gcmF0aGVyIHRoYW4gdGhlIHBhcmVudCBibG9jaydzCiAgICAgICAgICAg
ICAvLyBwZXIgQ1NTIDIuMSByZWZlcmVuY2UgdGVzdCBhYnNwb3Mtbm9uLXJlcGxhY2VkLXdpZHRo
LW1hcmdpbi0wMDAuCi0gICAgICAgICAgICBpZiAoY29udGFpbmVyRGlyZWN0aW9uID09IFRleHRE
aXJlY3Rpb246OlJUTCkKKyAgICAgICAgICAgIGlmICgoaXNIb3Jpem9udGFsV3JpdGluZ01vZGUo
KSB8fCAhY29udGFpbmVyQmxvY2suaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkgJiYgY29udGFp
bmVyRGlyZWN0aW9uID09IFRleHREaXJlY3Rpb246OlJUTCkKICAgICAgICAgICAgICAgICBsb2dp
Y2FsTGVmdFZhbHVlID0gKGF2YWlsYWJsZVNwYWNlICsgbG9naWNhbExlZnRWYWx1ZSkgLSBtYXJn
aW5Mb2dpY2FsTGVmdFZhbHVlIC0gbWFyZ2luTG9naWNhbFJpZ2h0VmFsdWU7CiAgICAgICAgIH0K
ICAgICB9IGVsc2UgewpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0
VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGIyZGViYzY2MDJkMDZkZTVjZTNiZDFkMWM3NjAwYmM3ZjNh
ZGZmMDIuLmI0MjZiZWZlYTgwYzk3NmVmMDA0MTNhYjk0Zjk2MzMwNGZiMmEwNWEgMTAwNjQ0Ci0t
LSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAg
LTEsMyArMSwxMiBAQAorMjAyMS0xMC0yNSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgor
CisgICAgICAgIEZpeCBhYnNwb3MtMDIwLmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjAxMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E
WSAoT09QUyEpLgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0xMC0yMyAg
Q2FtZXJvbiBNY0Nvcm1hY2sgIDxoZXljYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFVwZGF0ZSBX
UFQgdGVzdCB0b2xlcmFuY2UgYW5kIG1hcmsgc29tZSBmYWlsdXJlcyBhcyBzaW11bGF0b3Itb25s
eQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3Rz
L1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggMzJlYWFkY2NlZGQ5OWUxYTBkNWFkZmUxZGRhYTJlZTlm
YTIwNmZiMS4uOTM2NzMxMzFjNzI5NTNiYjFhZTNjMjY2N2UxZjU5ZTM0Nzc1OTNmYSAxMDA2NDQK
LS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0
RXhwZWN0YXRpb25zCkBAIC00MDk3LDExICs0MDk3LDkgQEAgd2Via2l0Lm9yZy9iLzIwOTA4MCBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9jbGVh
cmEKIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtaWNiLXZsci0wMzMueGh0
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxh
Y2VkLWljYi12cmwtMDMwLnhodCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIw
OTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rl
cy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12bHItMDk1LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQot
d2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12bHItMjI1LnhodCBbIEltYWdl
T25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12bHIt
MjI5LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5v
bi1yZXBsYWNlZC12cmwtMDg4LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9i
LzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1t
b2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12cmwtMjIwLnhodCBbIEltYWdlT25seUZhaWx1cmUg
XQotd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12cmwtMjI0LnhodCBbIElt
YWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hdmFpbGFibGUtc2l6ZS0wMDEuaHRt
bCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hdmFpbGFibGUtc2l6ZS0w
MDIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hdmFpbGFibGUt
c2l6ZS0wMDMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpAQCAtNDEyNSw3ICs0MTIzLDYgQEAg
d2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtd3JpdGluZy1tb2Rlcy9iYWNrZ3IKIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYmFja2dyb3VuZC1zaXpl
LWRvY3VtZW50LXJvb3QtdnJsLTAwNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQu
b3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0
aW5nLW1vZGVzL2JhY2tncm91bmQtc2l6ZS1kb2N1bWVudC1yb290LXZybC0wMDYuaHRtbCBbIElt
YWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9iYWNrZ3JvdW5kLXNpemUtZG9jdW1l
bnQtcm9vdC12cmwtMDA4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8y
MDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9k
ZXMvYmlkaS1wbGFpbnRleHQtMDExLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5v
cmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRp
bmctbW9kZXMvYmxvY2stZmxvdy1kaXJlY3Rpb24tc2xyLTA0My54aHQgWyBJbWFnZU9ubHlGYWls
dXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYmxvY2stZmxvdy1kaXJlY3Rpb24tc2xyLTA0Ny54aHQg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYmxvY2stZmxvdy1kaXJlY3Rp
b24tc2xyLTA0OC54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KQEAgLTQ0MTksNyArNDQxNiw2IEBA
IGh0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5YmkvY2xvc2VkLXBvcnQtZGVsYXkuaHRtbCBb
IFNraXAgXQogCiB3ZWJraXQub3JnL2IvMjE0MjkxIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2F2YWlsYWJsZS1zaXplLTAwNC5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0MjkxIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2F2YWlsYWJsZS1zaXplLTAxOC5odG1s
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0MjkxIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Jhc2VsaW5lLXdpdGgtb3J0
aG9nb25hbC1mbG93LTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2Iv
MjE0MjkxIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1v
ZGVzL2RpcmVjdGlvbi11cHJpZ2h0LTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJr
aXQub3JnL2IvMjE0MjkxIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13
cml0aW5nLW1vZGVzL2RpcmVjdGlvbi11cHJpZ2h0LTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCiB3ZWJraXQub3JnL2IvMjE0MjkxIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy13cml0aW5nLW1vZGVzL2lubGluZS1ib3gtYm9yZGVyLXZsci0wMDEuaHRtbCBbIElt
YWdlT25seUZhaWx1cmUgXQpAQCAtNTE5Myw0ICs1MTg5LDQgQEAgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvbW90aW9uL29mZnNldC1yb3RhdGUtMDA0Lmh0bWwgWyBJbWFnZU9u
bHlGYWkKIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL21vdGlvbi9vZmZzZXQt
cm90YXRlLTAwNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAKICMgSVBDIHRlc3QgZmFpbGlu
ZyBpbiBEZWJ1ZyBtb2RlIGR1ZSB0byBhc3NlcnQuCi1bIERlYnVnIF0gaXBjL3NlbmQtaW52YWxp
ZC1tZXNzYWdlLmh0bWwgWyBTa2lwIF0KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCitbIERl
YnVnIF0gaXBjL3NlbmQtaW52YWxpZC1tZXNzYWdlLmh0bWwgWyBTa2lwIF0K
</data>
<flag name="commit-queue"
          id="466874"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>442387</attachid>
            <date>2021-10-25 10:58:59 -0700</date>
            <delta_ts>2021-10-25 12:20:48 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232012-20211025195857.patch</filename>
            <type>text/plain</type>
            <size>8491</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0Nzg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzA3YjgzODNlMGE0NTZk
MDc3MzM1YTg3OGFiMTAxOWFiMzBhOGZiNC4uN2U1MTg1OGQ2MDA5OWVlYjhhZmJiMmNjZGE2ZmNj
ZDljYjBlNTEwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTEwLTI1ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFic3Bvcy0wMjAuaHRtbAor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDEyCisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0lQLgorCisg
ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k
ZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoVXNpbmcgY29uc3QpOgorCiAyMDIx
LTEwLTI1ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJ
RkNdIENoZWNrIGFjcm9zcyBpbmxpbmUgYm94IGJvdW5kYXJpZXMgZm9yIGJyZWFrYWJsZSBwb3Np
dGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAg
Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCBhNDY3NDkwOWI4
M2Y4MDc2NDU1ZDc4NTM1YWUwNzc1OGRlNzA3MDU4Li43MDZjYTczMTdiMThhNGNlNzk5YzQ2M2Ex
MTA3Y2Y1ZDllOWNiZTRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu
ZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApA
QCAtNDAzMiw3ICs0MDMyLDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9n
aWNhbFdpZHRoVXNpbmcoU2l6ZVR5cGUgd2lkdGhUeXBlLCBMZW5ndGggbG8KIAogICAgICAgICAg
ICAgLy8gVXNlIHRoZSBjb250YWluaW5nIGJsb2NrJ3MgZGlyZWN0aW9uIHJhdGhlciB0aGFuIHRo
ZSBwYXJlbnQgYmxvY2sncwogICAgICAgICAgICAgLy8gcGVyIENTUyAyLjEgcmVmZXJlbmNlIHRl
c3QgYWJzcG9zLW5vbi1yZXBsYWNlZC13aWR0aC1tYXJnaW4tMDAwLgotICAgICAgICAgICAgaWYg
KGNvbnRhaW5lckRpcmVjdGlvbiA9PSBUZXh0RGlyZWN0aW9uOjpSVEwpCisgICAgICAgICAgICBp
ZiAoKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgfHwgIWNvbnRhaW5lckJsb2NrLmlzSG9yaXpv
bnRhbFdyaXRpbmdNb2RlKCkpICYmIGNvbnRhaW5lckRpcmVjdGlvbiA9PSBUZXh0RGlyZWN0aW9u
OjpSVEwpCiAgICAgICAgICAgICAgICAgbG9naWNhbExlZnRWYWx1ZSA9IChhdmFpbGFibGVTcGFj
ZSArIGxvZ2ljYWxMZWZ0VmFsdWUpIC0gbWFyZ2luTG9naWNhbExlZnRWYWx1ZSAtIG1hcmdpbkxv
Z2ljYWxSaWdodFZhbHVlOwogICAgICAgICB9CiAgICAgfSBlbHNlIHsKQEAgLTQzNTIsNiArNDM1
Miw3IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2lu
ZyhTaXplVHlwZSBoZWlnaHRUeXBlLCBMZW5ndGgKICAgICAgICAgICAgIHJlc29sdmVkTG9naWNh
bEhlaWdodCA9IGFkanVzdENvbnRlbnRCb3hMb2dpY2FsSGVpZ2h0Rm9yQm94U2l6aW5nKHZhbHVl
Rm9yTGVuZ3RoKGxvZ2ljYWxIZWlnaHRMZW5ndGgsIGNvbnRhaW5lckxvZ2ljYWxIZWlnaHQpKTsK
ICAgICB9CiAKKyAgICBib29sIGNvbXB1dGVPZmZzZXQgPSB0cnVlOwogICAgIGlmICghbG9naWNh
bFRvcElzQXV0byAmJiAhbG9naWNhbEhlaWdodElzQXV0byAmJiAhbG9naWNhbEJvdHRvbUlzQXV0
bykgewogICAgICAgICAvKi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tKlwKICAgICAgICAgICogSWYgbm9uZSBvZiB0
aGUgdGhyZWUgYXJlICdhdXRvJzogSWYgYm90aCAnbWFyZ2luLXRvcCcgYW5kICdtYXJnaW4tCkBA
IC00Mzg3LDYgKzQzODgsMTAgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9n
aWNhbEhlaWdodFVzaW5nKFNpemVUeXBlIGhlaWdodFR5cGUsIExlbmd0aAogICAgICAgICAgICAg
Ly8gT3Zlci1jb25zdHJhaW5lZCwgKG5vIG5lZWQgc29sdmUgZm9yIGJvdHRvbSkKICAgICAgICAg
ICAgIGNvbXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5tX2JlZm9yZSA9IHZhbHVlRm9yTGVuZ3RoKG1h
cmdpbkJlZm9yZSwgY29udGFpbmVyUmVsYXRpdmVMb2dpY2FsV2lkdGgpOwogICAgICAgICAgICAg
Y29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fYWZ0ZXIgPSB2YWx1ZUZvckxlbmd0aChtYXJnaW5B
ZnRlciwgY29udGFpbmVyUmVsYXRpdmVMb2dpY2FsV2lkdGgpOworICAgICAgICAgICAgaWYgKCEo
aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSB8fCAhY29udGFpbmVyQmxvY2suaXNIb3Jpem9udGFs
V3JpdGluZ01vZGUoKSkgJiYgY29udGFpbmVyQmxvY2suc3R5bGUoKS5kaXJlY3Rpb24oKSA9PSBU
ZXh0RGlyZWN0aW9uOjpSVEwpIHsKKyAgICAgICAgICAgICAgICBsb2dpY2FsVG9wVmFsdWUgPSAo
YXZhaWxhYmxlU3BhY2UgKyBsb2dpY2FsVG9wVmFsdWUpIC0gY29tcHV0ZWRWYWx1ZXMubV9tYXJn
aW5zLm1fYmVmb3JlIC0gY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fYWZ0ZXI7CisgICAgICAg
ICAgICAgICAgY29tcHV0ZU9mZnNldCA9IGZhbHNlOworICAgICAgICAgICAgfQogICAgICAgICB9
CiAgICAgfSBlbHNlIHsKICAgICAgICAgLyotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSpcCkBAIC00NDQ3LDcgKzQ0NTIs
OCBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0VXNpbmco
U2l6ZVR5cGUgaGVpZ2h0VHlwZSwgTGVuZ3RoCiAKICAgICAvLyBVc2UgY29tcHV0ZWQgdmFsdWVz
IHRvIGNhbGN1bGF0ZSB0aGUgdmVydGljYWwgcG9zaXRpb24uCiAgICAgY29tcHV0ZWRWYWx1ZXMu
bV9wb3NpdGlvbiA9IGxvZ2ljYWxUb3BWYWx1ZSArIGNvbXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5t
X2JlZm9yZTsKLSAgICBjb21wdXRlTG9naWNhbFRvcFBvc2l0aW9uZWRPZmZzZXQoY29tcHV0ZWRW
YWx1ZXMubV9wb3NpdGlvbiwgdGhpcywgbG9naWNhbEhlaWdodFZhbHVlICsgYm9yZGVyc1BsdXNQ
YWRkaW5nLCBjb250YWluZXJCbG9jaywgY29udGFpbmVyTG9naWNhbEhlaWdodCk7CisgICAgaWYg
KGNvbXB1dGVPZmZzZXQpCisgICAgICAgIGNvbXB1dGVMb2dpY2FsVG9wUG9zaXRpb25lZE9mZnNl
dChjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9uLCB0aGlzLCBsb2dpY2FsSGVpZ2h0VmFsdWUgKyBi
b3JkZXJzUGx1c1BhZGRpbmcsIGNvbnRhaW5lckJsb2NrLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0
KTsKIH0KIAogdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoUmVw
bGFjZWQoTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzJiBjb21wdXRlZFZhbHVlcykgY29uc3QK
ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwppbmRleCBjNzI2NTE1NjAyNWE2NDQ1OGI1NWMwNWY3NzY4ZTRhZmUzY2IzOWYwLi45MmYxZDA2
YTIzZDc5OTdlOWQ5MjE3NDI3ZmRhMTRkNDJhMTU3M2YyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0
cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAK
KzIwMjEtMTAtMjUgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBGaXgg
YWJzcG9zLTAyMC5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn
LmNnaT9pZD0yMzIwMTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor
ICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMTAtMjUgIEF5dW1pIEtvamltYSAg
PGF5dW1pX2tvamltYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVncmVzc2lvbiAocjI4NDMzMCk6
IFsgbWFjT1Mgd2sxIERlYnVnIF0gd2ViYXVkaW8vQXVkaW9CdWZmZXIvaHVnZS1idWZmZXIuaHRt
bCBpcyBhIGZsYWt5IHRpbWVvdXQuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0
YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCBiZTczYWVjYTdmYTMx
ZmM4Y2FlNGMwNzc2ZDIxYThlNzU5OGFiMjBhLi5iM2FkZGNiMjU1MWZhY2ZhYjRlOTEzMTg5ZGVm
NTI3MzAwOTRlMDFjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisr
KyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTQwOTIsMTQgKzQwOTIsMTAgQEAg
d2Via2l0Lm9yZy9iLzIzMDA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3MtdHJhbnNmb3Jtcy90dHdmLXRyYW4KIAogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9jZW50cmFsLWJhc2Vs
aW5lLWFsaWdubWVudC0wMDMueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBQYXNzIF0KIHdlYmtpdC5v
cmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRp
bmctbW9kZXMvY2xlYXJhbmNlLWNhbGN1bGF0aW9ucy12cmwtMDAyLnhodCBbIEltYWdlT25seUZh
aWx1cmUgUGFzcyBdCi13ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLWljYi12
bHItMDMzLnhodCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9z
LW5vbi1yZXBsYWNlZC1pY2ItdnJsLTAzMC54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtp
dC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdy
aXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdmxyLTA5NS54aHQgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdmxyLTIyNS54
aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVw
bGFjZWQtdmxyLTIyOS54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkw
ODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMv
YWJzLXBvcy1ub24tcmVwbGFjZWQtdnJsLTA4OC54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdl
YmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdnJsLTIyMC54aHQgWyBJbWFnZU9u
bHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdnJsLTIy
NC54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYXZhaWxhYmxlLXNp
emUtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYXZhaWxh
YmxlLXNpemUtMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkw
ODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMv
YXZhaWxhYmxlLXNpemUtMDAzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KQEAgLTQxMjMsNyAr
NDExOSw2IEBAIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYmFja2dyCiB3ZWJraXQub3JnL2IvMjA5MDgwIGlt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2JhY2tn
cm91bmQtc2l6ZS1kb2N1bWVudC1yb290LXZybC0wMDQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg
XQogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3Mtd3JpdGluZy1tb2Rlcy9iYWNrZ3JvdW5kLXNpemUtZG9jdW1lbnQtcm9vdC12cmwtMDA2
Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYmFja2dyb3VuZC1z
aXplLWRvY3VtZW50LXJvb3QtdnJsLTAwOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJr
aXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13
cml0aW5nLW1vZGVzL2JpZGktcGxhaW50ZXh0LTAxMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd
CiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy13cml0aW5nLW1vZGVzL2Jsb2NrLWZsb3ctZGlyZWN0aW9uLXNsci0wNDMueGh0IFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Jsb2NrLWZsb3ctZGlyZWN0aW9uLXNs
ci0wNDcueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Jsb2NrLWZs
b3ctZGlyZWN0aW9uLXNsci0wNDgueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCkBAIC00NDA5LDcg
KzQ0MDQsNiBAQCBodHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0cy9oeWJpL2Nsb3NlZC1wb3J0LWRl
bGF5Lmh0bWwgWyBTa2lwIF0KIAogd2Via2l0Lm9yZy9iLzIxNDI5MSBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hdmFpbGFibGUtc2l6ZS0wMDQu
aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDI5MSBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hdmFpbGFibGUtc2l6
ZS0wMTguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDI5MSBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9iYXNlbGlu
ZS13aXRoLW9ydGhvZ29uYWwtZmxvdy0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Vi
a2l0Lm9yZy9iLzIxNDI5MSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
d3JpdGluZy1tb2Rlcy9kaXJlY3Rpb24tdXByaWdodC0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1
cmUgXQogd2Via2l0Lm9yZy9iLzIxNDI5MSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9kaXJlY3Rpb24tdXByaWdodC0wMDIuaHRtbCBbIEltYWdl
T25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDI5MSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9pbmxpbmUtYm94LWJvcmRlci12bHItMDAx
Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KQEAgLTUxODMsNCArNTE3Nyw0IEBAIGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL21vdGlvbi9vZmZzZXQtcm90YXRlLTAwNC5odG1s
IFsgSW1hZ2VPbmx5RmFpCiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9tb3Rp
b24vb2Zmc2V0LXJvdGF0ZS0wMDUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogCiAjIElQQyB0
ZXN0IGZhaWxpbmcgaW4gRGVidWcgbW9kZSBkdWUgdG8gYXNzZXJ0LgotWyBEZWJ1ZyBdIGlwYy9z
ZW5kLWludmFsaWQtbWVzc2FnZS5odG1sIFsgU2tpcCBdClwgTm8gbmV3bGluZSBhdCBlbmQgb2Yg
ZmlsZQorWyBEZWJ1ZyBdIGlwYy9zZW5kLWludmFsaWQtbWVzc2FnZS5odG1sIFsgU2tpcCBdCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>442397</attachid>
            <date>2021-10-25 12:20:54 -0700</date>
            <delta_ts>2021-10-25 12:50:18 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232012-20211025212053.patch</filename>
            <type>text/plain</type>
            <size>9179</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0Nzg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzA3YjgzODNlMGE0NTZk
MDc3MzM1YTg3OGFiMTAxOWFiMzBhOGZiNC4uN2U1MTg1OGQ2MDA5OWVlYjhhZmJiMmNjZGE2ZmNj
ZDljYjBlNTEwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTEwLTI1ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFic3Bvcy0wMjAuaHRtbAor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDEyCisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0lQLgorCisg
ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k
ZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoVXNpbmcgY29uc3QpOgorCiAyMDIx
LTEwLTI1ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJ
RkNdIENoZWNrIGFjcm9zcyBpbmxpbmUgYm94IGJvdW5kYXJpZXMgZm9yIGJyZWFrYWJsZSBwb3Np
dGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAg
Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCBhNDY3NDkwOWI4
M2Y4MDc2NDU1ZDc4NTM1YWUwNzc1OGRlNzA3MDU4Li5jNzc1OTMyNjUzNTlhMGE2MjM2YjBjYjM2
NjQzMTUxMzI2YzQwYzgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu
ZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApA
QCAtNDAzMiw3ICs0MDMyLDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9n
aWNhbFdpZHRoVXNpbmcoU2l6ZVR5cGUgd2lkdGhUeXBlLCBMZW5ndGggbG8KIAogICAgICAgICAg
ICAgLy8gVXNlIHRoZSBjb250YWluaW5nIGJsb2NrJ3MgZGlyZWN0aW9uIHJhdGhlciB0aGFuIHRo
ZSBwYXJlbnQgYmxvY2sncwogICAgICAgICAgICAgLy8gcGVyIENTUyAyLjEgcmVmZXJlbmNlIHRl
c3QgYWJzcG9zLW5vbi1yZXBsYWNlZC13aWR0aC1tYXJnaW4tMDAwLgotICAgICAgICAgICAgaWYg
KGNvbnRhaW5lckRpcmVjdGlvbiA9PSBUZXh0RGlyZWN0aW9uOjpSVEwpCisgICAgICAgICAgICBp
ZiAoKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgfHwgIWNvbnRhaW5lckJsb2NrLmlzSG9yaXpv
bnRhbFdyaXRpbmdNb2RlKCkpICYmIGNvbnRhaW5lckRpcmVjdGlvbiA9PSBUZXh0RGlyZWN0aW9u
OjpSVEwpCiAgICAgICAgICAgICAgICAgbG9naWNhbExlZnRWYWx1ZSA9IChhdmFpbGFibGVTcGFj
ZSArIGxvZ2ljYWxMZWZ0VmFsdWUpIC0gbWFyZ2luTG9naWNhbExlZnRWYWx1ZSAtIG1hcmdpbkxv
Z2ljYWxSaWdodFZhbHVlOwogICAgICAgICB9CiAgICAgfSBlbHNlIHsKQEAgLTQzNTIsNiArNDM1
Miw3IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2lu
ZyhTaXplVHlwZSBoZWlnaHRUeXBlLCBMZW5ndGgKICAgICAgICAgICAgIHJlc29sdmVkTG9naWNh
bEhlaWdodCA9IGFkanVzdENvbnRlbnRCb3hMb2dpY2FsSGVpZ2h0Rm9yQm94U2l6aW5nKHZhbHVl
Rm9yTGVuZ3RoKGxvZ2ljYWxIZWlnaHRMZW5ndGgsIGNvbnRhaW5lckxvZ2ljYWxIZWlnaHQpKTsK
ICAgICB9CiAKKyAgICBib29sIGNvbXB1dGVPZmZzZXQgPSB0cnVlOwogICAgIGlmICghbG9naWNh
bFRvcElzQXV0byAmJiAhbG9naWNhbEhlaWdodElzQXV0byAmJiAhbG9naWNhbEJvdHRvbUlzQXV0
bykgewogICAgICAgICAvKi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tKlwKICAgICAgICAgICogSWYgbm9uZSBvZiB0
aGUgdGhyZWUgYXJlICdhdXRvJzogSWYgYm90aCAnbWFyZ2luLXRvcCcgYW5kICdtYXJnaW4tCkBA
IC00Mzg3LDYgKzQzODgsMTIgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9n
aWNhbEhlaWdodFVzaW5nKFNpemVUeXBlIGhlaWdodFR5cGUsIExlbmd0aAogICAgICAgICAgICAg
Ly8gT3Zlci1jb25zdHJhaW5lZCwgKG5vIG5lZWQgc29sdmUgZm9yIGJvdHRvbSkKICAgICAgICAg
ICAgIGNvbXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5tX2JlZm9yZSA9IHZhbHVlRm9yTGVuZ3RoKG1h
cmdpbkJlZm9yZSwgY29udGFpbmVyUmVsYXRpdmVMb2dpY2FsV2lkdGgpOwogICAgICAgICAgICAg
Y29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fYWZ0ZXIgPSB2YWx1ZUZvckxlbmd0aChtYXJnaW5B
ZnRlciwgY29udGFpbmVyUmVsYXRpdmVMb2dpY2FsV2lkdGgpOworICAgICAgICAgICAgaWYgKCFp
c0hvcml6b250YWxXcml0aW5nTW9kZSgpKSB7CisgICAgICAgICAgICAgICAgY29tcHV0ZU9mZnNl
dCA9IGZhbHNlOworICAgICAgICAgICAgICAgIGlmIChjb250YWluZXJCbG9jay5pc0hvcml6b250
YWxXcml0aW5nTW9kZSgpICYmIGNvbnRhaW5lckJsb2NrLnN0eWxlKCkuZGlyZWN0aW9uKCkgPT0g
VGV4dERpcmVjdGlvbjo6UlRMKSB7CisgICAgICAgICAgICAgICAgICAgIGxvZ2ljYWxUb3BWYWx1
ZSA9IChhdmFpbGFibGVTcGFjZSArIGxvZ2ljYWxUb3BWYWx1ZSkgLSBjb21wdXRlZFZhbHVlcy5t
X21hcmdpbnMubV9iZWZvcmUgLSBjb21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9hZnRlcjsKKyAg
ICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9IGVsc2Ugewog
ICAgICAgICAvKi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tKlwKQEAgLTQ0NDcsNyArNDQ1NCw4IEBAIHZvaWQgUmVuZGVy
Qm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyhTaXplVHlwZSBoZWlnaHRU
eXBlLCBMZW5ndGgKIAogICAgIC8vIFVzZSBjb21wdXRlZCB2YWx1ZXMgdG8gY2FsY3VsYXRlIHRo
ZSB2ZXJ0aWNhbCBwb3NpdGlvbi4KICAgICBjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9uID0gbG9n
aWNhbFRvcFZhbHVlICsgY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fYmVmb3JlOwotICAgIGNv
bXB1dGVMb2dpY2FsVG9wUG9zaXRpb25lZE9mZnNldChjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9u
LCB0aGlzLCBsb2dpY2FsSGVpZ2h0VmFsdWUgKyBib3JkZXJzUGx1c1BhZGRpbmcsIGNvbnRhaW5l
ckJsb2NrLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0KTsKKyAgICBpZiAoY29tcHV0ZU9mZnNldCkK
KyAgICAgICAgY29tcHV0ZUxvZ2ljYWxUb3BQb3NpdGlvbmVkT2Zmc2V0KGNvbXB1dGVkVmFsdWVz
Lm1fcG9zaXRpb24sIHRoaXMsIGxvZ2ljYWxIZWlnaHRWYWx1ZSArIGJvcmRlcnNQbHVzUGFkZGlu
ZywgY29udGFpbmVyQmxvY2ssIGNvbnRhaW5lckxvZ2ljYWxIZWlnaHQpOwogfQogCiB2b2lkIFJl
bmRlckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsV2lkdGhSZXBsYWNlZChMb2dpY2FsRXh0
ZW50Q29tcHV0ZWRWYWx1ZXMmIGNvbXB1dGVkVmFsdWVzKSBjb25zdApkaWZmIC0tZ2l0IGEvTGF5
b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGM3MjY1MTU2
MDI1YTY0NDU4YjU1YzA1Zjc3NjhlNGFmZTNjYjM5ZjAuLjkyZjFkMDZhMjNkNzk5N2U5ZDkyMTc0
MjdmZGExNGQ0MmExNTczZjIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysg
Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMS0xMC0yNSAgUm9i
IEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIEZpeCBhYnNwb3MtMDIwLmh0bWwK
KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjAxMgor
CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdEV4
cGVjdGF0aW9uczoKKwogMjAyMS0xMC0yNSAgQXl1bWkgS29qaW1hICA8YXl1bWlfa29qaW1hQGFw
cGxlLmNvbT4KIAogICAgICAgICBSZWdyZXNzaW9uIChyMjg0MzMwKTogWyBtYWNPUyB3azEgRGVi
dWcgXSB3ZWJhdWRpby9BdWRpb0J1ZmZlci9odWdlLWJ1ZmZlci5odG1sIGlzIGEgZmxha3kgdGlt
ZW91dC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRU
ZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGJlNzNhZWNhN2ZhMzFmYzhjYWU0YzA3NzZkMjFh
OGU3NTk4YWIyMGEuLjIxNmMwNmFiYWJmMTJlY2MyOTc1MTQ4Yjc2ODEwNDM5Y2Y4ZjYyMmMgMTAw
NjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMv
VGVzdEV4cGVjdGF0aW9ucwpAQCAtNDA5MiwxNCArNDA5Miw5IEBAIHdlYmtpdC5vcmcvYi8yMzAw
ODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRyYW5zZm9ybXMvdHR3
Zi10cmFuCiAKIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvY2VudHJhbC1iYXNlbGluZS1hbGlnbm1lbnQtMDAz
LnhodCBbIEltYWdlT25seUZhaWx1cmUgUGFzcyBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2NsZWFyYW5j
ZS1jYWxjdWxhdGlvbnMtdnJsLTAwMi54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIFBhc3MgXQotd2Vi
a2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
d3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC1pY2ItdmxyLTAzMy54aHQgWyBJbWFn
ZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtaWNi
LXZybC0wMzAueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA5MDgwIGlt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1w
b3Mtbm9uLXJlcGxhY2VkLXZsci0wOTUueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQu
b3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0
aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZsci0yMjUueGh0IFsgSW1hZ2VPbmx5RmFp
bHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZsci0yMjkueGh0
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxh
Y2VkLXZybC0wODgueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgw
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Fi
cy1wb3Mtbm9uLXJlcGxhY2VkLXZybC0yMjAueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJr
aXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13
cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZybC0yMjQueGh0IFsgSW1hZ2VPbmx5
RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2F2YWlsYWJsZS1zaXplLTAwMS5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2F2YWlsYWJsZS1zaXplLTAwMi5odG1s
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2F2YWlsYWJsZS1zaXplLTAw
My5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCkBAIC00MTIzLDcgKzQxMTgsNiBAQCB3ZWJraXQu
b3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0
aW5nLW1vZGVzL2JhY2tncgogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9iYWNrZ3JvdW5kLXNpemUtZG9jdW1l
bnQtcm9vdC12cmwtMDA0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8y
MDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9k
ZXMvYmFja2dyb3VuZC1zaXplLWRvY3VtZW50LXJvb3QtdnJsLTAwNi5odG1sIFsgSW1hZ2VPbmx5
RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2JhY2tncm91bmQtc2l6ZS1kb2N1bWVudC1yb290
LXZybC0wMDguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIwOTA4MCBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9iaWRp
LXBsYWludGV4dC0wMTEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIw
OTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rl
cy9ibG9jay1mbG93LWRpcmVjdGlvbi1zbHItMDQzLnhodCBbIEltYWdlT25seUZhaWx1cmUgXQog
d2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtd3JpdGluZy1tb2Rlcy9ibG9jay1mbG93LWRpcmVjdGlvbi1zbHItMDQ3LnhodCBbIEltYWdl
T25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9ibG9jay1mbG93LWRpcmVjdGlvbi1zbHIt
MDQ4LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQpAQCAtNDQwOSw3ICs0NDAzLDYgQEAgaHR0cC90
ZXN0cy93ZWJzb2NrZXQvdGVzdHMvaHliaS9jbG9zZWQtcG9ydC1kZWxheS5odG1sIFsgU2tpcCBd
CiAKIHdlYmtpdC5vcmcvYi8yMTQyOTEgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXdyaXRpbmctbW9kZXMvYXZhaWxhYmxlLXNpemUtMDA0Lmh0bWwgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQyOTEgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYXZhaWxhYmxlLXNpemUtMDE4Lmh0bWwgWyBJbWFn
ZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQyOTEgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYmFzZWxpbmUtd2l0aC1vcnRob2dvbmFs
LWZsb3ctMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQyOTEg
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvZGly
ZWN0aW9uLXVwcmlnaHQtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcv
Yi8yMTQyOTEgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmct
bW9kZXMvZGlyZWN0aW9uLXVwcmlnaHQtMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdl
YmtpdC5vcmcvYi8yMTQyOTEgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXdyaXRpbmctbW9kZXMvaW5saW5lLWJveC1ib3JkZXItdmxyLTAwMS5odG1sIFsgSW1hZ2VPbmx5
RmFpbHVyZSBdCkBAIC00NjM3LDcgKzQ2MzAsNiBAQCB3ZWJraXQub3JnL2IvMjE0NDYyIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zY29waW5nL3Nsb3R0ZWQtcGxhYwog
CiAjICBjb250YWluLWludHJpbnNpYy1zaXplCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bv
cy0wMTQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9h
YnNwb3MtMDIwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KICMgZmxleC1iYXNpczpjb250ZW50
CiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlv
LTAyNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCkBAIC01MTgzLDQgKzUxNzUsNCBAQCBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9tb3Rpb24vb2Zmc2V0LXJvdGF0ZS0wMDQu
aHRtbCBbIEltYWdlT25seUZhaQogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
bW90aW9uL29mZnNldC1yb3RhdGUtMDA1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIAogIyBJ
UEMgdGVzdCBmYWlsaW5nIGluIERlYnVnIG1vZGUgZHVlIHRvIGFzc2VydC4KLVsgRGVidWcgXSBp
cGMvc2VuZC1pbnZhbGlkLW1lc3NhZ2UuaHRtbCBbIFNraXAgXQpcIE5vIG5ld2xpbmUgYXQgZW5k
IG9mIGZpbGUKK1sgRGVidWcgXSBpcGMvc2VuZC1pbnZhbGlkLW1lc3NhZ2UuaHRtbCBbIFNraXAg
XQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>442402</attachid>
            <date>2021-10-25 12:50:25 -0700</date>
            <delta_ts>2021-10-25 13:41:53 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232012-20211025215023.patch</filename>
            <type>text/plain</type>
            <size>8889</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0ODE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmI0NDI5OThkMzJkYTEy
Yjg2YmUxMjFhZTVmMjViOTY0NDFhMjBmZS4uZmQxNjhiYTk3MTU2MjExZTE2YjJmOTBjZTZiNDcx
OTdiNDNjMmU1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTEwLTI1ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFic3Bvcy0wMjAuaHRtbAor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDEyCisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0lQLgorCisg
ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k
ZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoVXNpbmcgY29uc3QpOgorCiAyMDIx
LTEwLTI1ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAg
ICAgICAgV2ViS2l0IG91Z2h0IHRvIGJlIGFibGUgdG8gcGxheSB2aWRlb3Mgd2l0aG91dCBDb250
ZW50LUxlbmd0aCBIVFRQIGhlYWRlciBmaWVsZHMgYW5kIHdpdGhvdXQgcmFuZ2Ugc3VwcG9ydApk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3Vy
Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCBhNDY3NDkwOWI4M2Y4MDc2
NDU1ZDc4NTM1YWUwNzc1OGRlNzA3MDU4Li5jNzc1OTMyNjUzNTlhMGE2MjM2YjBjYjM2NjQzMTUx
MzI2YzQwYzgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94
LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtNDAz
Miw3ICs0MDMyLDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdp
ZHRoVXNpbmcoU2l6ZVR5cGUgd2lkdGhUeXBlLCBMZW5ndGggbG8KIAogICAgICAgICAgICAgLy8g
VXNlIHRoZSBjb250YWluaW5nIGJsb2NrJ3MgZGlyZWN0aW9uIHJhdGhlciB0aGFuIHRoZSBwYXJl
bnQgYmxvY2sncwogICAgICAgICAgICAgLy8gcGVyIENTUyAyLjEgcmVmZXJlbmNlIHRlc3QgYWJz
cG9zLW5vbi1yZXBsYWNlZC13aWR0aC1tYXJnaW4tMDAwLgotICAgICAgICAgICAgaWYgKGNvbnRh
aW5lckRpcmVjdGlvbiA9PSBUZXh0RGlyZWN0aW9uOjpSVEwpCisgICAgICAgICAgICBpZiAoKGlz
SG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgfHwgIWNvbnRhaW5lckJsb2NrLmlzSG9yaXpvbnRhbFdy
aXRpbmdNb2RlKCkpICYmIGNvbnRhaW5lckRpcmVjdGlvbiA9PSBUZXh0RGlyZWN0aW9uOjpSVEwp
CiAgICAgICAgICAgICAgICAgbG9naWNhbExlZnRWYWx1ZSA9IChhdmFpbGFibGVTcGFjZSArIGxv
Z2ljYWxMZWZ0VmFsdWUpIC0gbWFyZ2luTG9naWNhbExlZnRWYWx1ZSAtIG1hcmdpbkxvZ2ljYWxS
aWdodFZhbHVlOwogICAgICAgICB9CiAgICAgfSBlbHNlIHsKQEAgLTQzNTIsNiArNDM1Miw3IEBA
IHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyhTaXpl
VHlwZSBoZWlnaHRUeXBlLCBMZW5ndGgKICAgICAgICAgICAgIHJlc29sdmVkTG9naWNhbEhlaWdo
dCA9IGFkanVzdENvbnRlbnRCb3hMb2dpY2FsSGVpZ2h0Rm9yQm94U2l6aW5nKHZhbHVlRm9yTGVu
Z3RoKGxvZ2ljYWxIZWlnaHRMZW5ndGgsIGNvbnRhaW5lckxvZ2ljYWxIZWlnaHQpKTsKICAgICB9
CiAKKyAgICBib29sIGNvbXB1dGVPZmZzZXQgPSB0cnVlOwogICAgIGlmICghbG9naWNhbFRvcElz
QXV0byAmJiAhbG9naWNhbEhlaWdodElzQXV0byAmJiAhbG9naWNhbEJvdHRvbUlzQXV0bykgewog
ICAgICAgICAvKi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tKlwKICAgICAgICAgICogSWYgbm9uZSBvZiB0aGUgdGhy
ZWUgYXJlICdhdXRvJzogSWYgYm90aCAnbWFyZ2luLXRvcCcgYW5kICdtYXJnaW4tCkBAIC00Mzg3
LDYgKzQzODgsMTIgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhl
aWdodFVzaW5nKFNpemVUeXBlIGhlaWdodFR5cGUsIExlbmd0aAogICAgICAgICAgICAgLy8gT3Zl
ci1jb25zdHJhaW5lZCwgKG5vIG5lZWQgc29sdmUgZm9yIGJvdHRvbSkKICAgICAgICAgICAgIGNv
bXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5tX2JlZm9yZSA9IHZhbHVlRm9yTGVuZ3RoKG1hcmdpbkJl
Zm9yZSwgY29udGFpbmVyUmVsYXRpdmVMb2dpY2FsV2lkdGgpOwogICAgICAgICAgICAgY29tcHV0
ZWRWYWx1ZXMubV9tYXJnaW5zLm1fYWZ0ZXIgPSB2YWx1ZUZvckxlbmd0aChtYXJnaW5BZnRlciwg
Y29udGFpbmVyUmVsYXRpdmVMb2dpY2FsV2lkdGgpOworICAgICAgICAgICAgaWYgKCFpc0hvcml6
b250YWxXcml0aW5nTW9kZSgpKSB7CisgICAgICAgICAgICAgICAgY29tcHV0ZU9mZnNldCA9IGZh
bHNlOworICAgICAgICAgICAgICAgIGlmIChjb250YWluZXJCbG9jay5pc0hvcml6b250YWxXcml0
aW5nTW9kZSgpICYmIGNvbnRhaW5lckJsb2NrLnN0eWxlKCkuZGlyZWN0aW9uKCkgPT0gVGV4dERp
cmVjdGlvbjo6UlRMKSB7CisgICAgICAgICAgICAgICAgICAgIGxvZ2ljYWxUb3BWYWx1ZSA9IChh
dmFpbGFibGVTcGFjZSArIGxvZ2ljYWxUb3BWYWx1ZSkgLSBjb21wdXRlZFZhbHVlcy5tX21hcmdp
bnMubV9iZWZvcmUgLSBjb21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9hZnRlcjsKKyAgICAgICAg
ICAgICAgICB9CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAg
ICAvKi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tKlwKQEAgLTQ0NDcsNyArNDQ1NCw4IEBAIHZvaWQgUmVuZGVyQm94Ojpj
b21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyhTaXplVHlwZSBoZWlnaHRUeXBlLCBM
ZW5ndGgKIAogICAgIC8vIFVzZSBjb21wdXRlZCB2YWx1ZXMgdG8gY2FsY3VsYXRlIHRoZSB2ZXJ0
aWNhbCBwb3NpdGlvbi4KICAgICBjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9uID0gbG9naWNhbFRv
cFZhbHVlICsgY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fYmVmb3JlOwotICAgIGNvbXB1dGVM
b2dpY2FsVG9wUG9zaXRpb25lZE9mZnNldChjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9uLCB0aGlz
LCBsb2dpY2FsSGVpZ2h0VmFsdWUgKyBib3JkZXJzUGx1c1BhZGRpbmcsIGNvbnRhaW5lckJsb2Nr
LCBjb250YWluZXJMb2dpY2FsSGVpZ2h0KTsKKyAgICBpZiAoY29tcHV0ZU9mZnNldCkKKyAgICAg
ICAgY29tcHV0ZUxvZ2ljYWxUb3BQb3NpdGlvbmVkT2Zmc2V0KGNvbXB1dGVkVmFsdWVzLm1fcG9z
aXRpb24sIHRoaXMsIGxvZ2ljYWxIZWlnaHRWYWx1ZSArIGJvcmRlcnNQbHVzUGFkZGluZywgY29u
dGFpbmVyQmxvY2ssIGNvbnRhaW5lckxvZ2ljYWxIZWlnaHQpOwogfQogCiB2b2lkIFJlbmRlckJv
eDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsV2lkdGhSZXBsYWNlZChMb2dpY2FsRXh0ZW50Q29t
cHV0ZWRWYWx1ZXMmIGNvbXB1dGVkVmFsdWVzKSBjb25zdApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz
dHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGU0OGM4MDk2ZDZiMWEx
MmE1NWRjNzc3NzM3MGM5YzhjNzEyYTQ2MjIuLjRhMjBlMWI5NWE4MTY1ZGU3ZGE0OTk4MGVlNWFm
NmI4NDE4ZjdkMmUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlv
dXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMS0xMC0yNSAgUm9iIEJ1aXMg
IDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIEZpeCBhYnNwb3MtMDIwLmh0bWwKKyAgICAg
ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjAxMgorCisgICAg
ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdEV4cGVjdGF0
aW9uczoKKwogMjAyMS0xMC0yNSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAg
ICAgICAgIFJlZ3Jlc3Npb24gKHIyODQ2MTApOiBbIGlPUyBCaWdTdXIgd2syIF0gaHR0cC90ZXN0
cy9zZWN1cml0eS93aW5kb3ctb3BlbmVkLWZyb20tc2FuZGJveGVkLWlmcmFtZS1zaG91bGQtaW5o
ZXJpdC1zYW5kYm94Lmh0bWwgaXMgZmFpbGluZwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVz
dEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggZmEwZjAy
MjYzZjYxMWJiYWIzNDc5ZWJmOTBjYWE5MWRiOGVkZDQ0YS4uYzQyZTMyYTJmOWI2MzcwMjg1YWFl
NGFjODBhOGRjOGRlYzIxYTgwNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0
aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00MDkzLDE0ICs0MDkz
LDkgQEAgd2Via2l0Lm9yZy9iLzIzMDA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3MtdHJhbnNmb3Jtcy90dHdmLXRyYW4KIAogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9jZW50cmFs
LWJhc2VsaW5lLWFsaWdubWVudC0wMDMueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBQYXNzIF0KIHdl
YmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXdyaXRpbmctbW9kZXMvY2xlYXJhbmNlLWNhbGN1bGF0aW9ucy12cmwtMDAyLnhodCBbIEltYWdl
T25seUZhaWx1cmUgUGFzcyBdCi13ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2Vk
LWljYi12bHItMDMzLnhodCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4
MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9h
YnMtcG9zLW5vbi1yZXBsYWNlZC1pY2ItdnJsLTAzMC54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
LXdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdmxyLTA5NS54aHQgWyBJbWFn
ZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdmxy
LTIyNS54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1u
b24tcmVwbGFjZWQtdmxyLTIyOS54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcv
Yi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmct
bW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdnJsLTA4OC54aHQgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdnJsLTIyMC54aHQgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQt
dnJsLTIyNC54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYXZhaWxh
YmxlLXNpemUtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkw
ODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMv
YXZhaWxhYmxlLXNpemUtMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcv
Yi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmct
bW9kZXMvYXZhaWxhYmxlLXNpemUtMDAzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KQEAgLTQx
MjQsNyArNDExOSw2IEBAIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYmFja2dyCiB3ZWJraXQub3JnL2IvMjA5
MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVz
L2JhY2tncm91bmQtc2l6ZS1kb2N1bWVudC1yb290LXZybC0wMDQuaHRtbCBbIEltYWdlT25seUZh
aWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9iYWNrZ3JvdW5kLXNpemUtZG9jdW1lbnQtcm9vdC12
cmwtMDA2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYmFja2dy
b3VuZC1zaXplLWRvY3VtZW50LXJvb3QtdnJsLTAwOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd
Ci13ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy13cml0aW5nLW1vZGVzL2JpZGktcGxhaW50ZXh0LTAxMS5odG1sIFsgSW1hZ2VPbmx5RmFp
bHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Jsb2NrLWZsb3ctZGlyZWN0aW9uLXNsci0wNDMueGh0
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Jsb2NrLWZsb3ctZGlyZWN0
aW9uLXNsci0wNDcueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgw
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Js
b2NrLWZsb3ctZGlyZWN0aW9uLXNsci0wNDgueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCkBAIC00
NDEwLDcgKzQ0MDQsNiBAQCBodHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0cy9oeWJpL2Nsb3NlZC1w
b3J0LWRlbGF5Lmh0bWwgWyBTa2lwIF0KIAogd2Via2l0Lm9yZy9iLzIxNDI5MSBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hdmFpbGFibGUtc2l6
ZS0wMDQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDI5MSBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hdmFpbGFi
bGUtc2l6ZS0wMTguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDI5
MSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9i
YXNlbGluZS13aXRoLW9ydGhvZ29uYWwtZmxvdy0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg
XQogd2Via2l0Lm9yZy9iLzIxNDI5MSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3Mtd3JpdGluZy1tb2Rlcy9kaXJlY3Rpb24tdXByaWdodC0wMDEuaHRtbCBbIEltYWdlT25s
eUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDI5MSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9kaXJlY3Rpb24tdXByaWdodC0wMDIuaHRtbCBb
IEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDI5MSBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9pbmxpbmUtYm94LWJvcmRlci12
bHItMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KQEAgLTQ2MzgsNyArNDYzMSw2IEBAIHdl
YmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXNjb3Bpbmcvc2xvdHRlZC1wbGFjCiAKICMgIGNvbnRhaW4taW50cmluc2ljLXNpemUKIHdlYmtp
dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp
emluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13
ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMjAuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg
XQogIyBmbGV4LWJhc2lzOmNvbnRlbnQKIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3Bl
Y3QtcmF0aW8tMDI1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0
NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt
cmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>442406</attachid>
            <date>2021-10-25 13:41:59 -0700</date>
            <delta_ts>2021-10-27 05:14:42 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232012-20211025224157.patch</filename>
            <type>text/plain</type>
            <size>1804</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0ODIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmI0NDI5OThkMzJkYTEy
Yjg2YmUxMjFhZTVmMjViOTY0NDFhMjBmZS4uOTZkNTIzY2NmNjBhZDY2YzFhM2JkMzFlMjU1ZDdh
MTRjNGIwNjU0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTEwLTI1ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFic3Bvcy0wMjAuaHRtbAor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDEyCisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0lQLgorCisg
ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k
ZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoUmVwbGFjZWQgY29uc3QpOgorCiAy
MDIxLTEwLTI1ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAK
ICAgICAgICAgV2ViS2l0IG91Z2h0IHRvIGJlIGFibGUgdG8gcGxheSB2aWRlb3Mgd2l0aG91dCBD
b250ZW50LUxlbmd0aCBIVFRQIGhlYWRlciBmaWVsZHMgYW5kIHdpdGhvdXQgcmFuZ2Ugc3VwcG9y
dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9T
b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCBhNDY3NDkwOWI4M2Y4
MDc2NDU1ZDc4NTM1YWUwNzc1OGRlNzA3MDU4Li40YTQxYTI5MTg0YzgyNGE3ZWQ2MDJhMDk5YjVj
ZmEyYmMzMzhiZDhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy
Qm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAt
NDU4MSw3ICs0NTgxLDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNh
bFdpZHRoUmVwbGFjZWQoTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWUKICAgICAgICAgbG9naWNh
bFJpZ2h0VmFsdWUgPSB2YWx1ZUZvckxlbmd0aChsb2dpY2FsUmlnaHQsIGNvbnRhaW5lckxvZ2lj
YWxXaWR0aCk7CiAgICAgICAgIGxvZ2ljYWxMZWZ0VmFsdWUgPSB2YWx1ZUZvckxlbmd0aChsb2dp
Y2FsTGVmdCwgY29udGFpbmVyTG9naWNhbFdpZHRoKTsKICAgICAgICAgLy8gSWYgdGhlIGNvbnRh
aW5pbmcgYmxvY2sgaXMgcmlnaHQtdG8tbGVmdCwgdGhlbiBwdXNoIHRoZSBsZWZ0IHBvc2l0aW9u
IGFzIGZhciB0byB0aGUgcmlnaHQgYXMgcG9zc2libGUKLSAgICAgICAgaWYgKGNvbnRhaW5lckRp
cmVjdGlvbiA9PSBUZXh0RGlyZWN0aW9uOjpSVEwpIHsKKyAgICAgICAgaWYgKGlzSG9yaXpvbnRh
bFdyaXRpbmdNb2RlKCkgJiYgY29udGFpbmVyRGlyZWN0aW9uID09IFRleHREaXJlY3Rpb246OlJU
TCkgewogICAgICAgICAgICAgaW50IHRvdGFsTG9naWNhbFdpZHRoID0gY29tcHV0ZWRWYWx1ZXMu
bV9leHRlbnQgKyBsb2dpY2FsTGVmdFZhbHVlICsgbG9naWNhbFJpZ2h0VmFsdWUgKyAgbWFyZ2lu
TG9naWNhbExlZnRBbGlhcyArIG1hcmdpbkxvZ2ljYWxSaWdodEFsaWFzOwogICAgICAgICAgICAg
bG9naWNhbExlZnRWYWx1ZSA9IGNvbnRhaW5lckxvZ2ljYWxXaWR0aCAtICh0b3RhbExvZ2ljYWxX
aWR0aCAtIGxvZ2ljYWxMZWZ0VmFsdWUpOwogICAgICAgICB9Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>442581</attachid>
            <date>2021-10-27 05:14:47 -0700</date>
            <delta_ts>2021-10-27 06:24:50 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232012-20211027141445.patch</filename>
            <type>text/plain</type>
            <size>8372</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0ODIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmI0NDI5OThkMzJkYTEy
Yjg2YmUxMjFhZTVmMjViOTY0NDFhMjBmZS4uNjY3YjAxOWQ3ZmE2ZmI5Y2Y3YTg1NWI0NmUyOTk2
MjMyNGRlY2M2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTEwLTI3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFic3Bvcy0wMjAuaHRtbAor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDEyCisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0lQLgorCisg
ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcDoKKyAgICAgICAgKFdl
YkNvcmU6OlJlbmRlckJveE1vZGVsT2JqZWN0OjpyZWxhdGl2ZVBvc2l0aW9uT2Zmc2V0IGNvbnN0
KToKKwogMjAyMS0xMC0yNSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQu
b3JnPgogCiAgICAgICAgIFdlYktpdCBvdWdodCB0byBiZSBhYmxlIHRvIHBsYXkgdmlkZW9zIHdp
dGhvdXQgQ29udGVudC1MZW5ndGggSFRUUCBoZWFkZXIgZmllbGRzIGFuZCB3aXRob3V0IHJhbmdl
IHN1cHBvcnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hN
b2RlbE9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxP
YmplY3QuY3BwCmluZGV4IDI0NTA5MTlmNDI2NDQ2Mzc0MmVjZDgwYjlkMmY2NDQyZGYxZTAxZjEu
LmUxMDlmMTRiODYzYWYwZDE0MjU0OGNjOTAyMGIwMGU5ZWE3NTljOTEgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKKysrIGIvU291
cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcApAQCAtMzQ2LDE2
ICszNDYsNDEgQEAgTGF5b3V0U2l6ZSBSZW5kZXJCb3hNb2RlbE9iamVjdDo6cmVsYXRpdmVQb3Np
dGlvbk9mZnNldCgpIGNvbnN0CiAgICAgLy8gY2FsbCBhdmFpbGFibGVXaWR0aCBvbiBvdXIgY29u
dGFpbmluZyBibG9jay4KICAgICAvLyBIb3dldmVyIGZvciBncmlkIGl0ZW1zIHRoZSBjb250YWlu
aW5nIGJsb2NrIGlzIHRoZSBncmlkIGFyZWEsIHNvIG9mZnNldHMgc2hvdWxkIGJlIHJlc29sdmVk
IGFnYWluc3QgdGhhdDoKICAgICAvLyBodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLWdyaWQv
I2dyaWQtaXRlbS1zaXppbmcKKyAgICBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IGxlZnQ7Cisg
ICAgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiByaWdodDsKICAgICBpZiAoIXN0eWxlKCkubGVm
dCgpLmlzQXV0bygpIHx8ICFzdHlsZSgpLnJpZ2h0KCkuaXNBdXRvKCkpIHsKICAgICAgICAgTGF5
b3V0VW5pdCBhdmFpbGFibGVXaWR0aCA9IGhhc092ZXJyaWRpbmdDb250YWluaW5nQmxvY2tDb250
ZW50V2lkdGgoKQogICAgICAgICAgICAgPyBvdmVycmlkaW5nQ29udGFpbmluZ0Jsb2NrQ29udGVu
dFdpZHRoKCkudmFsdWVfb3IoTGF5b3V0VW5pdCgpKSA6IGNvbnRhaW5pbmdCbG9jaygpLT5hdmFp
bGFibGVXaWR0aCgpOwogICAgICAgICBpZiAoIXN0eWxlKCkubGVmdCgpLmlzQXV0bygpKSB7Ci0g
ICAgICAgICAgICBpZiAoIXN0eWxlKCkucmlnaHQoKS5pc0F1dG8oKSAmJiAhY29udGFpbmluZ0Js
b2NrKCktPnN0eWxlKCkuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpKQotICAgICAgICAgICAgICAg
IG9mZnNldC5zZXRXaWR0aCgtdmFsdWVGb3JMZW5ndGgoc3R5bGUoKS5yaWdodCgpLCAhc3R5bGUo
KS5yaWdodCgpLmlzRml4ZWQoKSA/IGF2YWlsYWJsZVdpZHRoIDogMF9sdSkpOwotICAgICAgICAg
ICAgZWxzZQotICAgICAgICAgICAgICAgIG9mZnNldC5leHBhbmQodmFsdWVGb3JMZW5ndGgoc3R5
bGUoKS5sZWZ0KCksICFzdHlsZSgpLmxlZnQoKS5pc0ZpeGVkKCkgPyBhdmFpbGFibGVXaWR0aCA6
IDBfbHUpLCAwX2x1KTsKKyAgICAgICAgICAgIGxlZnQgPSB2YWx1ZUZvckxlbmd0aChzdHlsZSgp
LmxlZnQoKSwgIXN0eWxlKCkubGVmdCgpLmlzRml4ZWQoKSA/IGF2YWlsYWJsZVdpZHRoIDogMF9s
dSk7CiAgICAgICAgIH0gZWxzZSBpZiAoIXN0eWxlKCkucmlnaHQoKS5pc0F1dG8oKSkKLSAgICAg
ICAgICAgIG9mZnNldC5leHBhbmQoLXZhbHVlRm9yTGVuZ3RoKHN0eWxlKCkucmlnaHQoKSwgIXN0
eWxlKCkucmlnaHQoKS5pc0ZpeGVkKCkgPyBhdmFpbGFibGVXaWR0aCA6IDBfbHUpLCAwX2x1KTsK
KyAgICAgICAgICAgIHJpZ2h0ID0gdmFsdWVGb3JMZW5ndGgoc3R5bGUoKS5yaWdodCgpLCAhc3R5
bGUoKS5yaWdodCgpLmlzRml4ZWQoKSA/IGF2YWlsYWJsZVdpZHRoIDogMF9sdSk7CisgICAgfQor
ICAgIGlmICghbGVmdCAmJiAhcmlnaHQpIHsKKyAgICAgICAgbGVmdCA9IExheW91dFVuaXQoKTsK
KyAgICAgICAgcmlnaHQgPSBMYXlvdXRVbml0KCk7CisgICAgfQorICAgIGlmICghbGVmdCkKKyAg
ICAgICAgbGVmdCA9IC1yaWdodC52YWx1ZSgpOworICAgIGlmICghcmlnaHQpCisgICAgICAgIHJp
Z2h0ID0gLWxlZnQudmFsdWUoKTsKKyAgICBib29sIGlzTHRyID0gY29udGFpbmluZ0Jsb2NrKCkt
PnN0eWxlKCkuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpOworICAgIFdyaXRpbmdNb2RlIHdyaXRp
bmdNb2RlID0gY29udGFpbmluZ0Jsb2NrKCktPnN0eWxlKCkud3JpdGluZ01vZGUoKTsKKyAgICBz
d2l0Y2ggKHdyaXRpbmdNb2RlKSB7CisgICAgY2FzZSBXcml0aW5nTW9kZTo6VG9wVG9Cb3R0b206
CisgICAgICAgIGlmIChpc0x0cikKKyAgICAgICAgICAgIG9mZnNldC5leHBhbmQobGVmdC52YWx1
ZSgpLCBMYXlvdXRVbml0KCkpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBvZmZzZXQuc2V0
V2lkdGgoLXJpZ2h0LnZhbHVlKCkpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIFdyaXRpbmdN
b2RlOjpSaWdodFRvTGVmdDoKKyAgICAgICAgb2Zmc2V0LnNldFdpZHRoKC1yaWdodC52YWx1ZSgp
KTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBXcml0aW5nTW9kZTo6TGVmdFRvUmlnaHQ6Cisg
ICAgICAgIG9mZnNldC5leHBhbmQobGVmdC52YWx1ZSgpLCBMYXlvdXRVbml0KCkpOworICAgICAg
ICBicmVhazsKKyAgICBkZWZhdWx0OgorICAgICAgICBicmVhazsKICAgICB9CiAKICAgICAvLyBJ
ZiB0aGUgY29udGFpbmluZyBibG9jayBvZiBhIHJlbGF0aXZlbHkgcG9zaXRpb25lZCBlbGVtZW50
IGRvZXMgbm90CkBAIC0zNjYsNiArMzkxLDggQEAgTGF5b3V0U2l6ZSBSZW5kZXJCb3hNb2RlbE9i
amVjdDo6cmVsYXRpdmVQb3NpdGlvbk9mZnNldCgpIGNvbnN0CiAgICAgLy8gU2VlIDxodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjYzOTY+LgogICAgIC8vIEFub3RoZXIg
ZXhjZXB0aW9uIGlzIGEgZ3JpZCBpdGVtLCBhcyB0aGUgY29udGFpbmluZyBibG9jayBpcyB0aGUg
Z3JpZCBhcmVhOgogICAgIC8vIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZ3JpZC8jZ3Jp
ZC1pdGVtLXNpemluZworICAgIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gdG9wOworICAgIHN0
ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gYm90dG9tOwogICAgIGlmICghc3R5bGUoKS50b3AoKS5p
c0F1dG8oKQogICAgICAgICAmJiAoIXN0eWxlKCkudG9wKCkuaXNQZXJjZW50T3JDYWxjdWxhdGVk
KCkKICAgICAgICAgICAgIHx8ICFjb250YWluaW5nQmxvY2soKS0+aGFzQXV0b0hlaWdodE9yQ29u
dGFpbmluZ0Jsb2NrV2l0aEF1dG9IZWlnaHQoKQpAQCAtMzc0LDE4ICs0MDEsNDYgQEAgTGF5b3V0
U2l6ZSBSZW5kZXJCb3hNb2RlbE9iamVjdDo6cmVsYXRpdmVQb3NpdGlvbk9mZnNldCgpIGNvbnN0
CiAgICAgICAgIC8vIEZJWE1FOiBUaGUgY29tcHV0YXRpb24gb2YgdGhlIGF2YWlsYWJsZSBoZWln
aHQgaXMgcmVwZWF0ZWQgbGF0ZXIgZm9yICJib3R0b20iLgogICAgICAgICAvLyBXZSBjb3VsZCBy
ZWZhY3RvciB0aGlzIGFuZCBtb3ZlIGl0IHRvIHNvbWUgY29tbW9uIGNvZGUgZm9yIGJvdGggaWZz
LCBob3dldmVyIG1vdmluZyBpdCBvdXRzaWRlIG9mIHRoZSBpZnMKICAgICAgICAgLy8gaXMgbm90
IHBvc3NpYmxlIGFzIGl0J2QgY2F1c2UgcGVyZm9ybWFuY2UgcmVncmVzc2lvbnMuCi0gICAgICAg
IG9mZnNldC5leHBhbmQoMF9sdSwgdmFsdWVGb3JMZW5ndGgoc3R5bGUoKS50b3AoKSwgIXN0eWxl
KCkudG9wKCkuaXNGaXhlZCgpCisgICAgICAgIHRvcCA9IHZhbHVlRm9yTGVuZ3RoKHN0eWxlKCku
dG9wKCksICFzdHlsZSgpLnRvcCgpLmlzRml4ZWQoKQogICAgICAgICAgICAgPyAoaGFzT3ZlcnJp
ZGluZ0NvbnRhaW5pbmdCbG9ja0NvbnRlbnRIZWlnaHQoKSA/IG92ZXJyaWRpbmdDb250YWluaW5n
QmxvY2tDb250ZW50SGVpZ2h0KCkudmFsdWVfb3IoMF9sdSkgOiBjb250YWluaW5nQmxvY2soKS0+
YXZhaWxhYmxlSGVpZ2h0KCkpCi0gICAgICAgICAgICA6IExheW91dFVuaXQoKSkpOwotICAgIH0g
ZWxzZSBpZiAoIXN0eWxlKCkuYm90dG9tKCkuaXNBdXRvKCkKKyAgICAgICAgICAgIDogTGF5b3V0
VW5pdCgpKTsKKyAgICB9CisgICAgaWYgKCFzdHlsZSgpLmJvdHRvbSgpLmlzQXV0bygpCiAgICAg
ICAgICYmICghc3R5bGUoKS5ib3R0b20oKS5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKQogICAgICAg
ICAgICAgfHwgIWNvbnRhaW5pbmdCbG9jaygpLT5oYXNBdXRvSGVpZ2h0T3JDb250YWluaW5nQmxv
Y2tXaXRoQXV0b0hlaWdodCgpCiAgICAgICAgICAgICB8fCBjb250YWluaW5nQmxvY2soKS0+c3Ry
ZXRjaGVzVG9WaWV3cG9ydCgpCiAgICAgICAgICAgICB8fCBoYXNPdmVycmlkaW5nQ29udGFpbmlu
Z0Jsb2NrQ29udGVudEhlaWdodCgpKSkgewogICAgICAgICAvLyBGSVhNRTogQ2hlY2sgY29tbWVu
dCBhYm92ZSBmb3IgInRvcCIsIGl0IGFwcGxpZXMgaGVyZSB0b28uCi0gICAgICAgIG9mZnNldC5l
eHBhbmQoMF9sdSwgLXZhbHVlRm9yTGVuZ3RoKHN0eWxlKCkuYm90dG9tKCksICFzdHlsZSgpLmJv
dHRvbSgpLmlzRml4ZWQoKQorICAgICAgICBib3R0b20gPSB2YWx1ZUZvckxlbmd0aChzdHlsZSgp
LmJvdHRvbSgpLCAhc3R5bGUoKS5ib3R0b20oKS5pc0ZpeGVkKCkKICAgICAgICAgICAgID8gKGhh
c092ZXJyaWRpbmdDb250YWluaW5nQmxvY2tDb250ZW50SGVpZ2h0KCkgPyBvdmVycmlkaW5nQ29u
dGFpbmluZ0Jsb2NrQ29udGVudEhlaWdodCgpLnZhbHVlX29yKDBfbHUpIDogY29udGFpbmluZ0Js
b2NrKCktPmF2YWlsYWJsZUhlaWdodCgpKQotICAgICAgICAgICAgOiBMYXlvdXRVbml0KCkpKTsK
KyAgICAgICAgICAgIDogTGF5b3V0VW5pdCgpKTsKKyAgICB9CisgICAgaWYgKCF0b3AgJiYgIWJv
dHRvbSkgeworICAgICAgICB0b3AgPSBMYXlvdXRVbml0KCk7CisgICAgICAgIGJvdHRvbSA9IExh
eW91dFVuaXQoKTsKKyAgICB9CisgICAgaWYgKCF0b3ApCisgICAgICAgIHRvcCA9IC1ib3R0b20u
dmFsdWUoKTsKKyAgICBpZiAoIWJvdHRvbSkKKyAgICAgICAgYm90dG9tID0gLXRvcC52YWx1ZSgp
OworICAgIHN3aXRjaCAod3JpdGluZ01vZGUpIHsKKyAgICBjYXNlIFdyaXRpbmdNb2RlOjpUb3BU
b0JvdHRvbToKKyAgICAgICAgb2Zmc2V0LmV4cGFuZChMYXlvdXRVbml0KCksIHRvcC52YWx1ZSgp
KTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBXcml0aW5nTW9kZTo6UmlnaHRUb0xlZnQ6Cisg
ICAgICAgIGlmIChpc0x0cikKKyAgICAgICAgICAgIG9mZnNldC5leHBhbmQoTGF5b3V0VW5pdCgp
LCB0b3AudmFsdWUoKSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIG9mZnNldC5zZXRIZWln
aHQoLWJvdHRvbS52YWx1ZSgpKTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBXcml0aW5nTW9k
ZTo6TGVmdFRvUmlnaHQ6CisgICAgICAgIGlmIChpc0x0cikKKyAgICAgICAgICAgIG9mZnNldC5l
eHBhbmQoTGF5b3V0VW5pdCgpLCB0b3AudmFsdWUoKSk7CisgICAgICAgIGVsc2UKKyAgICAgICAg
ICAgIG9mZnNldC5zZXRIZWlnaHQoLWJvdHRvbS52YWx1ZSgpKTsKKyAgICAgICAgYnJlYWs7Cisg
ICAgZGVmYXVsdDoKKyAgICAgICAgYnJlYWs7CiAgICAgfQogCiAgICAgcmV0dXJuIG9mZnNldDsK
ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwppbmRleCA2NjEzNDJkYzEzMjhmMzkxOWEzZTA5ZGZhMjk5NmNiZWQ2OGY5ZDMwLi4wYjdjNDRi
YzNkMGQwOWYyMDNkZDQyMDM5MWJhMjFhYWU1YWVjNmQ3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0
cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAK
KzIwMjEtMTAtMjcgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBGaXgg
YWJzcG9zLTAyMC5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn
LmNnaT9pZD0yMzIwMTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor
ICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMTAtMjUgIEthdGUgQ2hlbmV5ICA8
a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CiAKICAgICAgICAgW0FwcCBQcml2YWN5IFJlcG9y
dF0gQ09SUyBwcmVmbGlnaHQgcmVxdWVzdHMgYXR0cmlidXRlZCBpbmNvcnJlY3RseQpkaWZmIC0t
Z2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBl
Y3RhdGlvbnMKaW5kZXggOThkMGYzZGYwNThlZjBmMTZmYTQwZjg0ZDQ1YTdmZjM0Y2FmYzdjMC4u
ODEyNTcwNTdjNTEzZmExNjljMTYyZmJhYTQ0OWUwNTkxNGVhYWJlYiAxMDA2NDQKLS0tIGEvTGF5
b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRp
b25zCkBAIC00MjAxLDkgKzQyMDEsNyBAQCB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL291dGxpbgogd2Via2l0
Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3Jp
dGluZy1tb2Rlcy9vdXRsaW5lLWlubGluZS12cmwtMDA2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXdyaXRpbmctbW9kZXMvb3ZlcmNvbnN0cmFpbmVkLXJlbC1wb3MtbHRyLWxlZnQtcmln
aHQtdnJsLTAwNC54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAg
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvb3Zl
cmNvbnN0cmFpbmVkLXJlbC1wb3MtbHRyLXRvcC1ib3R0b20tdnJsLTAwMi54aHQgWyBJbWFnZU9u
bHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvb3ZlcmNvbnN0cmFpbmVkLXJlbC1wb3MtcnRs
LWxlZnQtcmlnaHQtdmxyLTAwOS54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcv
Yi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmct
bW9kZXMvb3ZlcmNvbnN0cmFpbmVkLXJlbC1wb3MtcnRsLWxlZnQtcmlnaHQtdnJsLTAwOC54aHQg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvb3ZlcmNvbnN0cmFpbmVkLXJl
bC1wb3MtcnRsLXRvcC1ib3R0b20tdmxyLTAwNy54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdl
YmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXdyaXRpbmctbW9kZXMvb3ZlcmNvbnN0cmFpbmVkLXJlbC1wb3MtcnRsLXRvcC1ib3R0b20tdnJs
LTAwNi54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvcm93LXByb2dy
ZXNzaW9uLXNsci0wMjMueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5
MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVz
L3Jvdy1wcm9ncmVzc2lvbi1zbHItMDI5LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQo=
</data>
<flag name="commit-queue"
          id="467115"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>442582</attachid>
            <date>2021-10-27 06:19:10 -0700</date>
            <delta_ts>2021-10-27 08:20:16 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232012-20211027151909.patch</filename>
            <type>text/plain</type>
            <size>11000</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0ODIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmI0NDI5OThkMzJkYTEy
Yjg2YmUxMjFhZTVmMjViOTY0NDFhMjBmZS4uNjY3YjAxOWQ3ZmE2ZmI5Y2Y3YTg1NWI0NmUyOTk2
MjMyNGRlY2M2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTEwLTI3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFic3Bvcy0wMjAuaHRtbAor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDEyCisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0lQLgorCisg
ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcDoKKyAgICAgICAgKFdl
YkNvcmU6OlJlbmRlckJveE1vZGVsT2JqZWN0OjpyZWxhdGl2ZVBvc2l0aW9uT2Zmc2V0IGNvbnN0
KToKKwogMjAyMS0xMC0yNSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQu
b3JnPgogCiAgICAgICAgIFdlYktpdCBvdWdodCB0byBiZSBhYmxlIHRvIHBsYXkgdmlkZW9zIHdp
dGhvdXQgQ29udGVudC1MZW5ndGggSFRUUCBoZWFkZXIgZmllbGRzIGFuZCB3aXRob3V0IHJhbmdl
IHN1cHBvcnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu
Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggYTQ2NzQ5
MDliODNmODA3NjQ1NWQ3ODUzNWFlMDc3NThkZTcwNzA1OC4uNGE0MWEyOTE4NGM4MjRhN2VkNjAy
YTA5OWI1Y2ZhMmJjMzM4YmQ4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n
L1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5j
cHAKQEAgLTQ1ODEsNyArNDU4MSw3IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25l
ZExvZ2ljYWxXaWR0aFJlcGxhY2VkKExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlCiAgICAgICAg
IGxvZ2ljYWxSaWdodFZhbHVlID0gdmFsdWVGb3JMZW5ndGgobG9naWNhbFJpZ2h0LCBjb250YWlu
ZXJMb2dpY2FsV2lkdGgpOwogICAgICAgICBsb2dpY2FsTGVmdFZhbHVlID0gdmFsdWVGb3JMZW5n
dGgobG9naWNhbExlZnQsIGNvbnRhaW5lckxvZ2ljYWxXaWR0aCk7CiAgICAgICAgIC8vIElmIHRo
ZSBjb250YWluaW5nIGJsb2NrIGlzIHJpZ2h0LXRvLWxlZnQsIHRoZW4gcHVzaCB0aGUgbGVmdCBw
b3NpdGlvbiBhcyBmYXIgdG8gdGhlIHJpZ2h0IGFzIHBvc3NpYmxlCi0gICAgICAgIGlmIChjb250
YWluZXJEaXJlY3Rpb24gPT0gVGV4dERpcmVjdGlvbjo6UlRMKSB7CisgICAgICAgIGlmIChpc0hv
cml6b250YWxXcml0aW5nTW9kZSgpICYmIGNvbnRhaW5lckRpcmVjdGlvbiA9PSBUZXh0RGlyZWN0
aW9uOjpSVEwpIHsKICAgICAgICAgICAgIGludCB0b3RhbExvZ2ljYWxXaWR0aCA9IGNvbXB1dGVk
VmFsdWVzLm1fZXh0ZW50ICsgbG9naWNhbExlZnRWYWx1ZSArIGxvZ2ljYWxSaWdodFZhbHVlICsg
IG1hcmdpbkxvZ2ljYWxMZWZ0QWxpYXMgKyBtYXJnaW5Mb2dpY2FsUmlnaHRBbGlhczsKICAgICAg
ICAgICAgIGxvZ2ljYWxMZWZ0VmFsdWUgPSBjb250YWluZXJMb2dpY2FsV2lkdGggLSAodG90YWxM
b2dpY2FsV2lkdGggLSBsb2dpY2FsTGVmdFZhbHVlKTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcCBiL1NvdXJj
ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKaW5kZXggMjQ1MDkx
OWY0MjY0NDYzNzQyZWNkODBiOWQyZjY0NDJkZjFlMDFmMS4uYTgwYWY4MDM4ZmFkZjc3MzI1MDM0
ODQ2MzgwNGQ5OTVmNDdjNjcxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n
L1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv
UmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCkBAIC0zNDYsMTYgKzM0Niw0MSBAQCBMYXlvdXRTaXpl
IFJlbmRlckJveE1vZGVsT2JqZWN0OjpyZWxhdGl2ZVBvc2l0aW9uT2Zmc2V0KCkgY29uc3QKICAg
ICAvLyBjYWxsIGF2YWlsYWJsZVdpZHRoIG9uIG91ciBjb250YWluaW5nIGJsb2NrLgogICAgIC8v
IEhvd2V2ZXIgZm9yIGdyaWQgaXRlbXMgdGhlIGNvbnRhaW5pbmcgYmxvY2sgaXMgdGhlIGdyaWQg
YXJlYSwgc28gb2Zmc2V0cyBzaG91bGQgYmUgcmVzb2x2ZWQgYWdhaW5zdCB0aGF0OgogICAgIC8v
IGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZ3JpZC8jZ3JpZC1pdGVtLXNpemluZworICAg
IHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gbGVmdDsKKyAgICBzdGQ6Om9wdGlvbmFsPExheW91
dFVuaXQ+IHJpZ2h0OwogICAgIGlmICghc3R5bGUoKS5sZWZ0KCkuaXNBdXRvKCkgfHwgIXN0eWxl
KCkucmlnaHQoKS5pc0F1dG8oKSkgewogICAgICAgICBMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRo
ID0gaGFzT3ZlcnJpZGluZ0NvbnRhaW5pbmdCbG9ja0NvbnRlbnRXaWR0aCgpCiAgICAgICAgICAg
ICA/IG92ZXJyaWRpbmdDb250YWluaW5nQmxvY2tDb250ZW50V2lkdGgoKS52YWx1ZV9vcihMYXlv
dXRVbml0KCkpIDogY29udGFpbmluZ0Jsb2NrKCktPmF2YWlsYWJsZVdpZHRoKCk7Ci0gICAgICAg
IGlmICghc3R5bGUoKS5sZWZ0KCkuaXNBdXRvKCkpIHsKLSAgICAgICAgICAgIGlmICghc3R5bGUo
KS5yaWdodCgpLmlzQXV0bygpICYmICFjb250YWluaW5nQmxvY2soKS0+c3R5bGUoKS5pc0xlZnRU
b1JpZ2h0RGlyZWN0aW9uKCkpCi0gICAgICAgICAgICAgICAgb2Zmc2V0LnNldFdpZHRoKC12YWx1
ZUZvckxlbmd0aChzdHlsZSgpLnJpZ2h0KCksICFzdHlsZSgpLnJpZ2h0KCkuaXNGaXhlZCgpID8g
YXZhaWxhYmxlV2lkdGggOiAwX2x1KSk7Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAg
ICAgb2Zmc2V0LmV4cGFuZCh2YWx1ZUZvckxlbmd0aChzdHlsZSgpLmxlZnQoKSwgIXN0eWxlKCku
bGVmdCgpLmlzRml4ZWQoKSA/IGF2YWlsYWJsZVdpZHRoIDogMF9sdSksIDBfbHUpOwotICAgICAg
ICB9IGVsc2UgaWYgKCFzdHlsZSgpLnJpZ2h0KCkuaXNBdXRvKCkpCi0gICAgICAgICAgICBvZmZz
ZXQuZXhwYW5kKC12YWx1ZUZvckxlbmd0aChzdHlsZSgpLnJpZ2h0KCksICFzdHlsZSgpLnJpZ2h0
KCkuaXNGaXhlZCgpID8gYXZhaWxhYmxlV2lkdGggOiAwX2x1KSwgMF9sdSk7CisgICAgICAgIGlm
ICghc3R5bGUoKS5sZWZ0KCkuaXNBdXRvKCkpCisgICAgICAgICAgICBsZWZ0ID0gdmFsdWVGb3JM
ZW5ndGgoc3R5bGUoKS5sZWZ0KCksICFzdHlsZSgpLmxlZnQoKS5pc0ZpeGVkKCkgPyBhdmFpbGFi
bGVXaWR0aCA6IDBfbHUpOworICAgICAgICBpZiAoIXN0eWxlKCkucmlnaHQoKS5pc0F1dG8oKSkK
KyAgICAgICAgICAgIHJpZ2h0ID0gdmFsdWVGb3JMZW5ndGgoc3R5bGUoKS5yaWdodCgpLCAhc3R5
bGUoKS5yaWdodCgpLmlzRml4ZWQoKSA/IGF2YWlsYWJsZVdpZHRoIDogMF9sdSk7CisgICAgfQor
ICAgIGlmICghbGVmdCAmJiAhcmlnaHQpIHsKKyAgICAgICAgbGVmdCA9IExheW91dFVuaXQoKTsK
KyAgICAgICAgcmlnaHQgPSBMYXlvdXRVbml0KCk7CisgICAgfQorICAgIGlmICghbGVmdCkKKyAg
ICAgICAgbGVmdCA9IC1yaWdodC52YWx1ZSgpOworICAgIGlmICghcmlnaHQpCisgICAgICAgIHJp
Z2h0ID0gLWxlZnQudmFsdWUoKTsKKyAgICBib29sIGlzTHRyID0gY29udGFpbmluZ0Jsb2NrKCkt
PnN0eWxlKCkuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpOworICAgIFdyaXRpbmdNb2RlIHdyaXRp
bmdNb2RlID0gY29udGFpbmluZ0Jsb2NrKCktPnN0eWxlKCkud3JpdGluZ01vZGUoKTsKKyAgICBz
d2l0Y2ggKHdyaXRpbmdNb2RlKSB7CisgICAgY2FzZSBXcml0aW5nTW9kZTo6VG9wVG9Cb3R0b206
CisgICAgICAgIGlmIChpc0x0cikKKyAgICAgICAgICAgIG9mZnNldC5leHBhbmQobGVmdC52YWx1
ZSgpLCBMYXlvdXRVbml0KCkpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBvZmZzZXQuc2V0
V2lkdGgoLXJpZ2h0LnZhbHVlKCkpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIFdyaXRpbmdN
b2RlOjpSaWdodFRvTGVmdDoKKyAgICAgICAgb2Zmc2V0LnNldFdpZHRoKC1yaWdodC52YWx1ZSgp
KTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBXcml0aW5nTW9kZTo6TGVmdFRvUmlnaHQ6Cisg
ICAgICAgIG9mZnNldC5leHBhbmQobGVmdC52YWx1ZSgpLCBMYXlvdXRVbml0KCkpOworICAgICAg
ICBicmVhazsKKyAgICBkZWZhdWx0OgorICAgICAgICBicmVhazsKICAgICB9CiAKICAgICAvLyBJ
ZiB0aGUgY29udGFpbmluZyBibG9jayBvZiBhIHJlbGF0aXZlbHkgcG9zaXRpb25lZCBlbGVtZW50
IGRvZXMgbm90CkBAIC0zNjYsNiArMzkxLDggQEAgTGF5b3V0U2l6ZSBSZW5kZXJCb3hNb2RlbE9i
amVjdDo6cmVsYXRpdmVQb3NpdGlvbk9mZnNldCgpIGNvbnN0CiAgICAgLy8gU2VlIDxodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjYzOTY+LgogICAgIC8vIEFub3RoZXIg
ZXhjZXB0aW9uIGlzIGEgZ3JpZCBpdGVtLCBhcyB0aGUgY29udGFpbmluZyBibG9jayBpcyB0aGUg
Z3JpZCBhcmVhOgogICAgIC8vIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZ3JpZC8jZ3Jp
ZC1pdGVtLXNpemluZworICAgIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gdG9wOworICAgIHN0
ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gYm90dG9tOwogICAgIGlmICghc3R5bGUoKS50b3AoKS5p
c0F1dG8oKQogICAgICAgICAmJiAoIXN0eWxlKCkudG9wKCkuaXNQZXJjZW50T3JDYWxjdWxhdGVk
KCkKICAgICAgICAgICAgIHx8ICFjb250YWluaW5nQmxvY2soKS0+aGFzQXV0b0hlaWdodE9yQ29u
dGFpbmluZ0Jsb2NrV2l0aEF1dG9IZWlnaHQoKQpAQCAtMzc0LDE4ICs0MDEsNDYgQEAgTGF5b3V0
U2l6ZSBSZW5kZXJCb3hNb2RlbE9iamVjdDo6cmVsYXRpdmVQb3NpdGlvbk9mZnNldCgpIGNvbnN0
CiAgICAgICAgIC8vIEZJWE1FOiBUaGUgY29tcHV0YXRpb24gb2YgdGhlIGF2YWlsYWJsZSBoZWln
aHQgaXMgcmVwZWF0ZWQgbGF0ZXIgZm9yICJib3R0b20iLgogICAgICAgICAvLyBXZSBjb3VsZCBy
ZWZhY3RvciB0aGlzIGFuZCBtb3ZlIGl0IHRvIHNvbWUgY29tbW9uIGNvZGUgZm9yIGJvdGggaWZz
LCBob3dldmVyIG1vdmluZyBpdCBvdXRzaWRlIG9mIHRoZSBpZnMKICAgICAgICAgLy8gaXMgbm90
IHBvc3NpYmxlIGFzIGl0J2QgY2F1c2UgcGVyZm9ybWFuY2UgcmVncmVzc2lvbnMuCi0gICAgICAg
IG9mZnNldC5leHBhbmQoMF9sdSwgdmFsdWVGb3JMZW5ndGgoc3R5bGUoKS50b3AoKSwgIXN0eWxl
KCkudG9wKCkuaXNGaXhlZCgpCisgICAgICAgIHRvcCA9IHZhbHVlRm9yTGVuZ3RoKHN0eWxlKCku
dG9wKCksICFzdHlsZSgpLnRvcCgpLmlzRml4ZWQoKQogICAgICAgICAgICAgPyAoaGFzT3ZlcnJp
ZGluZ0NvbnRhaW5pbmdCbG9ja0NvbnRlbnRIZWlnaHQoKSA/IG92ZXJyaWRpbmdDb250YWluaW5n
QmxvY2tDb250ZW50SGVpZ2h0KCkudmFsdWVfb3IoMF9sdSkgOiBjb250YWluaW5nQmxvY2soKS0+
YXZhaWxhYmxlSGVpZ2h0KCkpCi0gICAgICAgICAgICA6IExheW91dFVuaXQoKSkpOwotICAgIH0g
ZWxzZSBpZiAoIXN0eWxlKCkuYm90dG9tKCkuaXNBdXRvKCkKKyAgICAgICAgICAgIDogTGF5b3V0
VW5pdCgpKTsKKyAgICB9CisgICAgaWYgKCFzdHlsZSgpLmJvdHRvbSgpLmlzQXV0bygpCiAgICAg
ICAgICYmICghc3R5bGUoKS5ib3R0b20oKS5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKQogICAgICAg
ICAgICAgfHwgIWNvbnRhaW5pbmdCbG9jaygpLT5oYXNBdXRvSGVpZ2h0T3JDb250YWluaW5nQmxv
Y2tXaXRoQXV0b0hlaWdodCgpCiAgICAgICAgICAgICB8fCBjb250YWluaW5nQmxvY2soKS0+c3Ry
ZXRjaGVzVG9WaWV3cG9ydCgpCiAgICAgICAgICAgICB8fCBoYXNPdmVycmlkaW5nQ29udGFpbmlu
Z0Jsb2NrQ29udGVudEhlaWdodCgpKSkgewogICAgICAgICAvLyBGSVhNRTogQ2hlY2sgY29tbWVu
dCBhYm92ZSBmb3IgInRvcCIsIGl0IGFwcGxpZXMgaGVyZSB0b28uCi0gICAgICAgIG9mZnNldC5l
eHBhbmQoMF9sdSwgLXZhbHVlRm9yTGVuZ3RoKHN0eWxlKCkuYm90dG9tKCksICFzdHlsZSgpLmJv
dHRvbSgpLmlzRml4ZWQoKQorICAgICAgICBib3R0b20gPSB2YWx1ZUZvckxlbmd0aChzdHlsZSgp
LmJvdHRvbSgpLCAhc3R5bGUoKS5ib3R0b20oKS5pc0ZpeGVkKCkKICAgICAgICAgICAgID8gKGhh
c092ZXJyaWRpbmdDb250YWluaW5nQmxvY2tDb250ZW50SGVpZ2h0KCkgPyBvdmVycmlkaW5nQ29u
dGFpbmluZ0Jsb2NrQ29udGVudEhlaWdodCgpLnZhbHVlX29yKDBfbHUpIDogY29udGFpbmluZ0Js
b2NrKCktPmF2YWlsYWJsZUhlaWdodCgpKQotICAgICAgICAgICAgOiBMYXlvdXRVbml0KCkpKTsK
KyAgICAgICAgICAgIDogTGF5b3V0VW5pdCgpKTsKKyAgICB9CisgICAgaWYgKCF0b3AgJiYgIWJv
dHRvbSkgeworICAgICAgICB0b3AgPSBMYXlvdXRVbml0KCk7CisgICAgICAgIGJvdHRvbSA9IExh
eW91dFVuaXQoKTsKKyAgICB9CisgICAgaWYgKCF0b3ApCisgICAgICAgIHRvcCA9IC1ib3R0b20u
dmFsdWUoKTsKKyAgICBpZiAoIWJvdHRvbSkKKyAgICAgICAgYm90dG9tID0gLXRvcC52YWx1ZSgp
OworICAgIHN3aXRjaCAod3JpdGluZ01vZGUpIHsKKyAgICBjYXNlIFdyaXRpbmdNb2RlOjpUb3BU
b0JvdHRvbToKKyAgICAgICAgb2Zmc2V0LmV4cGFuZChMYXlvdXRVbml0KCksIHRvcC52YWx1ZSgp
KTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBXcml0aW5nTW9kZTo6UmlnaHRUb0xlZnQ6Cisg
ICAgICAgIGlmIChpc0x0cikKKyAgICAgICAgICAgIG9mZnNldC5leHBhbmQoTGF5b3V0VW5pdCgp
LCB0b3AudmFsdWUoKSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIG9mZnNldC5zZXRIZWln
aHQoLWJvdHRvbS52YWx1ZSgpKTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBXcml0aW5nTW9k
ZTo6TGVmdFRvUmlnaHQ6CisgICAgICAgIGlmIChpc0x0cikKKyAgICAgICAgICAgIG9mZnNldC5l
eHBhbmQoTGF5b3V0VW5pdCgpLCB0b3AudmFsdWUoKSk7CisgICAgICAgIGVsc2UKKyAgICAgICAg
ICAgIG9mZnNldC5zZXRIZWlnaHQoLWJvdHRvbS52YWx1ZSgpKTsKKyAgICAgICAgYnJlYWs7Cisg
ICAgZGVmYXVsdDoKKyAgICAgICAgYnJlYWs7CiAgICAgfQogCiAgICAgcmV0dXJuIG9mZnNldDsK
ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwppbmRleCA2NjEzNDJkYzEzMjhmMzkxOWEzZTA5ZGZhMjk5NmNiZWQ2OGY5ZDMwLi4wYjdjNDRi
YzNkMGQwOWYyMDNkZDQyMDM5MWJhMjFhYWU1YWVjNmQ3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0
cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAK
KzIwMjEtMTAtMjcgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBGaXgg
YWJzcG9zLTAyMC5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn
LmNnaT9pZD0yMzIwMTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor
ICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMTAtMjUgIEthdGUgQ2hlbmV5ICA8
a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CiAKICAgICAgICAgW0FwcCBQcml2YWN5IFJlcG9y
dF0gQ09SUyBwcmVmbGlnaHQgcmVxdWVzdHMgYXR0cmlidXRlZCBpbmNvcnJlY3RseQpkaWZmIC0t
Z2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBl
Y3RhdGlvbnMKaW5kZXggOThkMGYzZGYwNThlZjBmMTZmYTQwZjg0ZDQ1YTdmZjM0Y2FmYzdjMC4u
ODEyNTcwNTdjNTEzZmExNjljMTYyZmJhYTQ0OWUwNTkxNGVhYWJlYiAxMDA2NDQKLS0tIGEvTGF5
b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRp
b25zCkBAIC00MjAxLDkgKzQyMDEsNyBAQCB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL291dGxpbgogd2Via2l0
Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3Jp
dGluZy1tb2Rlcy9vdXRsaW5lLWlubGluZS12cmwtMDA2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXdyaXRpbmctbW9kZXMvb3ZlcmNvbnN0cmFpbmVkLXJlbC1wb3MtbHRyLWxlZnQtcmln
aHQtdnJsLTAwNC54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAg
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvb3Zl
cmNvbnN0cmFpbmVkLXJlbC1wb3MtbHRyLXRvcC1ib3R0b20tdnJsLTAwMi54aHQgWyBJbWFnZU9u
bHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvb3ZlcmNvbnN0cmFpbmVkLXJlbC1wb3MtcnRs
LWxlZnQtcmlnaHQtdmxyLTAwOS54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcv
Yi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmct
bW9kZXMvb3ZlcmNvbnN0cmFpbmVkLXJlbC1wb3MtcnRsLWxlZnQtcmlnaHQtdnJsLTAwOC54aHQg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvb3ZlcmNvbnN0cmFpbmVkLXJl
bC1wb3MtcnRsLXRvcC1ib3R0b20tdmxyLTAwNy54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdl
YmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXdyaXRpbmctbW9kZXMvb3ZlcmNvbnN0cmFpbmVkLXJlbC1wb3MtcnRsLXRvcC1ib3R0b20tdnJs
LTAwNi54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvcm93LXByb2dy
ZXNzaW9uLXNsci0wMjMueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5
MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVz
L3Jvdy1wcm9ncmVzc2lvbi1zbHItMDI5LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQpkaWZmIC0t
Z2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9kb20vb2Zmc2V0LXBvc2l0aW9uLXdyaXRpbmctbW9kZXMt
ZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9kb20vb2Zmc2V0LXBvc2l0aW9uLXdyaXRp
bmctbW9kZXMtZXhwZWN0ZWQudHh0CmluZGV4IGQzY2U0YWMzMjEwNjk5YjhlODkxYmZmOTc4NjUz
ODdmMGQ1ODNmOWIuLjhhMTY1NzE1OTdmYmYwOGM5NDdkZjkxZDgxMzliY2E0OWJmNTk1NTIgMTAw
NjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvZG9tL29mZnNldC1wb3NpdGlvbi13cml0aW5nLW1v
ZGVzLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9vZmZzZXQtcG9zaXRp
b24td3JpdGluZy1tb2Rlcy1leHBlY3RlZC50eHQKQEAgLTEsNSArMSw0IEBACiBQQVNTIGRvY3Vt
ZW50LmdldEVsZW1lbnRCeUlkKCJ2ZXJ0aWNhbCIpLm9mZnNldExlZnQgaXMgNjUKLVBBU1MgZG9j
dW1lbnQuZ2V0RWxlbWVudEJ5SWQoImhvcml6b250YWwiKS5vZmZzZXRUb3AgaXMgNjUKIFBBU1Mg
c3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKIAogVEVTVCBDT01QTEVURQpkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvZmFzdC9kb20vb2Zmc2V0LXBvc2l0aW9uLXdyaXRpbmctbW9kZXMuaHRtbCBi
L0xheW91dFRlc3RzL2Zhc3QvZG9tL29mZnNldC1wb3NpdGlvbi13cml0aW5nLW1vZGVzLmh0bWwK
aW5kZXggZWRlYTFkNWNjYTNkYTVmMWViYWViNDk0MWE2OGI3ODE5OGM4OTZmMy4uYWNkMWFiOGMw
ODI1YTEzOGQ5ODk0ODU5ZWVkM2NlZWEyM2YyNzMxZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv
ZmFzdC9kb20vb2Zmc2V0LXBvc2l0aW9uLXdyaXRpbmctbW9kZXMuaHRtbAorKysgYi9MYXlvdXRU
ZXN0cy9mYXN0L2RvbS9vZmZzZXQtcG9zaXRpb24td3JpdGluZy1tb2Rlcy5odG1sCkBAIC02LDE3
ICs2LDkgQEAKIDwvZGl2PgogPC9kaXY+CiAKLTxkaXYgc3R5bGU9InBvc2l0aW9uOnJlbGF0aXZl
Ij4KLTxkaXYgc3R5bGU9Ii13ZWJraXQtd3JpdGluZy1tb2RlOiBob3Jpem9udGFsLWJ0OyBiYWNr
Z3JvdW5kLWNvbG9yOiByZWQ7IHdpZHRoOiAxMDBweDsgaGVpZ2h0OiAxMDBweDsiPgotICAgIDxk
aXYgc3R5bGU9ImhlaWdodDogNXB4Ij48L2Rpdj4KLSAgICA8ZGl2IGlkPWhvcml6b250YWwgc3R5
bGU9ImJhY2tncm91bmQtY29sb3I6IG9yYW5nZTsgaGVpZ2h0OiAxMHB4OyBwb3NpdGlvbjogcmVs
YXRpdmU7IHRvcDogLTIwcHg7Ij48L2Rpdj4KLTwvZGl2PgotPC9kaXY+Ci0KIDxwcmUgaWQ9Y29u
c29sZT48L3ByZT4KIAogPHNjcmlwdD4KIHNob3VsZEJlKCdkb2N1bWVudC5nZXRFbGVtZW50QnlJ
ZCgidmVydGljYWwiKS5vZmZzZXRMZWZ0JywgJzY1Jyk7Ci1zaG91bGRCZSgnZG9jdW1lbnQuZ2V0
RWxlbWVudEJ5SWQoImhvcml6b250YWwiKS5vZmZzZXRUb3AnLCAnNjUnKTsKIDwvc2NyaXB0Pgog
PHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0Pgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>442593</attachid>
            <date>2021-10-27 08:20:21 -0700</date>
            <delta_ts>2021-10-27 10:35:30 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232012-20211027172020.patch</filename>
            <type>text/plain</type>
            <size>10011</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0ODIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmI0NDI5OThkMzJkYTEy
Yjg2YmUxMjFhZTVmMjViOTY0NDFhMjBmZS4uNjY3YjAxOWQ3ZmE2ZmI5Y2Y3YTg1NWI0NmUyOTk2
MjMyNGRlY2M2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTEwLTI3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFic3Bvcy0wMjAuaHRtbAor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDEyCisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0lQLgorCisg
ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcDoKKyAgICAgICAgKFdl
YkNvcmU6OlJlbmRlckJveE1vZGVsT2JqZWN0OjpyZWxhdGl2ZVBvc2l0aW9uT2Zmc2V0IGNvbnN0
KToKKwogMjAyMS0xMC0yNSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQu
b3JnPgogCiAgICAgICAgIFdlYktpdCBvdWdodCB0byBiZSBhYmxlIHRvIHBsYXkgdmlkZW9zIHdp
dGhvdXQgQ29udGVudC1MZW5ndGggSFRUUCBoZWFkZXIgZmllbGRzIGFuZCB3aXRob3V0IHJhbmdl
IHN1cHBvcnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hN
b2RlbE9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxP
YmplY3QuY3BwCmluZGV4IDI0NTA5MTlmNDI2NDQ2Mzc0MmVjZDgwYjlkMmY2NDQyZGYxZTAxZjEu
LmQxZDc1YjZkZjdlMWMzYmI3ZDcwNDE3Y2Q0ZTc0OGNhNzM5NWQzZWMgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKKysrIGIvU291
cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcApAQCAtMzQ2LDE2
ICszNDYsNDIgQEAgTGF5b3V0U2l6ZSBSZW5kZXJCb3hNb2RlbE9iamVjdDo6cmVsYXRpdmVQb3Np
dGlvbk9mZnNldCgpIGNvbnN0CiAgICAgLy8gY2FsbCBhdmFpbGFibGVXaWR0aCBvbiBvdXIgY29u
dGFpbmluZyBibG9jay4KICAgICAvLyBIb3dldmVyIGZvciBncmlkIGl0ZW1zIHRoZSBjb250YWlu
aW5nIGJsb2NrIGlzIHRoZSBncmlkIGFyZWEsIHNvIG9mZnNldHMgc2hvdWxkIGJlIHJlc29sdmVk
IGFnYWluc3QgdGhhdDoKICAgICAvLyBodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLWdyaWQv
I2dyaWQtaXRlbS1zaXppbmcKKyAgICBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IGxlZnQ7Cisg
ICAgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiByaWdodDsKICAgICBpZiAoIXN0eWxlKCkubGVm
dCgpLmlzQXV0bygpIHx8ICFzdHlsZSgpLnJpZ2h0KCkuaXNBdXRvKCkpIHsKICAgICAgICAgTGF5
b3V0VW5pdCBhdmFpbGFibGVXaWR0aCA9IGhhc092ZXJyaWRpbmdDb250YWluaW5nQmxvY2tDb250
ZW50V2lkdGgoKQogICAgICAgICAgICAgPyBvdmVycmlkaW5nQ29udGFpbmluZ0Jsb2NrQ29udGVu
dFdpZHRoKCkudmFsdWVfb3IoTGF5b3V0VW5pdCgpKSA6IGNvbnRhaW5pbmdCbG9jaygpLT5hdmFp
bGFibGVXaWR0aCgpOwotICAgICAgICBpZiAoIXN0eWxlKCkubGVmdCgpLmlzQXV0bygpKSB7Ci0g
ICAgICAgICAgICBpZiAoIXN0eWxlKCkucmlnaHQoKS5pc0F1dG8oKSAmJiAhY29udGFpbmluZ0Js
b2NrKCktPnN0eWxlKCkuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpKQotICAgICAgICAgICAgICAg
IG9mZnNldC5zZXRXaWR0aCgtdmFsdWVGb3JMZW5ndGgoc3R5bGUoKS5yaWdodCgpLCAhc3R5bGUo
KS5yaWdodCgpLmlzRml4ZWQoKSA/IGF2YWlsYWJsZVdpZHRoIDogMF9sdSkpOwotICAgICAgICAg
ICAgZWxzZQotICAgICAgICAgICAgICAgIG9mZnNldC5leHBhbmQodmFsdWVGb3JMZW5ndGgoc3R5
bGUoKS5sZWZ0KCksICFzdHlsZSgpLmxlZnQoKS5pc0ZpeGVkKCkgPyBhdmFpbGFibGVXaWR0aCA6
IDBfbHUpLCAwX2x1KTsKLSAgICAgICAgfSBlbHNlIGlmICghc3R5bGUoKS5yaWdodCgpLmlzQXV0
bygpKQotICAgICAgICAgICAgb2Zmc2V0LmV4cGFuZCgtdmFsdWVGb3JMZW5ndGgoc3R5bGUoKS5y
aWdodCgpLCAhc3R5bGUoKS5yaWdodCgpLmlzRml4ZWQoKSA/IGF2YWlsYWJsZVdpZHRoIDogMF9s
dSksIDBfbHUpOworICAgICAgICBpZiAoIXN0eWxlKCkubGVmdCgpLmlzQXV0bygpKQorICAgICAg
ICAgICAgbGVmdCA9IHZhbHVlRm9yTGVuZ3RoKHN0eWxlKCkubGVmdCgpLCAhc3R5bGUoKS5sZWZ0
KCkuaXNGaXhlZCgpID8gYXZhaWxhYmxlV2lkdGggOiAwX2x1KTsKKyAgICAgICAgaWYgKCFzdHls
ZSgpLnJpZ2h0KCkuaXNBdXRvKCkpCisgICAgICAgICAgICByaWdodCA9IHZhbHVlRm9yTGVuZ3Ro
KHN0eWxlKCkucmlnaHQoKSwgIXN0eWxlKCkucmlnaHQoKS5pc0ZpeGVkKCkgPyBhdmFpbGFibGVX
aWR0aCA6IDBfbHUpOworICAgIH0KKyAgICBpZiAoIWxlZnQgJiYgIXJpZ2h0KSB7CisgICAgICAg
IGxlZnQgPSBMYXlvdXRVbml0KCk7CisgICAgICAgIHJpZ2h0ID0gTGF5b3V0VW5pdCgpOworICAg
IH0KKyAgICBpZiAoIWxlZnQpCisgICAgICAgIGxlZnQgPSAtcmlnaHQudmFsdWUoKTsKKyAgICBp
ZiAoIXJpZ2h0KQorICAgICAgICByaWdodCA9IC1sZWZ0LnZhbHVlKCk7CisgICAgYm9vbCBpc0x0
ciA9IGNvbnRhaW5pbmdCbG9jaygpLT5zdHlsZSgpLmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKTsK
KyAgICBXcml0aW5nTW9kZSB3cml0aW5nTW9kZSA9IGNvbnRhaW5pbmdCbG9jaygpLT5zdHlsZSgp
LndyaXRpbmdNb2RlKCk7CisgICAgc3dpdGNoICh3cml0aW5nTW9kZSkgeworICAgIGNhc2UgV3Jp
dGluZ01vZGU6OlRvcFRvQm90dG9tOgorICAgIGNhc2UgV3JpdGluZ01vZGU6OkJvdHRvbVRvVG9w
OgorICAgICAgICBpZiAoaXNMdHIpCisgICAgICAgICAgICBvZmZzZXQuZXhwYW5kKGxlZnQudmFs
dWUoKSwgTGF5b3V0VW5pdCgpKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgb2Zmc2V0LnNl
dFdpZHRoKC1yaWdodC52YWx1ZSgpKTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBXcml0aW5n
TW9kZTo6UmlnaHRUb0xlZnQ6CisgICAgICAgIG9mZnNldC5zZXRXaWR0aCgtcmlnaHQudmFsdWUo
KSk7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgV3JpdGluZ01vZGU6OkxlZnRUb1JpZ2h0Ogor
ICAgICAgICBvZmZzZXQuZXhwYW5kKGxlZnQudmFsdWUoKSwgTGF5b3V0VW5pdCgpKTsKKyAgICAg
ICAgYnJlYWs7CisgICAgZGVmYXVsdDoKKyAgICAgICAgYnJlYWs7CiAgICAgfQogCiAgICAgLy8g
SWYgdGhlIGNvbnRhaW5pbmcgYmxvY2sgb2YgYSByZWxhdGl2ZWx5IHBvc2l0aW9uZWQgZWxlbWVu
dCBkb2VzIG5vdApAQCAtMzY2LDYgKzM5Miw4IEBAIExheW91dFNpemUgUmVuZGVyQm94TW9kZWxP
YmplY3Q6OnJlbGF0aXZlUG9zaXRpb25PZmZzZXQoKSBjb25zdAogICAgIC8vIFNlZSA8aHR0cHM6
Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI2Mzk2Pi4KICAgICAvLyBBbm90aGVy
IGV4Y2VwdGlvbiBpcyBhIGdyaWQgaXRlbSwgYXMgdGhlIGNvbnRhaW5pbmcgYmxvY2sgaXMgdGhl
IGdyaWQgYXJlYToKICAgICAvLyBodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLWdyaWQvI2dy
aWQtaXRlbS1zaXppbmcKKyAgICBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IHRvcDsKKyAgICBz
dGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IGJvdHRvbTsKICAgICBpZiAoIXN0eWxlKCkudG9wKCku
aXNBdXRvKCkKICAgICAgICAgJiYgKCFzdHlsZSgpLnRvcCgpLmlzUGVyY2VudE9yQ2FsY3VsYXRl
ZCgpCiAgICAgICAgICAgICB8fCAhY29udGFpbmluZ0Jsb2NrKCktPmhhc0F1dG9IZWlnaHRPckNv
bnRhaW5pbmdCbG9ja1dpdGhBdXRvSGVpZ2h0KCkKQEAgLTM3NCwxOCArNDAyLDQ3IEBAIExheW91
dFNpemUgUmVuZGVyQm94TW9kZWxPYmplY3Q6OnJlbGF0aXZlUG9zaXRpb25PZmZzZXQoKSBjb25z
dAogICAgICAgICAvLyBGSVhNRTogVGhlIGNvbXB1dGF0aW9uIG9mIHRoZSBhdmFpbGFibGUgaGVp
Z2h0IGlzIHJlcGVhdGVkIGxhdGVyIGZvciAiYm90dG9tIi4KICAgICAgICAgLy8gV2UgY291bGQg
cmVmYWN0b3IgdGhpcyBhbmQgbW92ZSBpdCB0byBzb21lIGNvbW1vbiBjb2RlIGZvciBib3RoIGlm
cywgaG93ZXZlciBtb3ZpbmcgaXQgb3V0c2lkZSBvZiB0aGUgaWZzCiAgICAgICAgIC8vIGlzIG5v
dCBwb3NzaWJsZSBhcyBpdCdkIGNhdXNlIHBlcmZvcm1hbmNlIHJlZ3Jlc3Npb25zLgotICAgICAg
ICBvZmZzZXQuZXhwYW5kKDBfbHUsIHZhbHVlRm9yTGVuZ3RoKHN0eWxlKCkudG9wKCksICFzdHls
ZSgpLnRvcCgpLmlzRml4ZWQoKQorICAgICAgICB0b3AgPSB2YWx1ZUZvckxlbmd0aChzdHlsZSgp
LnRvcCgpLCAhc3R5bGUoKS50b3AoKS5pc0ZpeGVkKCkKICAgICAgICAgICAgID8gKGhhc092ZXJy
aWRpbmdDb250YWluaW5nQmxvY2tDb250ZW50SGVpZ2h0KCkgPyBvdmVycmlkaW5nQ29udGFpbmlu
Z0Jsb2NrQ29udGVudEhlaWdodCgpLnZhbHVlX29yKDBfbHUpIDogY29udGFpbmluZ0Jsb2NrKCkt
PmF2YWlsYWJsZUhlaWdodCgpKQotICAgICAgICAgICAgOiBMYXlvdXRVbml0KCkpKTsKLSAgICB9
IGVsc2UgaWYgKCFzdHlsZSgpLmJvdHRvbSgpLmlzQXV0bygpCisgICAgICAgICAgICA6IExheW91
dFVuaXQoKSk7CisgICAgfQorICAgIGlmICghc3R5bGUoKS5ib3R0b20oKS5pc0F1dG8oKQogICAg
ICAgICAmJiAoIXN0eWxlKCkuYm90dG9tKCkuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkKICAgICAg
ICAgICAgIHx8ICFjb250YWluaW5nQmxvY2soKS0+aGFzQXV0b0hlaWdodE9yQ29udGFpbmluZ0Js
b2NrV2l0aEF1dG9IZWlnaHQoKQogICAgICAgICAgICAgfHwgY29udGFpbmluZ0Jsb2NrKCktPnN0
cmV0Y2hlc1RvVmlld3BvcnQoKQogICAgICAgICAgICAgfHwgaGFzT3ZlcnJpZGluZ0NvbnRhaW5p
bmdCbG9ja0NvbnRlbnRIZWlnaHQoKSkpIHsKICAgICAgICAgLy8gRklYTUU6IENoZWNrIGNvbW1l
bnQgYWJvdmUgZm9yICJ0b3AiLCBpdCBhcHBsaWVzIGhlcmUgdG9vLgotICAgICAgICBvZmZzZXQu
ZXhwYW5kKDBfbHUsIC12YWx1ZUZvckxlbmd0aChzdHlsZSgpLmJvdHRvbSgpLCAhc3R5bGUoKS5i
b3R0b20oKS5pc0ZpeGVkKCkKKyAgICAgICAgYm90dG9tID0gdmFsdWVGb3JMZW5ndGgoc3R5bGUo
KS5ib3R0b20oKSwgIXN0eWxlKCkuYm90dG9tKCkuaXNGaXhlZCgpCiAgICAgICAgICAgICA/ICho
YXNPdmVycmlkaW5nQ29udGFpbmluZ0Jsb2NrQ29udGVudEhlaWdodCgpID8gb3ZlcnJpZGluZ0Nv
bnRhaW5pbmdCbG9ja0NvbnRlbnRIZWlnaHQoKS52YWx1ZV9vcigwX2x1KSA6IGNvbnRhaW5pbmdC
bG9jaygpLT5hdmFpbGFibGVIZWlnaHQoKSkKLSAgICAgICAgICAgIDogTGF5b3V0VW5pdCgpKSk7
CisgICAgICAgICAgICA6IExheW91dFVuaXQoKSk7CisgICAgfQorICAgIGlmICghdG9wICYmICFi
b3R0b20pIHsKKyAgICAgICAgdG9wID0gTGF5b3V0VW5pdCgpOworICAgICAgICBib3R0b20gPSBM
YXlvdXRVbml0KCk7CisgICAgfQorICAgIGlmICghdG9wKQorICAgICAgICB0b3AgPSAtYm90dG9t
LnZhbHVlKCk7CisgICAgaWYgKCFib3R0b20pCisgICAgICAgIGJvdHRvbSA9IC10b3AudmFsdWUo
KTsKKyAgICBzd2l0Y2ggKHdyaXRpbmdNb2RlKSB7CisgICAgY2FzZSBXcml0aW5nTW9kZTo6VG9w
VG9Cb3R0b206CisgICAgY2FzZSBXcml0aW5nTW9kZTo6Qm90dG9tVG9Ub3A6CisgICAgICAgIG9m
ZnNldC5leHBhbmQoTGF5b3V0VW5pdCgpLCB0b3AudmFsdWUoKSk7CisgICAgICAgIGJyZWFrOwor
ICAgIGNhc2UgV3JpdGluZ01vZGU6OlJpZ2h0VG9MZWZ0OgorICAgICAgICBpZiAoaXNMdHIpCisg
ICAgICAgICAgICBvZmZzZXQuZXhwYW5kKExheW91dFVuaXQoKSwgdG9wLnZhbHVlKCkpOworICAg
ICAgICBlbHNlCisgICAgICAgICAgICBvZmZzZXQuc2V0SGVpZ2h0KC1ib3R0b20udmFsdWUoKSk7
CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgV3JpdGluZ01vZGU6OkxlZnRUb1JpZ2h0OgorICAg
ICAgICBpZiAoaXNMdHIpCisgICAgICAgICAgICBvZmZzZXQuZXhwYW5kKExheW91dFVuaXQoKSwg
dG9wLnZhbHVlKCkpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBvZmZzZXQuc2V0SGVpZ2h0
KC1ib3R0b20udmFsdWUoKSk7CisgICAgICAgIGJyZWFrOworICAgIGRlZmF1bHQ6CisgICAgICAg
IGJyZWFrOwogICAgIH0KIAogICAgIHJldHVybiBvZmZzZXQ7CmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNjYxMzQyZGMxMzI4
ZjM5MTlhM2UwOWRmYTI5OTZjYmVkNjhmOWQzMC4uMGI3YzQ0YmMzZDBkMDlmMjAzZGQ0MjAzOTFi
YTIxYWFlNWFlYzZkNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh
eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIxLTEwLTI3ICBSb2IgQnVp
cyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFic3Bvcy0wMjAuaHRtbAorICAg
ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDEyCisKKyAg
ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0
YXRpb25zOgorCiAyMDIxLTEwLTI1ICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBw
bGUuY29tPgogCiAgICAgICAgIFtBcHAgUHJpdmFjeSBSZXBvcnRdIENPUlMgcHJlZmxpZ2h0IHJl
cXVlc3RzIGF0dHJpYnV0ZWQgaW5jb3JyZWN0bHkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rl
c3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDk4ZDBm
M2RmMDU4ZWYwZjE2ZmE0MGY4NGQ0NWE3ZmYzNGNhZmM3YzAuLjgxMjU3MDU3YzUxM2ZhMTY5YzE2
MmZiYWE0NDllMDU5MTRlYWFiZWIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3Rh
dGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDIwMSw5ICs0MjAx
LDcgQEAgd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9vdXRsaW4KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvb3V0bGluZS1p
bmxpbmUtdnJsLTAwNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5
MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVz
L292ZXJjb25zdHJhaW5lZC1yZWwtcG9zLWx0ci1sZWZ0LXJpZ2h0LXZybC0wMDQueGh0IFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL292ZXJjb25zdHJhaW5lZC1yZWwtcG9z
LWx0ci10b3AtYm90dG9tLXZybC0wMDIueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQu
b3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0
aW5nLW1vZGVzL292ZXJjb25zdHJhaW5lZC1yZWwtcG9zLXJ0bC1sZWZ0LXJpZ2h0LXZsci0wMDku
eGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL292ZXJjb25zdHJhaW5l
ZC1yZWwtcG9zLXJ0bC1sZWZ0LXJpZ2h0LXZybC0wMDgueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBd
Ci13ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy13cml0aW5nLW1vZGVzL292ZXJjb25zdHJhaW5lZC1yZWwtcG9zLXJ0bC10b3AtYm90dG9t
LXZsci0wMDcueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGlt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL292ZXJj
b25zdHJhaW5lZC1yZWwtcG9zLXJ0bC10b3AtYm90dG9tLXZybC0wMDYueGh0IFsgSW1hZ2VPbmx5
RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL3Jvdy1wcm9ncmVzc2lvbi1zbHItMDIzLnhodCBb
IEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9yb3ctcHJvZ3Jlc3Npb24tc2xy
LTAyOS54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh
c3QvZG9tL29mZnNldC1wb3NpdGlvbi13cml0aW5nLW1vZGVzLWV4cGVjdGVkLnR4dCBiL0xheW91
dFRlc3RzL2Zhc3QvZG9tL29mZnNldC1wb3NpdGlvbi13cml0aW5nLW1vZGVzLWV4cGVjdGVkLnR4
dAppbmRleCBkM2NlNGFjMzIxMDY5OWI4ZTg5MWJmZjk3ODY1Mzg3ZjBkNTgzZjliLi44YTE2NTcx
NTk3ZmJmMDhjOTQ3ZGY5MWQ4MTM5YmNhNDliZjU5NTUyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0
cy9mYXN0L2RvbS9vZmZzZXQtcG9zaXRpb24td3JpdGluZy1tb2Rlcy1leHBlY3RlZC50eHQKKysr
IGIvTGF5b3V0VGVzdHMvZmFzdC9kb20vb2Zmc2V0LXBvc2l0aW9uLXdyaXRpbmctbW9kZXMtZXhw
ZWN0ZWQudHh0CkBAIC0xLDUgKzEsNCBAQAogUEFTUyBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgi
dmVydGljYWwiKS5vZmZzZXRMZWZ0IGlzIDY1Ci1QQVNTIGRvY3VtZW50LmdldEVsZW1lbnRCeUlk
KCJob3Jpem9udGFsIikub2Zmc2V0VG9wIGlzIDY1CiBQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBp
cyB0cnVlCiAKIFRFU1QgQ09NUExFVEUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZG9t
L29mZnNldC1wb3NpdGlvbi13cml0aW5nLW1vZGVzLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Rv
bS9vZmZzZXQtcG9zaXRpb24td3JpdGluZy1tb2Rlcy5odG1sCmluZGV4IGVkZWExZDVjY2EzZGE1
ZjFlYmFlYjQ5NDFhNjhiNzgxOThjODk2ZjMuLmFjZDFhYjhjMDgyNWExMzhkOTg5NDg1OWVlZDNj
ZWVhMjNmMjczMWUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvZG9tL29mZnNldC1wb3Np
dGlvbi13cml0aW5nLW1vZGVzLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9kb20vb2Zmc2V0
LXBvc2l0aW9uLXdyaXRpbmctbW9kZXMuaHRtbApAQCAtNiwxNyArNiw5IEBACiA8L2Rpdj4KIDwv
ZGl2PgogCi08ZGl2IHN0eWxlPSJwb3NpdGlvbjpyZWxhdGl2ZSI+Ci08ZGl2IHN0eWxlPSItd2Vi
a2l0LXdyaXRpbmctbW9kZTogaG9yaXpvbnRhbC1idDsgYmFja2dyb3VuZC1jb2xvcjogcmVkOyB3
aWR0aDogMTAwcHg7IGhlaWdodDogMTAwcHg7Ij4KLSAgICA8ZGl2IHN0eWxlPSJoZWlnaHQ6IDVw
eCI+PC9kaXY+Ci0gICAgPGRpdiBpZD1ob3Jpem9udGFsIHN0eWxlPSJiYWNrZ3JvdW5kLWNvbG9y
OiBvcmFuZ2U7IGhlaWdodDogMTBweDsgcG9zaXRpb246IHJlbGF0aXZlOyB0b3A6IC0yMHB4OyI+
PC9kaXY+Ci08L2Rpdj4KLTwvZGl2PgotCiA8cHJlIGlkPWNvbnNvbGU+PC9wcmU+CiAKIDxzY3Jp
cHQ+CiBzaG91bGRCZSgnZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInZlcnRpY2FsIikub2Zmc2V0
TGVmdCcsICc2NScpOwotc2hvdWxkQmUoJ2RvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJob3Jpem9u
dGFsIikub2Zmc2V0VG9wJywgJzY1Jyk7CiA8L3NjcmlwdD4KIDxzY3JpcHQgc3JjPSIuLi8uLi9y
ZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>442605</attachid>
            <date>2021-10-27 10:35:37 -0700</date>
            <delta_ts>2021-10-31 07:48:53 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232012-20211027193535.patch</filename>
            <type>text/plain</type>
            <size>8685</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0ODIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmI0NDI5OThkMzJkYTEy
Yjg2YmUxMjFhZTVmMjViOTY0NDFhMjBmZS4uNjY3YjAxOWQ3ZmE2ZmI5Y2Y3YTg1NWI0NmUyOTk2
MjMyNGRlY2M2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTEwLTI3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFic3Bvcy0wMjAuaHRtbAor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDEyCisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0lQLgorCisg
ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcDoKKyAgICAgICAgKFdl
YkNvcmU6OlJlbmRlckJveE1vZGVsT2JqZWN0OjpyZWxhdGl2ZVBvc2l0aW9uT2Zmc2V0IGNvbnN0
KToKKwogMjAyMS0xMC0yNSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQu
b3JnPgogCiAgICAgICAgIFdlYktpdCBvdWdodCB0byBiZSBhYmxlIHRvIHBsYXkgdmlkZW9zIHdp
dGhvdXQgQ29udGVudC1MZW5ndGggSFRUUCBoZWFkZXIgZmllbGRzIGFuZCB3aXRob3V0IHJhbmdl
IHN1cHBvcnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hN
b2RlbE9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxP
YmplY3QuY3BwCmluZGV4IDI0NTA5MTlmNDI2NDQ2Mzc0MmVjZDgwYjlkMmY2NDQyZGYxZTAxZjEu
LjY2NjQ0YzViNGFkN2E5ZDMyMjlkOTIxYmVmZWQyM2I3OWMwZTFmMGQgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKKysrIGIvU291
cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcApAQCAtMzQ2LDE2
ICszNDYsMzMgQEAgTGF5b3V0U2l6ZSBSZW5kZXJCb3hNb2RlbE9iamVjdDo6cmVsYXRpdmVQb3Np
dGlvbk9mZnNldCgpIGNvbnN0CiAgICAgLy8gY2FsbCBhdmFpbGFibGVXaWR0aCBvbiBvdXIgY29u
dGFpbmluZyBibG9jay4KICAgICAvLyBIb3dldmVyIGZvciBncmlkIGl0ZW1zIHRoZSBjb250YWlu
aW5nIGJsb2NrIGlzIHRoZSBncmlkIGFyZWEsIHNvIG9mZnNldHMgc2hvdWxkIGJlIHJlc29sdmVk
IGFnYWluc3QgdGhhdDoKICAgICAvLyBodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLWdyaWQv
I2dyaWQtaXRlbS1zaXppbmcKKyAgICBib29sIGlzTHRyID0gY29udGFpbmluZ0Jsb2NrKCktPnN0
eWxlKCkuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpOworICAgIFdyaXRpbmdNb2RlIHdyaXRpbmdN
b2RlID0gY29udGFpbmluZ0Jsb2NrKCktPnN0eWxlKCkud3JpdGluZ01vZGUoKTsKICAgICBpZiAo
IXN0eWxlKCkubGVmdCgpLmlzQXV0bygpIHx8ICFzdHlsZSgpLnJpZ2h0KCkuaXNBdXRvKCkpIHsK
ICAgICAgICAgTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCA9IGhhc092ZXJyaWRpbmdDb250YWlu
aW5nQmxvY2tDb250ZW50V2lkdGgoKQogICAgICAgICAgICAgPyBvdmVycmlkaW5nQ29udGFpbmlu
Z0Jsb2NrQ29udGVudFdpZHRoKCkudmFsdWVfb3IoTGF5b3V0VW5pdCgpKSA6IGNvbnRhaW5pbmdC
bG9jaygpLT5hdmFpbGFibGVXaWR0aCgpOwotICAgICAgICBpZiAoIXN0eWxlKCkubGVmdCgpLmlz
QXV0bygpKSB7Ci0gICAgICAgICAgICBpZiAoIXN0eWxlKCkucmlnaHQoKS5pc0F1dG8oKSAmJiAh
Y29udGFpbmluZ0Jsb2NrKCktPnN0eWxlKCkuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpKQorICAg
ICAgICBpZiAod3JpdGluZ01vZGUgPT0gV3JpdGluZ01vZGU6OlJpZ2h0VG9MZWZ0KSB7CisgICAg
ICAgICAgICBpZiAoIXN0eWxlKCkubGVmdCgpLmlzQXV0bygpKSB7CisgICAgICAgICAgICAgICAg
aWYgKCFzdHlsZSgpLnJpZ2h0KCkuaXNBdXRvKCkpCisgICAgICAgICAgICAgICAgICAgIG9mZnNl
dC5zZXRXaWR0aCgtdmFsdWVGb3JMZW5ndGgoc3R5bGUoKS5yaWdodCgpLCAhc3R5bGUoKS5yaWdo
dCgpLmlzRml4ZWQoKSA/IGF2YWlsYWJsZVdpZHRoIDogMF9sdSkpOworICAgICAgICAgICAgICAg
IGVsc2UKKyAgICAgICAgICAgICAgICAgICAgb2Zmc2V0LnNldFdpZHRoKHZhbHVlRm9yTGVuZ3Ro
KHN0eWxlKCkubGVmdCgpLCAhc3R5bGUoKS5sZWZ0KCkuaXNGaXhlZCgpID8gYXZhaWxhYmxlV2lk
dGggOiAwX2x1KSk7CisgICAgICAgICAgICB9IGVsc2UgaWYgKCFzdHlsZSgpLnJpZ2h0KCkuaXNB
dXRvKCkpCiAgICAgICAgICAgICAgICAgb2Zmc2V0LnNldFdpZHRoKC12YWx1ZUZvckxlbmd0aChz
dHlsZSgpLnJpZ2h0KCksICFzdHlsZSgpLnJpZ2h0KCkuaXNGaXhlZCgpID8gYXZhaWxhYmxlV2lk
dGggOiAwX2x1KSk7Ci0gICAgICAgICAgICBlbHNlCisgICAgICAgIH0gZWxzZSBpZiAod3JpdGlu
Z01vZGUgPT0gV3JpdGluZ01vZGU6OkxlZnRUb1JpZ2h0KSB7CisgICAgICAgICAgICBpZiAoIXN0
eWxlKCkubGVmdCgpLmlzQXV0bygpKSB7CiAgICAgICAgICAgICAgICAgb2Zmc2V0LmV4cGFuZCh2
YWx1ZUZvckxlbmd0aChzdHlsZSgpLmxlZnQoKSwgIXN0eWxlKCkubGVmdCgpLmlzRml4ZWQoKSA/
IGF2YWlsYWJsZVdpZHRoIDogMF9sdSksIDBfbHUpOwotICAgICAgICB9IGVsc2UgaWYgKCFzdHls
ZSgpLnJpZ2h0KCkuaXNBdXRvKCkpCi0gICAgICAgICAgICBvZmZzZXQuZXhwYW5kKC12YWx1ZUZv
ckxlbmd0aChzdHlsZSgpLnJpZ2h0KCksICFzdHlsZSgpLnJpZ2h0KCkuaXNGaXhlZCgpID8gYXZh
aWxhYmxlV2lkdGggOiAwX2x1KSwgMF9sdSk7CisgICAgICAgICAgICB9IGVsc2UgaWYgKCFzdHls
ZSgpLnJpZ2h0KCkuaXNBdXRvKCkpCisgICAgICAgICAgICAgICAgb2Zmc2V0LmV4cGFuZCgtdmFs
dWVGb3JMZW5ndGgoc3R5bGUoKS5yaWdodCgpLCAhc3R5bGUoKS5yaWdodCgpLmlzRml4ZWQoKSA/
IGF2YWlsYWJsZVdpZHRoIDogMF9sdSksIDBfbHUpOworICAgICAgICB9IGVsc2UgeworICAgICAg
ICAgICAgaWYgKCFzdHlsZSgpLmxlZnQoKS5pc0F1dG8oKSkgeworICAgICAgICAgICAgICAgIGlm
ICghc3R5bGUoKS5yaWdodCgpLmlzQXV0bygpICYmICFjb250YWluaW5nQmxvY2soKS0+c3R5bGUo
KS5pc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCkpCisgICAgICAgICAgICAgICAgICAgIG9mZnNldC5z
ZXRXaWR0aCgtdmFsdWVGb3JMZW5ndGgoc3R5bGUoKS5yaWdodCgpLCAhc3R5bGUoKS5yaWdodCgp
LmlzRml4ZWQoKSA/IGF2YWlsYWJsZVdpZHRoIDogMF9sdSkpOworICAgICAgICAgICAgICAgIGVs
c2UKKyAgICAgICAgICAgICAgICAgICAgb2Zmc2V0LmV4cGFuZCh2YWx1ZUZvckxlbmd0aChzdHls
ZSgpLmxlZnQoKSwgIXN0eWxlKCkubGVmdCgpLmlzRml4ZWQoKSA/IGF2YWlsYWJsZVdpZHRoIDog
MF9sdSksIDBfbHUpOworICAgICAgICAgICAgfSBlbHNlIGlmICghc3R5bGUoKS5yaWdodCgpLmlz
QXV0bygpKQorICAgICAgICAgICAgICAgIG9mZnNldC5leHBhbmQoLXZhbHVlRm9yTGVuZ3RoKHN0
eWxlKCkucmlnaHQoKSwgIXN0eWxlKCkucmlnaHQoKS5pc0ZpeGVkKCkgPyBhdmFpbGFibGVXaWR0
aCA6IDBfbHUpLCAwX2x1KTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIC8vIElmIHRoZSBjb250
YWluaW5nIGJsb2NrIG9mIGEgcmVsYXRpdmVseSBwb3NpdGlvbmVkIGVsZW1lbnQgZG9lcyBub3QK
QEAgLTM2Niw2ICszODMsOCBAQCBMYXlvdXRTaXplIFJlbmRlckJveE1vZGVsT2JqZWN0OjpyZWxh
dGl2ZVBvc2l0aW9uT2Zmc2V0KCkgY29uc3QKICAgICAvLyBTZWUgPGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjM5Nj4uCiAgICAgLy8gQW5vdGhlciBleGNlcHRpb24g
aXMgYSBncmlkIGl0ZW0sIGFzIHRoZSBjb250YWluaW5nIGJsb2NrIGlzIHRoZSBncmlkIGFyZWE6
CiAgICAgLy8gaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1ncmlkLyNncmlkLWl0ZW0tc2l6
aW5nCisgICAgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiB0b3A7CisgICAgc3RkOjpvcHRpb25h
bDxMYXlvdXRVbml0PiBib3R0b207CiAgICAgaWYgKCFzdHlsZSgpLnRvcCgpLmlzQXV0bygpCiAg
ICAgICAgICYmICghc3R5bGUoKS50b3AoKS5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKQogICAgICAg
ICAgICAgfHwgIWNvbnRhaW5pbmdCbG9jaygpLT5oYXNBdXRvSGVpZ2h0T3JDb250YWluaW5nQmxv
Y2tXaXRoQXV0b0hlaWdodCgpCkBAIC0zNzQsMTggKzM5Myw0MiBAQCBMYXlvdXRTaXplIFJlbmRl
ckJveE1vZGVsT2JqZWN0OjpyZWxhdGl2ZVBvc2l0aW9uT2Zmc2V0KCkgY29uc3QKICAgICAgICAg
Ly8gRklYTUU6IFRoZSBjb21wdXRhdGlvbiBvZiB0aGUgYXZhaWxhYmxlIGhlaWdodCBpcyByZXBl
YXRlZCBsYXRlciBmb3IgImJvdHRvbSIuCiAgICAgICAgIC8vIFdlIGNvdWxkIHJlZmFjdG9yIHRo
aXMgYW5kIG1vdmUgaXQgdG8gc29tZSBjb21tb24gY29kZSBmb3IgYm90aCBpZnMsIGhvd2V2ZXIg
bW92aW5nIGl0IG91dHNpZGUgb2YgdGhlIGlmcwogICAgICAgICAvLyBpcyBub3QgcG9zc2libGUg
YXMgaXQnZCBjYXVzZSBwZXJmb3JtYW5jZSByZWdyZXNzaW9ucy4KLSAgICAgICAgb2Zmc2V0LmV4
cGFuZCgwX2x1LCB2YWx1ZUZvckxlbmd0aChzdHlsZSgpLnRvcCgpLCAhc3R5bGUoKS50b3AoKS5p
c0ZpeGVkKCkKKyAgICAgICAgdG9wID0gdmFsdWVGb3JMZW5ndGgoc3R5bGUoKS50b3AoKSwgIXN0
eWxlKCkudG9wKCkuaXNGaXhlZCgpCiAgICAgICAgICAgICA/IChoYXNPdmVycmlkaW5nQ29udGFp
bmluZ0Jsb2NrQ29udGVudEhlaWdodCgpID8gb3ZlcnJpZGluZ0NvbnRhaW5pbmdCbG9ja0NvbnRl
bnRIZWlnaHQoKS52YWx1ZV9vcigwX2x1KSA6IGNvbnRhaW5pbmdCbG9jaygpLT5hdmFpbGFibGVI
ZWlnaHQoKSkKLSAgICAgICAgICAgIDogTGF5b3V0VW5pdCgpKSk7Ci0gICAgfSBlbHNlIGlmICgh
c3R5bGUoKS5ib3R0b20oKS5pc0F1dG8oKQorICAgICAgICAgICAgOiBMYXlvdXRVbml0KCkpOwor
ICAgIH0KKyAgICBpZiAoIXN0eWxlKCkuYm90dG9tKCkuaXNBdXRvKCkKICAgICAgICAgJiYgKCFz
dHlsZSgpLmJvdHRvbSgpLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpCiAgICAgICAgICAgICB8fCAh
Y29udGFpbmluZ0Jsb2NrKCktPmhhc0F1dG9IZWlnaHRPckNvbnRhaW5pbmdCbG9ja1dpdGhBdXRv
SGVpZ2h0KCkKICAgICAgICAgICAgIHx8IGNvbnRhaW5pbmdCbG9jaygpLT5zdHJldGNoZXNUb1Zp
ZXdwb3J0KCkKICAgICAgICAgICAgIHx8IGhhc092ZXJyaWRpbmdDb250YWluaW5nQmxvY2tDb250
ZW50SGVpZ2h0KCkpKSB7CiAgICAgICAgIC8vIEZJWE1FOiBDaGVjayBjb21tZW50IGFib3ZlIGZv
ciAidG9wIiwgaXQgYXBwbGllcyBoZXJlIHRvby4KLSAgICAgICAgb2Zmc2V0LmV4cGFuZCgwX2x1
LCAtdmFsdWVGb3JMZW5ndGgoc3R5bGUoKS5ib3R0b20oKSwgIXN0eWxlKCkuYm90dG9tKCkuaXNG
aXhlZCgpCisgICAgICAgIGJvdHRvbSA9IHZhbHVlRm9yTGVuZ3RoKHN0eWxlKCkuYm90dG9tKCks
ICFzdHlsZSgpLmJvdHRvbSgpLmlzRml4ZWQoKQogICAgICAgICAgICAgPyAoaGFzT3ZlcnJpZGlu
Z0NvbnRhaW5pbmdCbG9ja0NvbnRlbnRIZWlnaHQoKSA/IG92ZXJyaWRpbmdDb250YWluaW5nQmxv
Y2tDb250ZW50SGVpZ2h0KCkudmFsdWVfb3IoMF9sdSkgOiBjb250YWluaW5nQmxvY2soKS0+YXZh
aWxhYmxlSGVpZ2h0KCkpCi0gICAgICAgICAgICA6IExheW91dFVuaXQoKSkpOworICAgICAgICAg
ICAgOiBMYXlvdXRVbml0KCkpOworICAgIH0KKyAgICBpZiAoIXRvcCAmJiAhYm90dG9tKSB7Cisg
ICAgICAgIHRvcCA9IExheW91dFVuaXQoKTsKKyAgICAgICAgYm90dG9tID0gTGF5b3V0VW5pdCgp
OworICAgIH0KKyAgICBpZiAoIXRvcCkKKyAgICAgICAgdG9wID0gLWJvdHRvbS52YWx1ZSgpOwor
ICAgIGlmICghYm90dG9tKQorICAgICAgICBib3R0b20gPSAtdG9wLnZhbHVlKCk7CisgICAgc3dp
dGNoICh3cml0aW5nTW9kZSkgeworICAgIGNhc2UgV3JpdGluZ01vZGU6OlRvcFRvQm90dG9tOgor
ICAgIGNhc2UgV3JpdGluZ01vZGU6OkJvdHRvbVRvVG9wOgorICAgICAgICBvZmZzZXQuZXhwYW5k
KDBfbHUsIHRvcC52YWx1ZSgpKTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBXcml0aW5nTW9k
ZTo6UmlnaHRUb0xlZnQ6CisgICAgY2FzZSBXcml0aW5nTW9kZTo6TGVmdFRvUmlnaHQ6CisgICAg
ICAgIGlmIChpc0x0cikKKyAgICAgICAgICAgIG9mZnNldC5leHBhbmQoMF9sdSwgdG9wLnZhbHVl
KCkpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBvZmZzZXQuc2V0SGVpZ2h0KC1ib3R0b20u
dmFsdWUoKSk7CisgICAgICAgIGJyZWFrOworICAgIGRlZmF1bHQ6CisgICAgICAgIGJyZWFrOwog
ICAgIH0KIAogICAgIHJldHVybiBvZmZzZXQ7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNjYxMzQyZGMxMzI4ZjM5MTlhM2Uw
OWRmYTI5OTZjYmVkNjhmOWQzMC4uMGI3YzQ0YmMzZDBkMDlmMjAzZGQ0MjAzOTFiYTIxYWFlNWFl
YzZkNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz
L0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIxLTEwLTI3ICBSb2IgQnVpcyAgPHJidWlz
QGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFic3Bvcy0wMjAuaHRtbAorICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDEyCisKKyAgICAgICAgUmV2
aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgor
CiAyMDIxLTEwLTI1ICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgog
CiAgICAgICAgIFtBcHAgUHJpdmFjeSBSZXBvcnRdIENPUlMgcHJlZmxpZ2h0IHJlcXVlc3RzIGF0
dHJpYnV0ZWQgaW5jb3JyZWN0bHkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3Rh
dGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDk4ZDBmM2RmMDU4ZWYw
ZjE2ZmE0MGY4NGQ0NWE3ZmYzNGNhZmM3YzAuLjgxMjU3MDU3YzUxM2ZhMTY5YzE2MmZiYWE0NDll
MDU5MTRlYWFiZWIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysr
IGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDIwMSw5ICs0MjAxLDcgQEAgd2Vi
a2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
d3JpdGluZy1tb2Rlcy9vdXRsaW4KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvb3V0bGluZS1pbmxpbmUtdnJs
LTAwNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL292ZXJjb25z
dHJhaW5lZC1yZWwtcG9zLWx0ci1sZWZ0LXJpZ2h0LXZybC0wMDQueGh0IFsgSW1hZ2VPbmx5RmFp
bHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL292ZXJjb25zdHJhaW5lZC1yZWwtcG9zLWx0ci10b3At
Ym90dG9tLXZybC0wMDIueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA5
MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVz
L292ZXJjb25zdHJhaW5lZC1yZWwtcG9zLXJ0bC1sZWZ0LXJpZ2h0LXZsci0wMDkueGh0IFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL292ZXJjb25zdHJhaW5lZC1yZWwtcG9z
LXJ0bC1sZWZ0LXJpZ2h0LXZybC0wMDgueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQu
b3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0
aW5nLW1vZGVzL292ZXJjb25zdHJhaW5lZC1yZWwtcG9zLXJ0bC10b3AtYm90dG9tLXZsci0wMDcu
eGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL292ZXJjb25zdHJhaW5l
ZC1yZWwtcG9zLXJ0bC10b3AtYm90dG9tLXZybC0wMDYueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBd
CiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy13cml0aW5nLW1vZGVzL3Jvdy1wcm9ncmVzc2lvbi1zbHItMDIzLnhodCBbIEltYWdlT25s
eUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9yb3ctcHJvZ3Jlc3Npb24tc2xyLTAyOS54aHQg
WyBJbWFnZU9ubHlGYWlsdXJlIF0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>442936</attachid>
            <date>2021-10-31 07:48:57 -0700</date>
            <delta_ts>2021-11-03 13:26:24 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232012-20211031144856.patch</filename>
            <type>text/plain</type>
            <size>6983</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0ODIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmI0NDI5OThkMzJkYTEy
Yjg2YmUxMjFhZTVmMjViOTY0NDFhMjBmZS4uYjdhYTNkY2NmZjQzMzc1M2E1MjVhY2Q0YmE1ODdh
M2M3NjZlOTU2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTEwLTMxICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFic3Bvcy0wMjAuaHRtbAor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDEyCisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0lQLgorCisg
ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k
ZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoVXNpbmcgY29uc3QpOgorICAgICAg
ICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2lu
ZyBjb25zdCk6CisKIDIwMjEtMTAtMjUgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5A
d2Via2l0Lm9yZz4KIAogICAgICAgICBXZWJLaXQgb3VnaHQgdG8gYmUgYWJsZSB0byBwbGF5IHZp
ZGVvcyB3aXRob3V0IENvbnRlbnQtTGVuZ3RoIEhUVFAgaGVhZGVyIGZpZWxkcyBhbmQgd2l0aG91
dCByYW5nZSBzdXBwb3J0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu
ZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4
IGE0Njc0OTA5YjgzZjgwNzY0NTVkNzg1MzVhZTA3NzU4ZGU3MDcwNTguLjJiMWFhNDU4OWVmMzNk
YWIyODgyM2QzZmQyYzFjNzIyZDVmMzZhNjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl
bmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k
ZXJCb3guY3BwCkBAIC00MDMyLDcgKzQwMzIsNyBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBv
c2l0aW9uZWRMb2dpY2FsV2lkdGhVc2luZyhTaXplVHlwZSB3aWR0aFR5cGUsIExlbmd0aCBsbwog
CiAgICAgICAgICAgICAvLyBVc2UgdGhlIGNvbnRhaW5pbmcgYmxvY2sncyBkaXJlY3Rpb24gcmF0
aGVyIHRoYW4gdGhlIHBhcmVudCBibG9jaydzCiAgICAgICAgICAgICAvLyBwZXIgQ1NTIDIuMSBy
ZWZlcmVuY2UgdGVzdCBhYnNwb3Mtbm9uLXJlcGxhY2VkLXdpZHRoLW1hcmdpbi0wMDAuCi0gICAg
ICAgICAgICBpZiAoY29udGFpbmVyRGlyZWN0aW9uID09IFRleHREaXJlY3Rpb246OlJUTCkKKyAg
ICAgICAgICAgIGlmICgoaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSB8fCAhY29udGFpbmVyQmxv
Y2suaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkgJiYgY29udGFpbmVyRGlyZWN0aW9uID09IFRl
eHREaXJlY3Rpb246OlJUTCkKICAgICAgICAgICAgICAgICBsb2dpY2FsTGVmdFZhbHVlID0gKGF2
YWlsYWJsZVNwYWNlICsgbG9naWNhbExlZnRWYWx1ZSkgLSBtYXJnaW5Mb2dpY2FsTGVmdFZhbHVl
IC0gbWFyZ2luTG9naWNhbFJpZ2h0VmFsdWU7CiAgICAgICAgIH0KICAgICB9IGVsc2UgewpAQCAt
NDM1Miw2ICs0MzUyLDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNh
bEhlaWdodFVzaW5nKFNpemVUeXBlIGhlaWdodFR5cGUsIExlbmd0aAogICAgICAgICAgICAgcmVz
b2x2ZWRMb2dpY2FsSGVpZ2h0ID0gYWRqdXN0Q29udGVudEJveExvZ2ljYWxIZWlnaHRGb3JCb3hT
aXppbmcodmFsdWVGb3JMZW5ndGgobG9naWNhbEhlaWdodExlbmd0aCwgY29udGFpbmVyTG9naWNh
bEhlaWdodCkpOwogICAgIH0KIAorICAgIGJvb2wgb3ZlcmNvbnN0cmFpbmVkID0gZmFsc2U7CiAg
ICAgaWYgKCFsb2dpY2FsVG9wSXNBdXRvICYmICFsb2dpY2FsSGVpZ2h0SXNBdXRvICYmICFsb2dp
Y2FsQm90dG9tSXNBdXRvKSB7CiAgICAgICAgIC8qLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0qXAogICAgICAgICAg
KiBJZiBub25lIG9mIHRoZSB0aHJlZSBhcmUgJ2F1dG8nOiBJZiBib3RoICdtYXJnaW4tdG9wJyBh
bmQgJ21hcmdpbi0KQEAgLTQzODcsNiArNDM4OCwxMCBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0
ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0VXNpbmcoU2l6ZVR5cGUgaGVpZ2h0VHlwZSwgTGVuZ3Ro
CiAgICAgICAgICAgICAvLyBPdmVyLWNvbnN0cmFpbmVkLCAobm8gbmVlZCBzb2x2ZSBmb3IgYm90
dG9tKQogICAgICAgICAgICAgY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fYmVmb3JlID0gdmFs
dWVGb3JMZW5ndGgobWFyZ2luQmVmb3JlLCBjb250YWluZXJSZWxhdGl2ZUxvZ2ljYWxXaWR0aCk7
CiAgICAgICAgICAgICBjb21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9hZnRlciA9IHZhbHVlRm9y
TGVuZ3RoKG1hcmdpbkFmdGVyLCBjb250YWluZXJSZWxhdGl2ZUxvZ2ljYWxXaWR0aCk7CisgICAg
ICAgICAgICBvdmVyY29uc3RyYWluZWQgPSB0cnVlOworCisgICAgICAgICAgICBpZiAoKCFpc0hv
cml6b250YWxXcml0aW5nTW9kZSgpICYmIGlzT3J0aG9nb25hbCgqdGhpcywgY29udGFpbmVyQmxv
Y2spKSAmJiBjb250YWluZXJCbG9jay5zdHlsZSgpLmRpcmVjdGlvbigpID09IFRleHREaXJlY3Rp
b246OlJUTCkKKyAgICAgICAgICAgICAgICBsb2dpY2FsVG9wVmFsdWUgPSAoYXZhaWxhYmxlU3Bh
Y2UgKyBsb2dpY2FsVG9wVmFsdWUpIC0gY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fYmVmb3Jl
IC0gY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fYWZ0ZXI7CiAgICAgICAgIH0KICAgICB9IGVs
c2UgewogICAgICAgICAvKi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tKlwKQEAgLTQ0NDcsNyArNDQ1Miw4IEBAIHZvaWQg
UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyhTaXplVHlwZSBo
ZWlnaHRUeXBlLCBMZW5ndGgKIAogICAgIC8vIFVzZSBjb21wdXRlZCB2YWx1ZXMgdG8gY2FsY3Vs
YXRlIHRoZSB2ZXJ0aWNhbCBwb3NpdGlvbi4KICAgICBjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9u
ID0gbG9naWNhbFRvcFZhbHVlICsgY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fYmVmb3JlOwot
ICAgIGNvbXB1dGVMb2dpY2FsVG9wUG9zaXRpb25lZE9mZnNldChjb21wdXRlZFZhbHVlcy5tX3Bv
c2l0aW9uLCB0aGlzLCBsb2dpY2FsSGVpZ2h0VmFsdWUgKyBib3JkZXJzUGx1c1BhZGRpbmcsIGNv
bnRhaW5lckJsb2NrLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0KTsKKyAgICBpZiAoIW92ZXJjb25z
dHJhaW5lZCkKKyAgICAgICAgY29tcHV0ZUxvZ2ljYWxUb3BQb3NpdGlvbmVkT2Zmc2V0KGNvbXB1
dGVkVmFsdWVzLm1fcG9zaXRpb24sIHRoaXMsIGxvZ2ljYWxIZWlnaHRWYWx1ZSArIGJvcmRlcnNQ
bHVzUGFkZGluZywgY29udGFpbmVyQmxvY2ssIGNvbnRhaW5lckxvZ2ljYWxIZWlnaHQpOwogfQog
CiB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsV2lkdGhSZXBsYWNlZChM
b2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmIGNvbXB1dGVkVmFsdWVzKSBjb25zdApkaWZmIC0t
Z2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4
IDY2MTM0MmRjMTMyOGYzOTE5YTNlMDlkZmEyOTk2Y2JlZDY4ZjlkMzAuLjgwOWMwZmFmMjZkNzEw
MTVmY2RmZjNkODA5ZWIzMzYxZTMwOWZkM2MgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5n
ZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMS0x
MC0zMSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIEZpeCBhYnNwb3Mt
MDIwLmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTIzMjAxMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
ICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0xMC0yNSAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJp
bmVfY2hlbmV5QGFwcGxlLmNvbT4KIAogICAgICAgICBbQXBwIFByaXZhY3kgUmVwb3J0XSBDT1JT
IHByZWZsaWdodCByZXF1ZXN0cyBhdHRyaWJ1dGVkIGluY29ycmVjdGx5CmRpZmYgLS1naXQgYS9M
YXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9u
cwppbmRleCA5OGQwZjNkZjA1OGVmMGYxNmZhNDBmODRkNDVhN2ZmMzRjYWZjN2MwLi4xODgyYjVl
ZTZhYzgyZWIyMWYyNjdkNTAyMzNiMmZkM2ZkNmM3MTc5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0
cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAg
LTQwOTIsMTQgKzQwOTIsOSBAQCB3ZWJraXQub3JnL2IvMjMwMDgwIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy10cmFuc2Zvcm1zL3R0d2YtdHJhbgogCiB3ZWJraXQub3Jn
L2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5n
LW1vZGVzL2NlbnRyYWwtYmFzZWxpbmUtYWxpZ25tZW50LTAwMy54aHQgWyBJbWFnZU9ubHlGYWls
dXJlIFBhc3MgXQogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9jbGVhcmFuY2UtY2FsY3VsYXRpb25zLXZybC0w
MDIueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBQYXNzIF0KLXdlYmtpdC5vcmcvYi8yMDkwODAgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBv
cy1ub24tcmVwbGFjZWQtaWNiLXZsci0wMzMueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJr
aXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13
cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLWljYi12cmwtMDMwLnhodCBbIEltYWdl
T25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12bHIt
MDk1LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5v
bi1yZXBsYWNlZC12bHItMjI1LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9i
LzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1t
b2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12bHItMjI5LnhodCBbIEltYWdlT25seUZhaWx1cmUg
XQotd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12cmwtMDg4LnhodCBbIElt
YWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12
cmwtMjIwLnhodCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9z
LW5vbi1yZXBsYWNlZC12cmwtMjI0LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9y
Zy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGlu
Zy1tb2Rlcy9hdmFpbGFibGUtc2l6ZS0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Vi
a2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
d3JpdGluZy1tb2Rlcy9hdmFpbGFibGUtc2l6ZS0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg
XQogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3Mtd3JpdGluZy1tb2Rlcy9hdmFpbGFibGUtc2l6ZS0wMDMuaHRtbCBbIEltYWdlT25seUZh
aWx1cmUgXQpAQCAtNDYzNyw3ICs0NjMyLDYgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zbG90dGVkLXBsYWMKIAog
IyAgY29udGFpbi1pbnRyaW5zaWMtc2l6ZQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3Mt
MDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJz
cG9zLTAyMC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAjIGZsZXgtYmFzaXM6Y29udGVudAog
d2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbCBbIEltYWdl
T25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0w
MjYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>443233</attachid>
            <date>2021-11-03 13:26:28 -0700</date>
            <delta_ts>2021-11-03 14:47:47 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232012-20211103202627.patch</filename>
            <type>text/plain</type>
            <size>5379</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyODQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTEzZjBlNjE2Njg0NTIw
ZTYwNzkwMjRiZDA1MTUwODIzZDU2OThlNC4uZGExNDYyNGNlYjA3YzM5NDRhOGRiNzJlYTQ4OTNm
ZjVhNTBmNjA3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTExLTAzICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFic3Bvcy0wMjAuaHRtbAor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDEyCisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0lQLgorCisg
ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb21w
dXRlTG9naWNhbExlZnRQb3NpdGlvbmVkT2Zmc2V0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl
ckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsV2lkdGhVc2luZyBjb25zdCk6CisKIDIwMjEt
MDktMjEgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVt
b3ZlIFhTUyBBdWRpdG9yOiBQYXJ0IDIgKFJlbW92ZSBlbmdpbmUgc3VwcG9ydCkKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNv
cmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggNWJmYzNmYzFjZGU2MjIxMGM3OGU4MDY0
ZGQyNDk2YTk0MjdmOTBjMC4uODBjNWZiNzZhN2M4NzcxN2MxOTgzZjMxNTA2YmVhZjQ4OTM0NDI4
YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysr
IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTM5MjUsMTAgKzM5
MjUsMTEgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoKExv
Z2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyYgY29tcHUKIHN0YXRpYyB2b2lkIGNvbXB1dGVMb2dp
Y2FsTGVmdFBvc2l0aW9uZWRPZmZzZXQoTGF5b3V0VW5pdCYgbG9naWNhbExlZnRQb3MsIGNvbnN0
IFJlbmRlckJveCogY2hpbGQsIExheW91dFVuaXQgbG9naWNhbFdpZHRoVmFsdWUsIGNvbnN0IFJl
bmRlckJveE1vZGVsT2JqZWN0JiBjb250YWluZXJCbG9jaywgTGF5b3V0VW5pdCBjb250YWluZXJM
b2dpY2FsV2lkdGgpCiB7CiAgICAgYXV0byBsb2dpY2FsTGVmdEFuZFJpZ2h0QXJlQXV0byA9IGNo
aWxkLT5zdHlsZSgpLmxvZ2ljYWxMZWZ0KCkuaXNBdXRvKCkgJiYgY2hpbGQtPnN0eWxlKCkubG9n
aWNhbFJpZ2h0KCkuaXNBdXRvKCk7CisgICAgYm9vbCBvdmVyY29uc3RyYWluZWQgPSAhY2hpbGQt
PnN0eWxlKCkubG9naWNhbExlZnQoKS5pc0F1dG8oKSAmJiAhY2hpbGQtPnN0eWxlKCkubG9naWNh
bFJpZ2h0KCkuaXNBdXRvKCkgJiYgIWNoaWxkLT5zdHlsZSgpLmxvZ2ljYWxXaWR0aCgpLmlzQXV0
bygpOwogICAgIC8vIERlYWwgd2l0aCBkaWZmZXJpbmcgd3JpdGluZyBtb2RlcyBoZXJlLiBPdXIg
b2Zmc2V0IG5lZWRzIHRvIGJlIGluIHRoZSBjb250YWluaW5nIGJsb2NrJ3MgY29vcmRpbmF0ZSBz
cGFjZS4gSWYgdGhlIGNvbnRhaW5pbmcgYmxvY2sgaXMgZmxpcHBlZAogICAgIC8vIGFsb25nIHRo
aXMgYXhpcywgdGhlbiB3ZSBuZWVkIHRvIGZsaXAgdGhlIGNvb3JkaW5hdGUuIEF1dG8gcG9zaXRp
b25lZCBpdGVtcyBkbyBub3QgbmVlZCB0aGlzIGNvcnJlY3Rpb24gYXMgaXQgd2FzIHByb3Blcmx5
IGhhbmRsZWQgaW4KICAgICAvLyBjb21wdXRlSW5saW5lU3RhdGljRGlzdGFuY2UoKS4KLSAgICBp
ZiAoaXNPcnRob2dvbmFsKCpjaGlsZCwgY29udGFpbmVyQmxvY2spICYmICFsb2dpY2FsTGVmdEFu
ZFJpZ2h0QXJlQXV0byAmJiBjb250YWluZXJCbG9jay5zdHlsZSgpLmlzRmxpcHBlZEJsb2Nrc1dy
aXRpbmdNb2RlKCkpIHsKKyAgICBpZiAoaXNPcnRob2dvbmFsKCpjaGlsZCwgY29udGFpbmVyQmxv
Y2spICYmICFsb2dpY2FsTGVmdEFuZFJpZ2h0QXJlQXV0byAmJiAhb3ZlcmNvbnN0cmFpbmVkICYm
IGNvbnRhaW5lckJsb2NrLnN0eWxlKCkuaXNGbGlwcGVkQmxvY2tzV3JpdGluZ01vZGUoKSkgewog
ICAgICAgICBsb2dpY2FsTGVmdFBvcyA9IGNvbnRhaW5lckxvZ2ljYWxXaWR0aCAtIGxvZ2ljYWxX
aWR0aFZhbHVlIC0gbG9naWNhbExlZnRQb3M7CiAgICAgICAgIGxvZ2ljYWxMZWZ0UG9zICs9IChj
aGlsZC0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGNvbnRhaW5lckJsb2NrLmJvcmRlclJp
Z2h0KCkgOiBjb250YWluZXJCbG9jay5ib3JkZXJCb3R0b20oKSk7CiAgICAgfSBlbHNlCkBAIC00
MDIyLDcgKzQwMjMsOCBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2Fs
V2lkdGhVc2luZyhTaXplVHlwZSB3aWR0aFR5cGUsIExlbmd0aCBsbwogCiAgICAgICAgICAgICAv
LyBVc2UgdGhlIGNvbnRhaW5pbmcgYmxvY2sncyBkaXJlY3Rpb24gcmF0aGVyIHRoYW4gdGhlIHBh
cmVudCBibG9jaydzCiAgICAgICAgICAgICAvLyBwZXIgQ1NTIDIuMSByZWZlcmVuY2UgdGVzdCBh
YnNwb3Mtbm9uLXJlcGxhY2VkLXdpZHRoLW1hcmdpbi0wMDAuCi0gICAgICAgICAgICBpZiAoY29u
dGFpbmVyRGlyZWN0aW9uID09IFRleHREaXJlY3Rpb246OlJUTCkKKyAgICAgICAgICAgIGJvb2wg
aXNMZWZ0UmlnaHRPdmVyY29uc3RyYWluZWQgPSAhaXNPcnRob2dvbmFsKCp0aGlzLCBjb250YWlu
ZXJCbG9jayk7CisgICAgICAgICAgICBpZiAoaXNMZWZ0UmlnaHRPdmVyY29uc3RyYWluZWQgJiYg
Y29udGFpbmVyRGlyZWN0aW9uID09IFRleHREaXJlY3Rpb246OlJUTCkKICAgICAgICAgICAgICAg
ICBsb2dpY2FsTGVmdFZhbHVlID0gKGF2YWlsYWJsZVNwYWNlICsgbG9naWNhbExlZnRWYWx1ZSkg
LSBtYXJnaW5Mb2dpY2FsTGVmdFZhbHVlIC0gbWFyZ2luTG9naWNhbFJpZ2h0VmFsdWU7CiAgICAg
ICAgIH0KICAgICB9IGVsc2UgewpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIv
TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDVhYTU3YjkxMThhNmZkNmZiMjIwYzFmODIzZTVj
MTQwNGJlZGRkYTcuLjhjZDJkOGI4MGYzY2NhNzg2ZDY5MjJmYWQyZjA1NmFkZTlhNmFmYTkgMTAw
NjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM
b2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMS0xMS0wMyAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEu
Y29tPgorCisgICAgICAgIEZpeCBhYnNwb3MtMDIwLmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdz
LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjAxMgorCisgICAgICAgIE5lZWQgdGhlIGJ1
ZyBVUkwgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDkt
MjEgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3Zl
IFhTUyBBdWRpdG9yOiBQYXJ0IDIgKFJlbW92ZSBlbmdpbmUgc3VwcG9ydCkKZGlmZiAtLWdpdCBh
L0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRp
b25zCmluZGV4IGY1ZGNhY2QxZTJhMTczZWVkZmFiYzAxNjRiZGNmZjFjN2VhOWU0N2MuLjc1Mjlk
YjZlZmQ4Y2E5YTc4MjJjNmIxMWE5OWIyNTFiYWUzMDczZmIgMTAwNjQ0Ci0tLSBhL0xheW91dFRl
c3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpA
QCAtNDEwMywxMSArNDEwMyw3IEBAIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvY2xlYXJhCiB3ZWJraXQub3Jn
L2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5n
LW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLWljYi12bHItMDMzLnhodCBbIEltYWdlT25seUZh
aWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC1pY2ItdnJsLTAz
MC54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24t
cmVwbGFjZWQtdmxyLTA5NS54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8y
MDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9k
ZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdmxyLTIyNS54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
LXdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdmxyLTIyOS54aHQgWyBJbWFn
ZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdnJs
LTA4OC54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1u
b24tcmVwbGFjZWQtdnJsLTIyMC54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcv
Yi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmct
bW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdnJsLTIyNC54aHQgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXdyaXRpbmctbW9kZXMvYXZhaWxhYmxlLXNpemUtMDAxLmh0bWwgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYXZhaWxhYmxlLXNpemUtMDAyLmh0bWwgWyBJbWFn
ZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYXZhaWxhYmxlLXNpemUtMDAzLmh0bWwg
WyBJbWFnZU9ubHlGYWlsdXJlIF0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>443242</attachid>
            <date>2021-11-03 14:47:51 -0700</date>
            <delta_ts>2021-11-04 00:57:59 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232012-20211103214750.patch</filename>
            <type>text/plain</type>
            <size>8572</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyODQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTEzZjBlNjE2Njg0NTIw
ZTYwNzkwMjRiZDA1MTUwODIzZDU2OThlNC4uZGExNDYyNGNlYjA3YzM5NDRhOGRiNzJlYTQ4OTNm
ZjVhNTBmNjA3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTExLTAzICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFic3Bvcy0wMjAuaHRtbAor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDEyCisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0lQLgorCisg
ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb21w
dXRlTG9naWNhbExlZnRQb3NpdGlvbmVkT2Zmc2V0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl
ckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsV2lkdGhVc2luZyBjb25zdCk6CisKIDIwMjEt
MDktMjEgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVt
b3ZlIFhTUyBBdWRpdG9yOiBQYXJ0IDIgKFJlbW92ZSBlbmdpbmUgc3VwcG9ydCkKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNv
cmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggNWJmYzNmYzFjZGU2MjIxMGM3OGU4MDY0
ZGQyNDk2YTk0MjdmOTBjMC4uYWE4NzQ3OGZlNTFlOTZiMDAzM2Q0MDIyN2JmYmI0OTZlZTMwN2Y5
ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysr
IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTM5MjUsMTAgKzM5
MjUsMTEgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoKExv
Z2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyYgY29tcHUKIHN0YXRpYyB2b2lkIGNvbXB1dGVMb2dp
Y2FsTGVmdFBvc2l0aW9uZWRPZmZzZXQoTGF5b3V0VW5pdCYgbG9naWNhbExlZnRQb3MsIGNvbnN0
IFJlbmRlckJveCogY2hpbGQsIExheW91dFVuaXQgbG9naWNhbFdpZHRoVmFsdWUsIGNvbnN0IFJl
bmRlckJveE1vZGVsT2JqZWN0JiBjb250YWluZXJCbG9jaywgTGF5b3V0VW5pdCBjb250YWluZXJM
b2dpY2FsV2lkdGgpCiB7CiAgICAgYXV0byBsb2dpY2FsTGVmdEFuZFJpZ2h0QXJlQXV0byA9IGNo
aWxkLT5zdHlsZSgpLmxvZ2ljYWxMZWZ0KCkuaXNBdXRvKCkgJiYgY2hpbGQtPnN0eWxlKCkubG9n
aWNhbFJpZ2h0KCkuaXNBdXRvKCk7CisgICAgYm9vbCBvdmVyY29uc3RyYWluZWQgPSAhY2hpbGQt
PnN0eWxlKCkubG9naWNhbExlZnQoKS5pc0F1dG8oKSAmJiAhY2hpbGQtPnN0eWxlKCkubG9naWNh
bFJpZ2h0KCkuaXNBdXRvKCkgJiYgIWNoaWxkLT5zdHlsZSgpLmxvZ2ljYWxXaWR0aCgpLmlzQXV0
bygpOwogICAgIC8vIERlYWwgd2l0aCBkaWZmZXJpbmcgd3JpdGluZyBtb2RlcyBoZXJlLiBPdXIg
b2Zmc2V0IG5lZWRzIHRvIGJlIGluIHRoZSBjb250YWluaW5nIGJsb2NrJ3MgY29vcmRpbmF0ZSBz
cGFjZS4gSWYgdGhlIGNvbnRhaW5pbmcgYmxvY2sgaXMgZmxpcHBlZAogICAgIC8vIGFsb25nIHRo
aXMgYXhpcywgdGhlbiB3ZSBuZWVkIHRvIGZsaXAgdGhlIGNvb3JkaW5hdGUuIEF1dG8gcG9zaXRp
b25lZCBpdGVtcyBkbyBub3QgbmVlZCB0aGlzIGNvcnJlY3Rpb24gYXMgaXQgd2FzIHByb3Blcmx5
IGhhbmRsZWQgaW4KICAgICAvLyBjb21wdXRlSW5saW5lU3RhdGljRGlzdGFuY2UoKS4KLSAgICBp
ZiAoaXNPcnRob2dvbmFsKCpjaGlsZCwgY29udGFpbmVyQmxvY2spICYmICFsb2dpY2FsTGVmdEFu
ZFJpZ2h0QXJlQXV0byAmJiBjb250YWluZXJCbG9jay5zdHlsZSgpLmlzRmxpcHBlZEJsb2Nrc1dy
aXRpbmdNb2RlKCkpIHsKKyAgICBpZiAoaXNPcnRob2dvbmFsKCpjaGlsZCwgY29udGFpbmVyQmxv
Y2spICYmICFsb2dpY2FsTGVmdEFuZFJpZ2h0QXJlQXV0byAmJiAhb3ZlcmNvbnN0cmFpbmVkICYm
IGNvbnRhaW5lckJsb2NrLnN0eWxlKCkuaXNGbGlwcGVkQmxvY2tzV3JpdGluZ01vZGUoKSkgewog
ICAgICAgICBsb2dpY2FsTGVmdFBvcyA9IGNvbnRhaW5lckxvZ2ljYWxXaWR0aCAtIGxvZ2ljYWxX
aWR0aFZhbHVlIC0gbG9naWNhbExlZnRQb3M7CiAgICAgICAgIGxvZ2ljYWxMZWZ0UG9zICs9IChj
aGlsZC0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGNvbnRhaW5lckJsb2NrLmJvcmRlclJp
Z2h0KCkgOiBjb250YWluZXJCbG9jay5ib3JkZXJCb3R0b20oKSk7CiAgICAgfSBlbHNlCkBAIC00
MDIyLDcgKzQwMjMsOCBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2Fs
V2lkdGhVc2luZyhTaXplVHlwZSB3aWR0aFR5cGUsIExlbmd0aCBsbwogCiAgICAgICAgICAgICAv
LyBVc2UgdGhlIGNvbnRhaW5pbmcgYmxvY2sncyBkaXJlY3Rpb24gcmF0aGVyIHRoYW4gdGhlIHBh
cmVudCBibG9jaydzCiAgICAgICAgICAgICAvLyBwZXIgQ1NTIDIuMSByZWZlcmVuY2UgdGVzdCBh
YnNwb3Mtbm9uLXJlcGxhY2VkLXdpZHRoLW1hcmdpbi0wMDAuCi0gICAgICAgICAgICBpZiAoY29u
dGFpbmVyRGlyZWN0aW9uID09IFRleHREaXJlY3Rpb246OlJUTCkKKyAgICAgICAgICAgIGJvb2wg
aXNMZWZ0UmlnaHRPdmVyY29uc3RyYWluZWQgPSAhaXNPcnRob2dvbmFsKCp0aGlzLCBjb250YWlu
ZXJCbG9jayk7CisgICAgICAgICAgICBpZiAoaXNMZWZ0UmlnaHRPdmVyY29uc3RyYWluZWQgJiYg
Y29udGFpbmVyRGlyZWN0aW9uID09IFRleHREaXJlY3Rpb246OlJUTCkKICAgICAgICAgICAgICAg
ICBsb2dpY2FsTGVmdFZhbHVlID0gKGF2YWlsYWJsZVNwYWNlICsgbG9naWNhbExlZnRWYWx1ZSkg
LSBtYXJnaW5Mb2dpY2FsTGVmdFZhbHVlIC0gbWFyZ2luTG9naWNhbFJpZ2h0VmFsdWU7CiAgICAg
ICAgIH0KICAgICB9IGVsc2UgewpAQCAtNDI3NywxMiArNDI3OSwxNSBAQCBzdGF0aWMgdm9pZCBj
b21wdXRlTG9naWNhbFRvcFBvc2l0aW9uZWRPZmZzZXQoTGF5b3V0VW5pdCYgbG9naWNhbFRvcFBv
cywgY29uc3QgUgogICAgIGF1dG8gbG9naWNhbFRvcEFuZEJvdHRvbUFyZUF1dG8gPSBjaGlsZC0+
c3R5bGUoKS5sb2dpY2FsVG9wKCkuaXNBdXRvKCkgJiYgY2hpbGQtPnN0eWxlKCkubG9naWNhbEJv
dHRvbSgpLmlzQXV0bygpOwogICAgIGF1dG8gaGF2ZU9ydGhvZ29uYWxXcml0aW5nTW9kZXMgPSBp
c09ydGhvZ29uYWwoKmNoaWxkLCBjb250YWluZXJCbG9jayk7CiAgICAgYXV0byBoYXZlRmxpcHBl
ZEJsb2NrQXhpcyA9IGNoaWxkLT5zdHlsZSgpLmlzRmxpcHBlZEJsb2Nrc1dyaXRpbmdNb2RlKCkg
IT0gY29udGFpbmVyQmxvY2suc3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9kZSgpOwor
ICAgIGJvb2wgb3ZlcmNvbnN0cmFpbmVkID0gIWNoaWxkLT5zdHlsZSgpLmxvZ2ljYWxUb3AoKS5p
c0F1dG8oKSAmJiAhY2hpbGQtPnN0eWxlKCkubG9naWNhbEJvdHRvbSgpLmlzQXV0bygpICYmICFj
aGlsZC0+c3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCkuaXNBdXRvKCk7CiAKICAgICAvLyBEZWFsIHdp
dGggZGlmZmVyaW5nIHdyaXRpbmcgbW9kZXMgaGVyZS4gIE91ciBvZmZzZXQgbmVlZHMgdG8gYmUg
aW4gdGhlIGNvbnRhaW5pbmcgYmxvY2sncyBjb29yZGluYXRlIHNwYWNlLiBJZiB0aGUgY29udGFp
bmluZyBibG9jayBpcyBmbGlwcGVkCiAgICAgLy8gYWxvbmcgdGhpcyBheGlzLCB0aGVuIHdlIG5l
ZWQgdG8gZmxpcCB0aGUgY29vcmRpbmF0ZS4gIFRoaXMgY2FuIG9ubHkgaGFwcGVuIGlmIHRoZSBj
b250YWluaW5nIGJsb2NrIGlzIGJvdGggYSBmbGlwcGVkIG1vZGUgYW5kIHBlcnBlbmRpY3VsYXIg
dG8gdXMuCisgICAgaWYgKCFvdmVyY29uc3RyYWluZWQpIHsKICAgICBpZiAoKGhhdmVPcnRob2dv
bmFsV3JpdGluZ01vZGVzICYmICFsb2dpY2FsVG9wQW5kQm90dG9tQXJlQXV0byAmJiBjaGlsZC0+
c3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9kZSgpKQogICAgICAgICB8fCAoaGF2ZUZs
aXBwZWRCbG9ja0F4aXMgJiYgIWhhdmVPcnRob2dvbmFsV3JpdGluZ01vZGVzKSkKICAgICAgICAg
bG9naWNhbFRvcFBvcyA9IGNvbnRhaW5lckxvZ2ljYWxIZWlnaHRGb3JQb3NpdGlvbmVkIC0gbG9n
aWNhbEhlaWdodFZhbHVlIC0gbG9naWNhbFRvcFBvczsKKyAgICB9CiAKICAgICAvLyBPdXIgb2Zm
c2V0IGlzIGZyb20gdGhlIGxvZ2ljYWwgYm90dG9tIGVkZ2UgaW4gYSBmbGlwcGVkIGVudmlyb25t
ZW50LCBlLmcuLCByaWdodCBmb3IgdmVydGljYWwtcmwgYW5kIGJvdHRvbSBmb3IgaG9yaXpvbnRh
bC1idC4KICAgICBpZiAoY29udGFpbmVyQmxvY2suc3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0
aW5nTW9kZSgpICYmICFoYXZlT3J0aG9nb25hbFdyaXRpbmdNb2RlcykgewpAQCAtNDM3Nyw2ICs0
MzgyLDEwIEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRV
c2luZyhTaXplVHlwZSBoZWlnaHRUeXBlLCBMZW5ndGgKICAgICAgICAgICAgIC8vIE92ZXItY29u
c3RyYWluZWQsIChubyBuZWVkIHNvbHZlIGZvciBib3R0b20pCiAgICAgICAgICAgICBjb21wdXRl
ZFZhbHVlcy5tX21hcmdpbnMubV9iZWZvcmUgPSB2YWx1ZUZvckxlbmd0aChtYXJnaW5CZWZvcmUs
IGNvbnRhaW5lclJlbGF0aXZlTG9naWNhbFdpZHRoKTsKICAgICAgICAgICAgIGNvbXB1dGVkVmFs
dWVzLm1fbWFyZ2lucy5tX2FmdGVyID0gdmFsdWVGb3JMZW5ndGgobWFyZ2luQWZ0ZXIsIGNvbnRh
aW5lclJlbGF0aXZlTG9naWNhbFdpZHRoKTsKKworICAgICAgICAgICAgYm9vbCBpc0xlZnRSaWdo
dE92ZXJjb25zdHJhaW5lZCA9IGlzT3J0aG9nb25hbCgqdGhpcywgY29udGFpbmVyQmxvY2spOwor
ICAgICAgICAgICAgaWYgKGlzTGVmdFJpZ2h0T3ZlcmNvbnN0cmFpbmVkICYmIGNvbnRhaW5lckJs
b2NrLnN0eWxlKCkuZGlyZWN0aW9uKCkgPT0gVGV4dERpcmVjdGlvbjo6UlRMKQorICAgICAgICAg
ICAgICAgIGxvZ2ljYWxUb3BWYWx1ZSA9IChhdmFpbGFibGVTcGFjZSArIGxvZ2ljYWxUb3BWYWx1
ZSkgLSBjb21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9iZWZvcmUgLSBjb21wdXRlZFZhbHVlcy5t
X21hcmdpbnMubV9hZnRlcjsKICAgICAgICAgfQogICAgIH0gZWxzZSB7CiAgICAgICAgIC8qLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0qXApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVz
dHMvQ2hhbmdlTG9nCmluZGV4IDVhYTU3YjkxMThhNmZkNmZiMjIwYzFmODIzZTVjMTQwNGJlZGRk
YTcuLjhjZDJkOGI4MGYzY2NhNzg2ZDY5MjJmYWQyZjA1NmFkZTlhNmFmYTkgMTAwNjQ0Ci0tLSBh
L0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwxMiBAQAorMjAyMS0xMS0wMyAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisg
ICAgICAgIEZpeCBhYnNwb3MtMDIwLmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v
cmcvc2hvd19idWcuY2dpP2lkPTIzMjAxMgorCisgICAgICAgIE5lZWQgdGhlIGJ1ZyBVUkwgKE9P
UFMhKS4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDktMjEgIEJyZW50
IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIFhTUyBBdWRp
dG9yOiBQYXJ0IDIgKFJlbW92ZSBlbmdpbmUgc3VwcG9ydCkKZGlmZiAtLWdpdCBhL0xheW91dFRl
c3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4
IGY1ZGNhY2QxZTJhMTczZWVkZmFiYzAxNjRiZGNmZjFjN2VhOWU0N2MuLjQxOTU3YjM1Y2E3MTZl
ZTQzNDU4ZTdjZWFmZWNiZGYwMzI0MjBmOTcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RF
eHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDEwMCwx
NCArNDEwMCw3IEBAIHdlYmtpdC5vcmcvYi8yMzAwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXRyYW5zZm9ybXMvdHR3Zi10cmFuCiAKIHdlYmtpdC5vcmcvYi8yMDkw
ODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMv
Y2VudHJhbC1iYXNlbGluZS1hbGlnbm1lbnQtMDAzLnhodCBbIEltYWdlT25seUZhaWx1cmUgUGFz
cyBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy13cml0aW5nLW1vZGVzL2NsZWFyYW5jZS1jYWxjdWxhdGlvbnMtdnJsLTAwMi54aHQg
WyBJbWFnZU9ubHlGYWlsdXJlIFBhc3MgXQotd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1y
ZXBsYWNlZC1pY2ItdmxyLTAzMy54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcv
Yi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmct
bW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtaWNiLXZybC0wMzAueGh0IFsgSW1hZ2VPbmx5RmFp
bHVyZSBdCi13ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZsci0wOTUueGh0
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxh
Y2VkLXZsci0yMjUueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA5MDgw
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Fi
cy1wb3Mtbm9uLXJlcGxhY2VkLXZsci0yMjkueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJr
aXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13
cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZybC0wODgueGh0IFsgSW1hZ2VPbmx5
RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZybC0yMjAu
eGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJl
cGxhY2VkLXZybC0yMjQueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5
MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVz
L2F2YWlsYWJsZS1zaXplLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3Jn
L2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5n
LW1vZGVzL2F2YWlsYWJsZS1zaXplLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJr
aXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13
cml0aW5nLW1vZGVzL2F2YWlsYWJsZS1zaXplLTAwMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd
CkBAIC00ODUzLDcgKzQ4NDYsNiBAQCB3ZWJraXQub3JnL2IvMjE0NDYyIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zY29waW5nL3Nsb3R0ZWQtcGxhYwogCiAjICBjb250
YWluLWludHJpbnNpYy1zaXplCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMTQuaHRt
bCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDIw
Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KICMgZmxleC1iYXNpczpjb250ZW50CiB3ZWJraXQu
b3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp
bmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMS5odG1sIFsgSW1hZ2VPbmx5RmFp
bHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMi5odG1s
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>443282</attachid>
            <date>2021-11-04 00:58:04 -0700</date>
            <delta_ts>2021-11-04 04:04:57 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232012-20211104075802.patch</filename>
            <type>text/plain</type>
            <size>8729</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyODQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTEzZjBlNjE2Njg0NTIw
ZTYwNzkwMjRiZDA1MTUwODIzZDU2OThlNC4uZGExNDYyNGNlYjA3YzM5NDRhOGRiNzJlYTQ4OTNm
ZjVhNTBmNjA3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTExLTAzICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFic3Bvcy0wMjAuaHRtbAor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDEyCisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0lQLgorCisg
ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb21w
dXRlTG9naWNhbExlZnRQb3NpdGlvbmVkT2Zmc2V0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl
ckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsV2lkdGhVc2luZyBjb25zdCk6CisKIDIwMjEt
MDktMjEgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVt
b3ZlIFhTUyBBdWRpdG9yOiBQYXJ0IDIgKFJlbW92ZSBlbmdpbmUgc3VwcG9ydCkKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNv
cmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggNWJmYzNmYzFjZGU2MjIxMGM3OGU4MDY0
ZGQyNDk2YTk0MjdmOTBjMC4uNTIzZWYxYjNkMDRhMWU1ZmMzNjJjNzQ3MWZiOGE3ZTdhMjcxYzEx
MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysr
IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTM5MjUsMTAgKzM5
MjUsMTEgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoKExv
Z2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyYgY29tcHUKIHN0YXRpYyB2b2lkIGNvbXB1dGVMb2dp
Y2FsTGVmdFBvc2l0aW9uZWRPZmZzZXQoTGF5b3V0VW5pdCYgbG9naWNhbExlZnRQb3MsIGNvbnN0
IFJlbmRlckJveCogY2hpbGQsIExheW91dFVuaXQgbG9naWNhbFdpZHRoVmFsdWUsIGNvbnN0IFJl
bmRlckJveE1vZGVsT2JqZWN0JiBjb250YWluZXJCbG9jaywgTGF5b3V0VW5pdCBjb250YWluZXJM
b2dpY2FsV2lkdGgpCiB7CiAgICAgYXV0byBsb2dpY2FsTGVmdEFuZFJpZ2h0QXJlQXV0byA9IGNo
aWxkLT5zdHlsZSgpLmxvZ2ljYWxMZWZ0KCkuaXNBdXRvKCkgJiYgY2hpbGQtPnN0eWxlKCkubG9n
aWNhbFJpZ2h0KCkuaXNBdXRvKCk7CisgICAgYm9vbCBvdmVyY29uc3RyYWluZWQgPSAhY2hpbGQt
PnN0eWxlKCkubG9naWNhbExlZnQoKS5pc0F1dG8oKSAmJiAhY2hpbGQtPnN0eWxlKCkubG9naWNh
bFJpZ2h0KCkuaXNBdXRvKCkgJiYgIWNoaWxkLT5zdHlsZSgpLmxvZ2ljYWxXaWR0aCgpLmlzQXV0
bygpOwogICAgIC8vIERlYWwgd2l0aCBkaWZmZXJpbmcgd3JpdGluZyBtb2RlcyBoZXJlLiBPdXIg
b2Zmc2V0IG5lZWRzIHRvIGJlIGluIHRoZSBjb250YWluaW5nIGJsb2NrJ3MgY29vcmRpbmF0ZSBz
cGFjZS4gSWYgdGhlIGNvbnRhaW5pbmcgYmxvY2sgaXMgZmxpcHBlZAogICAgIC8vIGFsb25nIHRo
aXMgYXhpcywgdGhlbiB3ZSBuZWVkIHRvIGZsaXAgdGhlIGNvb3JkaW5hdGUuIEF1dG8gcG9zaXRp
b25lZCBpdGVtcyBkbyBub3QgbmVlZCB0aGlzIGNvcnJlY3Rpb24gYXMgaXQgd2FzIHByb3Blcmx5
IGhhbmRsZWQgaW4KICAgICAvLyBjb21wdXRlSW5saW5lU3RhdGljRGlzdGFuY2UoKS4KLSAgICBp
ZiAoaXNPcnRob2dvbmFsKCpjaGlsZCwgY29udGFpbmVyQmxvY2spICYmICFsb2dpY2FsTGVmdEFu
ZFJpZ2h0QXJlQXV0byAmJiBjb250YWluZXJCbG9jay5zdHlsZSgpLmlzRmxpcHBlZEJsb2Nrc1dy
aXRpbmdNb2RlKCkpIHsKKyAgICBpZiAoaXNPcnRob2dvbmFsKCpjaGlsZCwgY29udGFpbmVyQmxv
Y2spICYmICFsb2dpY2FsTGVmdEFuZFJpZ2h0QXJlQXV0byAmJiAhb3ZlcmNvbnN0cmFpbmVkICYm
IGNvbnRhaW5lckJsb2NrLnN0eWxlKCkuaXNGbGlwcGVkQmxvY2tzV3JpdGluZ01vZGUoKSkgewog
ICAgICAgICBsb2dpY2FsTGVmdFBvcyA9IGNvbnRhaW5lckxvZ2ljYWxXaWR0aCAtIGxvZ2ljYWxX
aWR0aFZhbHVlIC0gbG9naWNhbExlZnRQb3M7CiAgICAgICAgIGxvZ2ljYWxMZWZ0UG9zICs9IChj
aGlsZC0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGNvbnRhaW5lckJsb2NrLmJvcmRlclJp
Z2h0KCkgOiBjb250YWluZXJCbG9jay5ib3JkZXJCb3R0b20oKSk7CiAgICAgfSBlbHNlCkBAIC00
MDIyLDcgKzQwMjMsOCBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2Fs
V2lkdGhVc2luZyhTaXplVHlwZSB3aWR0aFR5cGUsIExlbmd0aCBsbwogCiAgICAgICAgICAgICAv
LyBVc2UgdGhlIGNvbnRhaW5pbmcgYmxvY2sncyBkaXJlY3Rpb24gcmF0aGVyIHRoYW4gdGhlIHBh
cmVudCBibG9jaydzCiAgICAgICAgICAgICAvLyBwZXIgQ1NTIDIuMSByZWZlcmVuY2UgdGVzdCBh
YnNwb3Mtbm9uLXJlcGxhY2VkLXdpZHRoLW1hcmdpbi0wMDAuCi0gICAgICAgICAgICBpZiAoY29u
dGFpbmVyRGlyZWN0aW9uID09IFRleHREaXJlY3Rpb246OlJUTCkKKyAgICAgICAgICAgIGJvb2wg
aXNMZWZ0UmlnaHRPdmVyY29uc3RyYWluZWQgPSAhaXNPcnRob2dvbmFsKCp0aGlzLCBjb250YWlu
ZXJCbG9jayk7CisgICAgICAgICAgICBpZiAoaXNMZWZ0UmlnaHRPdmVyY29uc3RyYWluZWQgJiYg
Y29udGFpbmVyRGlyZWN0aW9uID09IFRleHREaXJlY3Rpb246OlJUTCkKICAgICAgICAgICAgICAg
ICBsb2dpY2FsTGVmdFZhbHVlID0gKGF2YWlsYWJsZVNwYWNlICsgbG9naWNhbExlZnRWYWx1ZSkg
LSBtYXJnaW5Mb2dpY2FsTGVmdFZhbHVlIC0gbWFyZ2luTG9naWNhbFJpZ2h0VmFsdWU7CiAgICAg
ICAgIH0KICAgICB9IGVsc2UgewpAQCAtNDI3NywxMiArNDI3OSwxNSBAQCBzdGF0aWMgdm9pZCBj
b21wdXRlTG9naWNhbFRvcFBvc2l0aW9uZWRPZmZzZXQoTGF5b3V0VW5pdCYgbG9naWNhbFRvcFBv
cywgY29uc3QgUgogICAgIGF1dG8gbG9naWNhbFRvcEFuZEJvdHRvbUFyZUF1dG8gPSBjaGlsZC0+
c3R5bGUoKS5sb2dpY2FsVG9wKCkuaXNBdXRvKCkgJiYgY2hpbGQtPnN0eWxlKCkubG9naWNhbEJv
dHRvbSgpLmlzQXV0bygpOwogICAgIGF1dG8gaGF2ZU9ydGhvZ29uYWxXcml0aW5nTW9kZXMgPSBp
c09ydGhvZ29uYWwoKmNoaWxkLCBjb250YWluZXJCbG9jayk7CiAgICAgYXV0byBoYXZlRmxpcHBl
ZEJsb2NrQXhpcyA9IGNoaWxkLT5zdHlsZSgpLmlzRmxpcHBlZEJsb2Nrc1dyaXRpbmdNb2RlKCkg
IT0gY29udGFpbmVyQmxvY2suc3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9kZSgpOwor
ICAgIGJvb2wgb3ZlcmNvbnN0cmFpbmVkID0gIWNoaWxkLT5zdHlsZSgpLmxvZ2ljYWxUb3AoKS5p
c0F1dG8oKSAmJiAhY2hpbGQtPnN0eWxlKCkubG9naWNhbEJvdHRvbSgpLmlzQXV0bygpICYmICFj
aGlsZC0+c3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCkuaXNBdXRvKCk7CiAKICAgICAvLyBEZWFsIHdp
dGggZGlmZmVyaW5nIHdyaXRpbmcgbW9kZXMgaGVyZS4gIE91ciBvZmZzZXQgbmVlZHMgdG8gYmUg
aW4gdGhlIGNvbnRhaW5pbmcgYmxvY2sncyBjb29yZGluYXRlIHNwYWNlLiBJZiB0aGUgY29udGFp
bmluZyBibG9jayBpcyBmbGlwcGVkCiAgICAgLy8gYWxvbmcgdGhpcyBheGlzLCB0aGVuIHdlIG5l
ZWQgdG8gZmxpcCB0aGUgY29vcmRpbmF0ZS4gIFRoaXMgY2FuIG9ubHkgaGFwcGVuIGlmIHRoZSBj
b250YWluaW5nIGJsb2NrIGlzIGJvdGggYSBmbGlwcGVkIG1vZGUgYW5kIHBlcnBlbmRpY3VsYXIg
dG8gdXMuCisgICAgaWYgKCFvdmVyY29uc3RyYWluZWQpIHsKICAgICBpZiAoKGhhdmVPcnRob2dv
bmFsV3JpdGluZ01vZGVzICYmICFsb2dpY2FsVG9wQW5kQm90dG9tQXJlQXV0byAmJiBjaGlsZC0+
c3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9kZSgpKQogICAgICAgICB8fCAoaGF2ZUZs
aXBwZWRCbG9ja0F4aXMgJiYgIWhhdmVPcnRob2dvbmFsV3JpdGluZ01vZGVzKSkKICAgICAgICAg
bG9naWNhbFRvcFBvcyA9IGNvbnRhaW5lckxvZ2ljYWxIZWlnaHRGb3JQb3NpdGlvbmVkIC0gbG9n
aWNhbEhlaWdodFZhbHVlIC0gbG9naWNhbFRvcFBvczsKKyAgICB9CiAKICAgICAvLyBPdXIgb2Zm
c2V0IGlzIGZyb20gdGhlIGxvZ2ljYWwgYm90dG9tIGVkZ2UgaW4gYSBmbGlwcGVkIGVudmlyb25t
ZW50LCBlLmcuLCByaWdodCBmb3IgdmVydGljYWwtcmwgYW5kIGJvdHRvbSBmb3IgaG9yaXpvbnRh
bC1idC4KICAgICBpZiAoY29udGFpbmVyQmxvY2suc3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0
aW5nTW9kZSgpICYmICFoYXZlT3J0aG9nb25hbFdyaXRpbmdNb2RlcykgewpAQCAtNDM3Nyw2ICs0
MzgyLDE0IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRV
c2luZyhTaXplVHlwZSBoZWlnaHRUeXBlLCBMZW5ndGgKICAgICAgICAgICAgIC8vIE92ZXItY29u
c3RyYWluZWQsIChubyBuZWVkIHNvbHZlIGZvciBib3R0b20pCiAgICAgICAgICAgICBjb21wdXRl
ZFZhbHVlcy5tX21hcmdpbnMubV9iZWZvcmUgPSB2YWx1ZUZvckxlbmd0aChtYXJnaW5CZWZvcmUs
IGNvbnRhaW5lclJlbGF0aXZlTG9naWNhbFdpZHRoKTsKICAgICAgICAgICAgIGNvbXB1dGVkVmFs
dWVzLm1fbWFyZ2lucy5tX2FmdGVyID0gdmFsdWVGb3JMZW5ndGgobWFyZ2luQWZ0ZXIsIGNvbnRh
aW5lclJlbGF0aXZlTG9naWNhbFdpZHRoKTsKKworICAgICAgICAgICAgYm9vbCBpc0xlZnRSaWdo
dE92ZXJjb25zdHJhaW5lZCA9IGlzT3J0aG9nb25hbCgqdGhpcywgY29udGFpbmVyQmxvY2spOwor
ICAgICAgICAgICAgaWYgKGlzTGVmdFJpZ2h0T3ZlcmNvbnN0cmFpbmVkKSB7CisgICAgICAgICAg
ICAgICAgaWYgKGNvbnRhaW5lckJsb2NrLnN0eWxlKCkuZGlyZWN0aW9uKCkgPT0gVGV4dERpcmVj
dGlvbjo6UlRMKQorICAgICAgICAgICAgICAgICAgICBsb2dpY2FsVG9wVmFsdWUgPSAoYXZhaWxh
YmxlU3BhY2UgKyBsb2dpY2FsVG9wVmFsdWUpIC0gY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1f
YmVmb3JlIC0gY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fYWZ0ZXI7CisgICAgICAgICAgICAg
ICAgZWxzZQorICAgICAgICAgICAgICAgICAgICBsb2dpY2FsVG9wVmFsdWUgPSB2YWx1ZUZvckxl
bmd0aChzdHlsZSgpLmxlZnQoKSwgY29udGFpbmVyTG9naWNhbEhlaWdodCk7CisgICAgICAgICAg
ICB9CiAgICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICAvKi0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tKlwKZGlm
ZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpp
bmRleCA1YWE1N2I5MTE4YTZmZDZmYjIyMGMxZjgyM2U1YzE0MDRiZWRkZGE3Li44Y2QyZDhiODBm
M2NjYTc4NmQ2OTIyZmFkMmYwNTZhZGU5YTZhZmE5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9D
aGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIw
MjEtMTEtMDMgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBGaXggYWJz
cG9zLTAyMC5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMzIwMTIKKworICAgICAgICBOZWVkIHRoZSBidWcgVVJMIChPT1BTISkuCisKKyAgICAg
ICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTA5LTIxICBCcmVudCBGdWxnaGFtICA8YmZ1
bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBYU1MgQXVkaXRvcjogUGFydCAyIChS
ZW1vdmUgZW5naW5lIHN1cHBvcnQpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0
YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCBmNWRjYWNkMWUyYTE3
M2VlZGZhYmMwMTY0YmRjZmYxYzdlYTllNDdjLi4wYzE0ZmRkMWU2N2FkOTk0NTI0NDEzYmM2M2Yz
YTNkYzNiYzI3YTAyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisr
KyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTQxMDAsMTQgKzQxMDAsNiBAQCB3
ZWJraXQub3JnL2IvMjMwMDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy10cmFuc2Zvcm1zL3R0d2YtdHJhbgogCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2NlbnRyYWwtYmFzZWxp
bmUtYWxpZ25tZW50LTAwMy54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIFBhc3MgXQogd2Via2l0Lm9y
Zy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGlu
Zy1tb2Rlcy9jbGVhcmFuY2UtY2FsY3VsYXRpb25zLXZybC0wMDIueGh0IFsgSW1hZ2VPbmx5RmFp
bHVyZSBQYXNzIF0KLXdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtaWNiLXZs
ci0wMzMueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA5MDgwIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mt
bm9uLXJlcGxhY2VkLWljYi12cmwtMDMwLnhodCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0
Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3Jp
dGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12bHItMDk1LnhodCBbIEltYWdlT25seUZh
aWx1cmUgXQotd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12bHItMjI1Lnho
dCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBs
YWNlZC12bHItMjI5LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIwOTA4
MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9h
YnMtcG9zLW5vbi1yZXBsYWNlZC12cmwtMDg4LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Vi
a2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
d3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12cmwtMjIwLnhodCBbIEltYWdlT25s
eUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12cmwtMjI0
LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hdmFpbGFibGUtc2l6
ZS0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hdmFpbGFi
bGUtc2l6ZS0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4
MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9h
dmFpbGFibGUtc2l6ZS0wMDMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpAQCAtNDg1Myw3ICs0
ODQ1LDYgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtc2NvcGluZy9zbG90dGVkLXBsYWMKIAogIyAgY29udGFpbi1pbnRyaW5zaWMt
c2l6ZQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDE0Lmh0bWwgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAyMC5odG1sIFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCiAjIGZsZXgtYmFzaXM6Y29udGVudAogd2Via2l0Lm9yZy9iLzIxNDQ2MyBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp
by9mbGV4LWFzcGVjdC1yYXRpby0wMjEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0
Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6
aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjIuaHRtbCBbIEltYWdlT25seUZh
aWx1cmUgXQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>443291</attachid>
            <date>2021-11-04 04:05:02 -0700</date>
            <delta_ts>2021-11-04 04:49:15 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232012-20211104110501.patch</filename>
            <type>text/plain</type>
            <size>13948</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MjU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzk1ZmIyMmFlNjIxMmEw
ZGViNjcyYzU1NWJmNTM0YTA1MzBlMTdlMC4uNzgwMzk5YzlkNmM5NWMxMmVjNzk1MWY2NmRkOGZi
Y2QzYmI4ZDM3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTExLTA0ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFic3Bvcy0wMjAuaHRtbAor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDEyCisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGV4aXN0
aW5nIHdyaXRpbmctbW9kZSBzdXBwb3J0IGZvciBhYnNvbHV0ZWx5IHBvc2l0aW9uZWQgZWxlbWVu
dHMgaGFzIHNvbWUgcHJvYmxlbXMuCisgICAgICAgIEZpcnN0LCBpbiBjb21wdXRlUG9zaXRpb25l
ZExvZ2ljYWxXaWR0aFVzaW5nIHRoZSBvdmVyLWNvbnN0cmFpbmVkIGNhc2UgYWx3YXlzIGNoZWNr
cyBmb3IgUlRMCisgICAgICAgIGRpcmVjdGlvbiwgYnV0IHRoaXMgc2hvdWxkIG5vdCBiZSBkb25l
IGlmIHdlIGFyZSBub3QgZGVhbGluZyB3aXRoIGxlZnQgYW5kIHJpZ2h0IHByb3BlcnRpZXMsCisg
ICAgICAgIGkuZS4gb25seSB3aGVuIHdlIGFyZSBub3Qgb3J0aG9nb25hbCB3aXRoIHRoZSBjb250
YWluZXIuCisgICAgICAgIFNlY29uZCwgaW4gY29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0
VXNpbmcgdGhlIG92ZXItY29uc3RyYWluZWQgY2FzZSBuZXZlciB0b29rIGludG8KKyAgICAgICAg
YWNjb3VudCBSVEwgZGlyZWN0aW9uLCBidXQgdGhpcyBzaG91bGQgYmUgZG9uZSBpZiB3ZSBhcmUg
YWN0dWFsbHkgZGVhbGluZyB3aXRoIGxlZnQvcmlnaHQgcHJvcGVydGllcy4KKyAgICAgICAgRmlu
YWxseSwgY29tcHV0ZUxvZ2ljYWxMZWZ0UG9zaXRpb25lZE9mZnNldC9jb21wdXRlTG9naWNhbFRv
cFBvc2l0aW9uZWRPZmZzZXQgc2hvdWxkIG5vdCBkbyB0aGUKKyAgICAgICAgZmxpcHBpbmcgbG9n
aWMgaW4gdGhlIG92ZXItY29uc3RyYWluZWQgY2FzZS4KKworICAgICAgICAqIHJlbmRlcmluZy9S
ZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29tcHV0ZUxvZ2ljYWxMZWZ0UG9zaXRp
b25lZE9mZnNldCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlv
bmVkTG9naWNhbFdpZHRoVXNpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Y29tcHV0ZUxv
Z2ljYWxUb3BQb3NpdGlvbmVkT2Zmc2V0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6
Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0VXNpbmcgY29uc3QpOgorICAgICAgICAoV2Vi
Q29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxXaWR0aFJlcGxhY2VkIGNv
bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dp
Y2FsSGVpZ2h0UmVwbGFjZWQgY29uc3QpOgorCiAyMDIxLTExLTAzICBBbnRvaW5lIFF1aW50ICA8
Z3Jhb3V0c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIyNjg5MzIpOiBDUFUg
dXNhZ2UgaGlnaGVyIHRoYW4gZXhwZWN0ZWQgd2l0aCBzaWJsaW5nIGVsZW1lbnRzIHJ1bm5pbmcg
V2ViQW5pbWF0aW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl
ckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCBk
NGZjYzNiZDQ2OTgxMTVkNGQ5ZTNmMjc0NjM2NzQyYmRmMzJmMGNjLi40YWFiMzA3YWVhYzE1OGQ3
ZjliNTUzMjhhYWFmMjI1NGI4YzhmMmE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy
Qm94LmNwcApAQCAtMzkzMSwxMyArMzkzMSwxNCBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBv
c2l0aW9uZWRMb2dpY2FsV2lkdGgoTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzJiBjb21wdQog
ICAgIH0KIH0KIAotc3RhdGljIHZvaWQgY29tcHV0ZUxvZ2ljYWxMZWZ0UG9zaXRpb25lZE9mZnNl
dChMYXlvdXRVbml0JiBsb2dpY2FsTGVmdFBvcywgY29uc3QgUmVuZGVyQm94KiBjaGlsZCwgTGF5
b3V0VW5pdCBsb2dpY2FsV2lkdGhWYWx1ZSwgY29uc3QgUmVuZGVyQm94TW9kZWxPYmplY3QmIGNv
bnRhaW5lckJsb2NrLCBMYXlvdXRVbml0IGNvbnRhaW5lckxvZ2ljYWxXaWR0aCkKK3N0YXRpYyB2
b2lkIGNvbXB1dGVMb2dpY2FsTGVmdFBvc2l0aW9uZWRPZmZzZXQoTGF5b3V0VW5pdCYgbG9naWNh
bExlZnRQb3MsIGNvbnN0IFJlbmRlckJveCogY2hpbGQsIExheW91dFVuaXQgbG9naWNhbFdpZHRo
VmFsdWUsIGNvbnN0IFJlbmRlckJveE1vZGVsT2JqZWN0JiBjb250YWluZXJCbG9jaywgTGF5b3V0
VW5pdCBjb250YWluZXJMb2dpY2FsV2lkdGgsIGJvb2wgbG9naWNhbExlZnRJc0F1dG8sIGJvb2wg
bG9naWNhbFJpZ2h0SXNBdXRvKQogewotICAgIGF1dG8gbG9naWNhbExlZnRBbmRSaWdodEFyZUF1
dG8gPSBjaGlsZC0+c3R5bGUoKS5sb2dpY2FsTGVmdCgpLmlzQXV0bygpICYmIGNoaWxkLT5zdHls
ZSgpLmxvZ2ljYWxSaWdodCgpLmlzQXV0bygpOworICAgIGF1dG8gbG9naWNhbExlZnRBbmRSaWdo
dEFyZUF1dG8gPSBsb2dpY2FsTGVmdElzQXV0byAmJiBsb2dpY2FsUmlnaHRJc0F1dG87CisgICAg
Ym9vbCBpc092ZXJjb25zdHJhaW5lZCA9ICFsb2dpY2FsTGVmdElzQXV0byAmJiAhbG9naWNhbFJp
Z2h0SXNBdXRvICYmICFjaGlsZC0+c3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKTsKICAg
ICAvLyBEZWFsIHdpdGggZGlmZmVyaW5nIHdyaXRpbmcgbW9kZXMgaGVyZS4gT3VyIG9mZnNldCBu
ZWVkcyB0byBiZSBpbiB0aGUgY29udGFpbmluZyBibG9jaydzIGNvb3JkaW5hdGUgc3BhY2UuIElm
IHRoZSBjb250YWluaW5nIGJsb2NrIGlzIGZsaXBwZWQKICAgICAvLyBhbG9uZyB0aGlzIGF4aXMs
IHRoZW4gd2UgbmVlZCB0byBmbGlwIHRoZSBjb29yZGluYXRlLiBBdXRvIHBvc2l0aW9uZWQgaXRl
bXMgZG8gbm90IG5lZWQgdGhpcyBjb3JyZWN0aW9uIGFzIGl0IHdhcyBwcm9wZXJseSBoYW5kbGVk
IGluCiAgICAgLy8gY29tcHV0ZUlubGluZVN0YXRpY0Rpc3RhbmNlKCkuCi0gICAgaWYgKGlzT3J0
aG9nb25hbCgqY2hpbGQsIGNvbnRhaW5lckJsb2NrKSAmJiAhbG9naWNhbExlZnRBbmRSaWdodEFy
ZUF1dG8gJiYgY29udGFpbmVyQmxvY2suc3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9k
ZSgpKSB7CisgICAgaWYgKGlzT3J0aG9nb25hbCgqY2hpbGQsIGNvbnRhaW5lckJsb2NrKSAmJiAh
bG9naWNhbExlZnRBbmRSaWdodEFyZUF1dG8gJiYgIWlzT3ZlcmNvbnN0cmFpbmVkICYmIGNvbnRh
aW5lckJsb2NrLnN0eWxlKCkuaXNGbGlwcGVkQmxvY2tzV3JpdGluZ01vZGUoKSkgewogICAgICAg
ICBsb2dpY2FsTGVmdFBvcyA9IGNvbnRhaW5lckxvZ2ljYWxXaWR0aCAtIGxvZ2ljYWxXaWR0aFZh
bHVlIC0gbG9naWNhbExlZnRQb3M7CiAgICAgICAgIGxvZ2ljYWxMZWZ0UG9zICs9IChjaGlsZC0+
aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGNvbnRhaW5lckJsb2NrLmJvcmRlclJpZ2h0KCkg
OiBjb250YWluZXJCbG9jay5ib3JkZXJCb3R0b20oKSk7CiAgICAgfSBlbHNlCkBAIC00MDMxLDcg
KzQwMzIsOCBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsV2lkdGhV
c2luZyhTaXplVHlwZSB3aWR0aFR5cGUsIExlbmd0aCBsbwogCiAgICAgICAgICAgICAvLyBVc2Ug
dGhlIGNvbnRhaW5pbmcgYmxvY2sncyBkaXJlY3Rpb24gcmF0aGVyIHRoYW4gdGhlIHBhcmVudCBi
bG9jaydzCiAgICAgICAgICAgICAvLyBwZXIgQ1NTIDIuMSByZWZlcmVuY2UgdGVzdCBhYnNwb3Mt
bm9uLXJlcGxhY2VkLXdpZHRoLW1hcmdpbi0wMDAuCi0gICAgICAgICAgICBpZiAoY29udGFpbmVy
RGlyZWN0aW9uID09IFRleHREaXJlY3Rpb246OlJUTCkKKyAgICAgICAgICAgIGJvb2wgaXNMZWZ0
UmlnaHRPdmVyY29uc3RyYWluZWQgPSAhaXNPcnRob2dvbmFsKCp0aGlzLCBjb250YWluZXJCbG9j
ayk7CisgICAgICAgICAgICBpZiAoaXNMZWZ0UmlnaHRPdmVyY29uc3RyYWluZWQgJiYgY29udGFp
bmVyRGlyZWN0aW9uID09IFRleHREaXJlY3Rpb246OlJUTCkKICAgICAgICAgICAgICAgICBsb2dp
Y2FsTGVmdFZhbHVlID0gKGF2YWlsYWJsZVNwYWNlICsgbG9naWNhbExlZnRWYWx1ZSkgLSBtYXJn
aW5Mb2dpY2FsTGVmdFZhbHVlIC0gbWFyZ2luTG9naWNhbFJpZ2h0VmFsdWU7CiAgICAgICAgIH0K
ICAgICB9IGVsc2UgewpAQCAtNDEzNSw3ICs0MTM3LDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1
dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoVXNpbmcoU2l6ZVR5cGUgd2lkdGhUeXBlLCBMZW5ndGgg
bG8KICAgICB9CiAKICAgICBjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9uID0gbG9naWNhbExlZnRW
YWx1ZSArIG1hcmdpbkxvZ2ljYWxMZWZ0VmFsdWU7Ci0gICAgY29tcHV0ZUxvZ2ljYWxMZWZ0UG9z
aXRpb25lZE9mZnNldChjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9uLCB0aGlzLCBjb21wdXRlZFZh
bHVlcy5tX2V4dGVudCArIGJvcmRlcnNQbHVzUGFkZGluZywgY29udGFpbmVyQmxvY2ssIGNvbnRh
aW5lckxvZ2ljYWxXaWR0aCk7CisgICAgY29tcHV0ZUxvZ2ljYWxMZWZ0UG9zaXRpb25lZE9mZnNl
dChjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9uLCB0aGlzLCBjb21wdXRlZFZhbHVlcy5tX2V4dGVu
dCArIGJvcmRlcnNQbHVzUGFkZGluZywgY29udGFpbmVyQmxvY2ssIGNvbnRhaW5lckxvZ2ljYWxX
aWR0aCwgbG9naWNhbExlZnRJc0F1dG8sIGxvZ2ljYWxSaWdodElzQXV0byk7CiB9CiAKIHN0YXRp
YyB2b2lkIGNvbXB1dGVCbG9ja1N0YXRpY0Rpc3RhbmNlKExlbmd0aCYgbG9naWNhbFRvcCwgTGVu
Z3RoJiBsb2dpY2FsQm90dG9tLCBjb25zdCBSZW5kZXJCb3gqIGNoaWxkLCBjb25zdCBSZW5kZXJC
b3hNb2RlbE9iamVjdCYgY29udGFpbmVyQmxvY2spCkBAIC00MjgxLDE3ICs0MjgzLDIwIEBAIHZv
aWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHQoTG9naWNhbEV4dGVu
dENvbXB1dGVkVmFsdWVzJiBjb21wCiAvLyBUaGUgfGNvbnRhaW5lckxvZ2ljYWxIZWlnaHRGb3JQ
b3NpdGlvbmVkfCBpcyBhbHJlYWR5IGF3YXJlIG9mIG9ydGhvZ29uYWwgZmxvd3MuCiAvLyBUaGUg
bG9naWNhbFRvcCBjb25jZXB0IGlzIGNvbmZ1c2luZyBoZXJlLiBJdCdzIHRoZSBsb2dpY2FsIHRv
cCBmcm9tIHRoZSBjaGlsZCdzIFBPVi4gVGhpcyBtZWFucyB0aGF0IGlzIHRoZSBwaHlzaWNhbAog
Ly8geSBpZiB0aGUgY2hpbGQgaXMgdmVydGljYWwgb3IgdGhlIHBoeXNpY2FsIHggaWYgdGhlIGNo
aWxkIGlzIGhvcml6b250YWwuCi1zdGF0aWMgdm9pZCBjb21wdXRlTG9naWNhbFRvcFBvc2l0aW9u
ZWRPZmZzZXQoTGF5b3V0VW5pdCYgbG9naWNhbFRvcFBvcywgY29uc3QgUmVuZGVyQm94KiBjaGls
ZCwgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0VmFsdWUsIGNvbnN0IFJlbmRlckJveE1vZGVsT2Jq
ZWN0JiBjb250YWluZXJCbG9jaywgTGF5b3V0VW5pdCBjb250YWluZXJMb2dpY2FsSGVpZ2h0Rm9y
UG9zaXRpb25lZCkKK3N0YXRpYyB2b2lkIGNvbXB1dGVMb2dpY2FsVG9wUG9zaXRpb25lZE9mZnNl
dChMYXlvdXRVbml0JiBsb2dpY2FsVG9wUG9zLCBjb25zdCBSZW5kZXJCb3gqIGNoaWxkLCBMYXlv
dXRVbml0IGxvZ2ljYWxIZWlnaHRWYWx1ZSwgY29uc3QgUmVuZGVyQm94TW9kZWxPYmplY3QmIGNv
bnRhaW5lckJsb2NrLCBMYXlvdXRVbml0IGNvbnRhaW5lckxvZ2ljYWxIZWlnaHRGb3JQb3NpdGlv
bmVkLCBib29sIGxvZ2ljYWxUb3BJc0F1dG8sIGJvb2wgbG9naWNhbEJvdHRvbUlzQXV0bykKIHsK
LSAgICBhdXRvIGxvZ2ljYWxUb3BBbmRCb3R0b21BcmVBdXRvID0gY2hpbGQtPnN0eWxlKCkubG9n
aWNhbFRvcCgpLmlzQXV0bygpICYmIGNoaWxkLT5zdHlsZSgpLmxvZ2ljYWxCb3R0b20oKS5pc0F1
dG8oKTsKKyAgICBhdXRvIGxvZ2ljYWxUb3BBbmRCb3R0b21BcmVBdXRvID0gbG9naWNhbFRvcElz
QXV0byAmJiBsb2dpY2FsQm90dG9tSXNBdXRvOwogICAgIGF1dG8gaGF2ZU9ydGhvZ29uYWxXcml0
aW5nTW9kZXMgPSBpc09ydGhvZ29uYWwoKmNoaWxkLCBjb250YWluZXJCbG9jayk7CiAgICAgYXV0
byBoYXZlRmxpcHBlZEJsb2NrQXhpcyA9IGNoaWxkLT5zdHlsZSgpLmlzRmxpcHBlZEJsb2Nrc1dy
aXRpbmdNb2RlKCkgIT0gY29udGFpbmVyQmxvY2suc3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0
aW5nTW9kZSgpOworICAgIGJvb2wgaXNPdmVyY29uc3RyYWluZWQgPSAhbG9naWNhbFRvcElzQXV0
byAmJiAhbG9naWNhbEJvdHRvbUlzQXV0byAmJiAhY2hpbGQtPnN0eWxlKCkubG9naWNhbEhlaWdo
dCgpLmlzQXV0bygpOwogCiAgICAgLy8gRGVhbCB3aXRoIGRpZmZlcmluZyB3cml0aW5nIG1vZGVz
IGhlcmUuICBPdXIgb2Zmc2V0IG5lZWRzIHRvIGJlIGluIHRoZSBjb250YWluaW5nIGJsb2NrJ3Mg
Y29vcmRpbmF0ZSBzcGFjZS4gSWYgdGhlIGNvbnRhaW5pbmcgYmxvY2sgaXMgZmxpcHBlZAogICAg
IC8vIGFsb25nIHRoaXMgYXhpcywgdGhlbiB3ZSBuZWVkIHRvIGZsaXAgdGhlIGNvb3JkaW5hdGUu
ICBUaGlzIGNhbiBvbmx5IGhhcHBlbiBpZiB0aGUgY29udGFpbmluZyBibG9jayBpcyBib3RoIGEg
ZmxpcHBlZCBtb2RlIGFuZCBwZXJwZW5kaWN1bGFyIHRvIHVzLgotICAgIGlmICgoaGF2ZU9ydGhv
Z29uYWxXcml0aW5nTW9kZXMgJiYgIWxvZ2ljYWxUb3BBbmRCb3R0b21BcmVBdXRvICYmIGNoaWxk
LT5zdHlsZSgpLmlzRmxpcHBlZEJsb2Nrc1dyaXRpbmdNb2RlKCkpCi0gICAgICAgIHx8IChoYXZl
RmxpcHBlZEJsb2NrQXhpcyAmJiAhaGF2ZU9ydGhvZ29uYWxXcml0aW5nTW9kZXMpKQotICAgICAg
ICBsb2dpY2FsVG9wUG9zID0gY29udGFpbmVyTG9naWNhbEhlaWdodEZvclBvc2l0aW9uZWQgLSBs
b2dpY2FsSGVpZ2h0VmFsdWUgLSBsb2dpY2FsVG9wUG9zOworICAgIGlmICghaXNPdmVyY29uc3Ry
YWluZWQpIHsKKyAgICAgICAgaWYgKChoYXZlT3J0aG9nb25hbFdyaXRpbmdNb2RlcyAmJiAhbG9n
aWNhbFRvcEFuZEJvdHRvbUFyZUF1dG8gJiYgY2hpbGQtPnN0eWxlKCkuaXNGbGlwcGVkQmxvY2tz
V3JpdGluZ01vZGUoKSkKKyAgICAgICAgICAgIHx8IChoYXZlRmxpcHBlZEJsb2NrQXhpcyAmJiAh
aGF2ZU9ydGhvZ29uYWxXcml0aW5nTW9kZXMpKQorICAgICAgICAgICAgbG9naWNhbFRvcFBvcyA9
IGNvbnRhaW5lckxvZ2ljYWxIZWlnaHRGb3JQb3NpdGlvbmVkIC0gbG9naWNhbEhlaWdodFZhbHVl
IC0gbG9naWNhbFRvcFBvczsKKyAgICB9CiAKICAgICAvLyBPdXIgb2Zmc2V0IGlzIGZyb20gdGhl
IGxvZ2ljYWwgYm90dG9tIGVkZ2UgaW4gYSBmbGlwcGVkIGVudmlyb25tZW50LCBlLmcuLCByaWdo
dCBmb3IgdmVydGljYWwtcmwgYW5kIGJvdHRvbSBmb3IgaG9yaXpvbnRhbC1idC4KICAgICBpZiAo
Y29udGFpbmVyQmxvY2suc3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9kZSgpICYmICFo
YXZlT3J0aG9nb25hbFdyaXRpbmdNb2RlcykgewpAQCAtNDM4Niw2ICs0MzkxLDE0IEBAIHZvaWQg
UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyhTaXplVHlwZSBo
ZWlnaHRUeXBlLCBMZW5ndGgKICAgICAgICAgICAgIC8vIE92ZXItY29uc3RyYWluZWQsIChubyBu
ZWVkIHNvbHZlIGZvciBib3R0b20pCiAgICAgICAgICAgICBjb21wdXRlZFZhbHVlcy5tX21hcmdp
bnMubV9iZWZvcmUgPSB2YWx1ZUZvckxlbmd0aChtYXJnaW5CZWZvcmUsIGNvbnRhaW5lclJlbGF0
aXZlTG9naWNhbFdpZHRoKTsKICAgICAgICAgICAgIGNvbXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5t
X2FmdGVyID0gdmFsdWVGb3JMZW5ndGgobWFyZ2luQWZ0ZXIsIGNvbnRhaW5lclJlbGF0aXZlTG9n
aWNhbFdpZHRoKTsKKworICAgICAgICAgICAgYm9vbCBpc0xlZnRSaWdodE92ZXJjb25zdHJhaW5l
ZCA9IGlzT3J0aG9nb25hbCgqdGhpcywgY29udGFpbmVyQmxvY2spOworICAgICAgICAgICAgaWYg
KGlzTGVmdFJpZ2h0T3ZlcmNvbnN0cmFpbmVkKSB7CisgICAgICAgICAgICAgICAgaWYgKGNvbnRh
aW5lckJsb2NrLnN0eWxlKCkuZGlyZWN0aW9uKCkgPT0gVGV4dERpcmVjdGlvbjo6UlRMKQorICAg
ICAgICAgICAgICAgICAgICBsb2dpY2FsVG9wVmFsdWUgPSAoYXZhaWxhYmxlU3BhY2UgKyBsb2dp
Y2FsVG9wVmFsdWUpIC0gY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fYmVmb3JlIC0gY29tcHV0
ZWRWYWx1ZXMubV9tYXJnaW5zLm1fYWZ0ZXI7CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAg
ICAgICAgICAgICAgICBsb2dpY2FsVG9wVmFsdWUgPSB2YWx1ZUZvckxlbmd0aChzdHlsZSgpLmxl
ZnQoKSwgY29udGFpbmVyTG9naWNhbEhlaWdodCk7CisgICAgICAgICAgICB9CiAgICAgICAgIH0K
ICAgICB9IGVsc2UgewogICAgICAgICAvKi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tKlwKQEAgLTQ0NDYsNyArNDQ1OSw3
IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyhT
aXplVHlwZSBoZWlnaHRUeXBlLCBMZW5ndGgKIAogICAgIC8vIFVzZSBjb21wdXRlZCB2YWx1ZXMg
dG8gY2FsY3VsYXRlIHRoZSB2ZXJ0aWNhbCBwb3NpdGlvbi4KICAgICBjb21wdXRlZFZhbHVlcy5t
X3Bvc2l0aW9uID0gbG9naWNhbFRvcFZhbHVlICsgY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1f
YmVmb3JlOwotICAgIGNvbXB1dGVMb2dpY2FsVG9wUG9zaXRpb25lZE9mZnNldChjb21wdXRlZFZh
bHVlcy5tX3Bvc2l0aW9uLCB0aGlzLCBsb2dpY2FsSGVpZ2h0VmFsdWUgKyBib3JkZXJzUGx1c1Bh
ZGRpbmcsIGNvbnRhaW5lckJsb2NrLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0KTsKKyAgICBjb21w
dXRlTG9naWNhbFRvcFBvc2l0aW9uZWRPZmZzZXQoY29tcHV0ZWRWYWx1ZXMubV9wb3NpdGlvbiwg
dGhpcywgbG9naWNhbEhlaWdodFZhbHVlICsgYm9yZGVyc1BsdXNQYWRkaW5nLCBjb250YWluZXJC
bG9jaywgY29udGFpbmVyTG9naWNhbEhlaWdodCwgbG9naWNhbFRvcElzQXV0bywgbG9naWNhbEJv
dHRvbUlzQXV0byk7CiB9CiAKIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2lj
YWxXaWR0aFJlcGxhY2VkKExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyYgY29tcHV0ZWRWYWx1
ZXMpIGNvbnN0CkBAIC00NjE1LDcgKzQ2MjgsNyBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBv
c2l0aW9uZWRMb2dpY2FsV2lkdGhSZXBsYWNlZChMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZQog
CiAgICAgTGF5b3V0VW5pdCBsb2dpY2FsTGVmdFBvcyA9IGxvZ2ljYWxMZWZ0VmFsdWUgKyBtYXJn
aW5Mb2dpY2FsTGVmdEFsaWFzOwogICAgIC8vIEJvcmRlciBhbmQgcGFkZGluZyBoYXZlIGFscmVh
ZHkgYmVlbiBpbmNsdWRlZCBpbiBjb21wdXRlZFZhbHVlcy5tX2V4dGVudC4KLSAgICBjb21wdXRl
TG9naWNhbExlZnRQb3NpdGlvbmVkT2Zmc2V0KGxvZ2ljYWxMZWZ0UG9zLCB0aGlzLCBjb21wdXRl
ZFZhbHVlcy5tX2V4dGVudCwgY29udGFpbmVyQmxvY2ssIGNvbnRhaW5lckxvZ2ljYWxXaWR0aCk7
CisgICAgY29tcHV0ZUxvZ2ljYWxMZWZ0UG9zaXRpb25lZE9mZnNldChsb2dpY2FsTGVmdFBvcywg
dGhpcywgY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQsIGNvbnRhaW5lckJsb2NrLCBjb250YWluZXJM
b2dpY2FsV2lkdGgsIGxvZ2ljYWxMZWZ0LmlzQXV0bygpLCBsb2dpY2FsUmlnaHQuaXNBdXRvKCkp
OwogICAgIGNvbXB1dGVkVmFsdWVzLm1fcG9zaXRpb24gPSBsb2dpY2FsTGVmdFBvczsKIH0KIApA
QCAtNDc0NSw3ICs0NzU4LDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9n
aWNhbEhlaWdodFJlcGxhY2VkKExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHUKICAgICAvLyBVc2Ug
Y29tcHV0ZWQgdmFsdWVzIHRvIGNhbGN1bGF0ZSB0aGUgdmVydGljYWwgcG9zaXRpb24uCiAgICAg
TGF5b3V0VW5pdCBsb2dpY2FsVG9wUG9zID0gbG9naWNhbFRvcFZhbHVlICsgbWFyZ2luQmVmb3Jl
QWxpYXM7CiAgICAgLy8gQm9yZGVyIGFuZCBwYWRkaW5nIGhhdmUgYWxyZWFkeSBiZWVuIGluY2x1
ZGVkIGluIGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50LgotICAgIGNvbXB1dGVMb2dpY2FsVG9wUG9z
aXRpb25lZE9mZnNldChsb2dpY2FsVG9wUG9zLCB0aGlzLCBjb21wdXRlZFZhbHVlcy5tX2V4dGVu
dCwgY29udGFpbmVyQmxvY2ssIGNvbnRhaW5lckxvZ2ljYWxIZWlnaHQpOworICAgIGNvbXB1dGVM
b2dpY2FsVG9wUG9zaXRpb25lZE9mZnNldChsb2dpY2FsVG9wUG9zLCB0aGlzLCBjb21wdXRlZFZh
bHVlcy5tX2V4dGVudCwgY29udGFpbmVyQmxvY2ssIGNvbnRhaW5lckxvZ2ljYWxIZWlnaHQsIGxv
Z2ljYWxUb3AuaXNBdXRvKCksIGxvZ2ljYWxCb3R0b20uaXNBdXRvKCkpOwogICAgIGNvbXB1dGVk
VmFsdWVzLm1fcG9zaXRpb24gPSBsb2dpY2FsVG9wUG9zOwogfQogCmRpZmYgLS1naXQgYS9MYXlv
dXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNjU4NTZhMWQz
ZDdmNGJiZTdlZDIxNjk0ZDA4Zjk2YzA3NmU2ZjI4OC4uMzVjMTZlZGU4Yjg1YmQ3NzQyMTExNWRm
MWNhNTJjNmU3NWU1YjA3MyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBi
L0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIxLTExLTA0ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFic3Bvcy0wMjAuaHRtbAor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDEyCisK
KyAgICAgICAgTmVlZCB0aGUgYnVnIFVSTCAoT09QUyEpLgorCisgICAgICAgICogVGVzdEV4cGVj
dGF0aW9uczoKKwogMjAyMS0xMS0wMyAgQW50b2luZSBRdWludCAgPGdyYW91dHNAd2Via2l0Lm9y
Zz4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjY4OTMyKTogQ1BVIHVzYWdlIGhpZ2hlciB0aGFu
IGV4cGVjdGVkIHdpdGggc2libGluZyBlbGVtZW50cyBydW5uaW5nIFdlYkFuaW1hdGlvbnMKZGlm
ZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0
RXhwZWN0YXRpb25zCmluZGV4IDI0NjkyZGVmMzkzZDY0NjNlMTEyYmE3ZGJhYjI1ZmVjZmRiMTgw
NDMuLjEzY2VkNTYzYzNmYjU3NDJjNmVjODQxYTNkNDExNzc3Y2RjMjQ5YjEgMTAwNjQ0Ci0tLSBh
L0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVj
dGF0aW9ucwpAQCAtMzk5NywxNCArMzk5Nyw2IEBAIHdlYmtpdC5vcmcvYi8yMzAwODAgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRyYW5zZm9ybXMvdHR3Zi10cmFuCiAK
IHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXdyaXRpbmctbW9kZXMvY2VudHJhbC1iYXNlbGluZS1hbGlnbm1lbnQtMDAzLnhodCBbIElt
YWdlT25seUZhaWx1cmUgUGFzcyBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2NsZWFyYW5jZS1jYWxjdWxh
dGlvbnMtdnJsLTAwMi54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIFBhc3MgXQotd2Via2l0Lm9yZy9i
LzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1t
b2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC1pY2ItdmxyLTAzMy54aHQgWyBJbWFnZU9ubHlGYWls
dXJlIF0KLXdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtaWNiLXZybC0wMzAu
eGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJl
cGxhY2VkLXZsci0wOTUueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA5
MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVz
L2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZsci0yMjUueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13
ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZsci0yMjkueGh0IFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZybC0w
ODgueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9u
LXJlcGxhY2VkLXZybC0yMjAueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2Iv
MjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1v
ZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZybC0yMjQueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBd
CiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy13cml0aW5nLW1vZGVzL2F2YWlsYWJsZS1zaXplLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFp
bHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2F2YWlsYWJsZS1zaXplLTAwMi5odG1sIFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2F2YWlsYWJsZS1zaXplLTAwMy5odG1sIFsg
SW1hZ2VPbmx5RmFpbHVyZSBdCkBAIC00NTU2LDcgKzQ1NDgsNiBAQCB3ZWJraXQub3JnL2IvMjE0
NDYyIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zY29waW5nL3Nsb3R0
ZWQtcGxhYwogCiAjICBjb250YWluLWludHJpbnNpYy1zaXplCiB3ZWJraXQub3JnL2IvMjE0NDYz
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh
dGlvL2Fic3Bvcy0wMTQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIx
NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj
dC1yYXRpby9hYnNwb3MtMDIwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KICMgZmxleC1iYXNp
czpjb250ZW50CiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNS5o
dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNw
ZWN0LXJhdGlvLTAyNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>443295</attachid>
            <date>2021-11-04 04:49:20 -0700</date>
            <delta_ts>2021-11-04 14:23:11 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232012-20211104114918.patch</filename>
            <type>text/plain</type>
            <size>14040</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MjU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzk1ZmIyMmFlNjIxMmEw
ZGViNjcyYzU1NWJmNTM0YTA1MzBlMTdlMC4uNzgwMzk5YzlkNmM5NWMxMmVjNzk1MWY2NmRkOGZi
Y2QzYmI4ZDM3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTExLTA0ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFic3Bvcy0wMjAuaHRtbAor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDEyCisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGV4aXN0
aW5nIHdyaXRpbmctbW9kZSBzdXBwb3J0IGZvciBhYnNvbHV0ZWx5IHBvc2l0aW9uZWQgZWxlbWVu
dHMgaGFzIHNvbWUgcHJvYmxlbXMuCisgICAgICAgIEZpcnN0LCBpbiBjb21wdXRlUG9zaXRpb25l
ZExvZ2ljYWxXaWR0aFVzaW5nIHRoZSBvdmVyLWNvbnN0cmFpbmVkIGNhc2UgYWx3YXlzIGNoZWNr
cyBmb3IgUlRMCisgICAgICAgIGRpcmVjdGlvbiwgYnV0IHRoaXMgc2hvdWxkIG5vdCBiZSBkb25l
IGlmIHdlIGFyZSBub3QgZGVhbGluZyB3aXRoIGxlZnQgYW5kIHJpZ2h0IHByb3BlcnRpZXMsCisg
ICAgICAgIGkuZS4gb25seSB3aGVuIHdlIGFyZSBub3Qgb3J0aG9nb25hbCB3aXRoIHRoZSBjb250
YWluZXIuCisgICAgICAgIFNlY29uZCwgaW4gY29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0
VXNpbmcgdGhlIG92ZXItY29uc3RyYWluZWQgY2FzZSBuZXZlciB0b29rIGludG8KKyAgICAgICAg
YWNjb3VudCBSVEwgZGlyZWN0aW9uLCBidXQgdGhpcyBzaG91bGQgYmUgZG9uZSBpZiB3ZSBhcmUg
YWN0dWFsbHkgZGVhbGluZyB3aXRoIGxlZnQvcmlnaHQgcHJvcGVydGllcy4KKyAgICAgICAgRmlu
YWxseSwgY29tcHV0ZUxvZ2ljYWxMZWZ0UG9zaXRpb25lZE9mZnNldC9jb21wdXRlTG9naWNhbFRv
cFBvc2l0aW9uZWRPZmZzZXQgc2hvdWxkIG5vdCBkbyB0aGUKKyAgICAgICAgZmxpcHBpbmcgbG9n
aWMgaW4gdGhlIG92ZXItY29uc3RyYWluZWQgY2FzZS4KKworICAgICAgICAqIHJlbmRlcmluZy9S
ZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29tcHV0ZUxvZ2ljYWxMZWZ0UG9zaXRp
b25lZE9mZnNldCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlv
bmVkTG9naWNhbFdpZHRoVXNpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Y29tcHV0ZUxv
Z2ljYWxUb3BQb3NpdGlvbmVkT2Zmc2V0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6
Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0VXNpbmcgY29uc3QpOgorICAgICAgICAoV2Vi
Q29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxXaWR0aFJlcGxhY2VkIGNv
bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dp
Y2FsSGVpZ2h0UmVwbGFjZWQgY29uc3QpOgorCiAyMDIxLTExLTAzICBBbnRvaW5lIFF1aW50ICA8
Z3Jhb3V0c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIyNjg5MzIpOiBDUFUg
dXNhZ2UgaGlnaGVyIHRoYW4gZXhwZWN0ZWQgd2l0aCBzaWJsaW5nIGVsZW1lbnRzIHJ1bm5pbmcg
V2ViQW5pbWF0aW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl
ckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCBk
NGZjYzNiZDQ2OTgxMTVkNGQ5ZTNmMjc0NjM2NzQyYmRmMzJmMGNjLi5lOWIyZGNjM2NjNzVmNGQ3
NGQwZjU1Yjg3ZTRhNzMyZTkwYzk3NDg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy
Qm94LmNwcApAQCAtMzkzMSwxMyArMzkzMSwxNCBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBv
c2l0aW9uZWRMb2dpY2FsV2lkdGgoTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzJiBjb21wdQog
ICAgIH0KIH0KIAotc3RhdGljIHZvaWQgY29tcHV0ZUxvZ2ljYWxMZWZ0UG9zaXRpb25lZE9mZnNl
dChMYXlvdXRVbml0JiBsb2dpY2FsTGVmdFBvcywgY29uc3QgUmVuZGVyQm94KiBjaGlsZCwgTGF5
b3V0VW5pdCBsb2dpY2FsV2lkdGhWYWx1ZSwgY29uc3QgUmVuZGVyQm94TW9kZWxPYmplY3QmIGNv
bnRhaW5lckJsb2NrLCBMYXlvdXRVbml0IGNvbnRhaW5lckxvZ2ljYWxXaWR0aCkKK3N0YXRpYyB2
b2lkIGNvbXB1dGVMb2dpY2FsTGVmdFBvc2l0aW9uZWRPZmZzZXQoTGF5b3V0VW5pdCYgbG9naWNh
bExlZnRQb3MsIGNvbnN0IFJlbmRlckJveCogY2hpbGQsIExheW91dFVuaXQgbG9naWNhbFdpZHRo
VmFsdWUsIGNvbnN0IFJlbmRlckJveE1vZGVsT2JqZWN0JiBjb250YWluZXJCbG9jaywgTGF5b3V0
VW5pdCBjb250YWluZXJMb2dpY2FsV2lkdGgsIGJvb2wgbG9naWNhbExlZnRJc0F1dG8sIGJvb2wg
bG9naWNhbFJpZ2h0SXNBdXRvKQogewotICAgIGF1dG8gbG9naWNhbExlZnRBbmRSaWdodEFyZUF1
dG8gPSBjaGlsZC0+c3R5bGUoKS5sb2dpY2FsTGVmdCgpLmlzQXV0bygpICYmIGNoaWxkLT5zdHls
ZSgpLmxvZ2ljYWxSaWdodCgpLmlzQXV0bygpOworICAgIGF1dG8gbG9naWNhbExlZnRBbmRSaWdo
dEFyZUF1dG8gPSBsb2dpY2FsTGVmdElzQXV0byAmJiBsb2dpY2FsUmlnaHRJc0F1dG87CisgICAg
Ym9vbCBpc092ZXJjb25zdHJhaW5lZCA9ICFsb2dpY2FsTGVmdElzQXV0byAmJiAhbG9naWNhbFJp
Z2h0SXNBdXRvICYmICFjaGlsZC0+c3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKTsKICAg
ICAvLyBEZWFsIHdpdGggZGlmZmVyaW5nIHdyaXRpbmcgbW9kZXMgaGVyZS4gT3VyIG9mZnNldCBu
ZWVkcyB0byBiZSBpbiB0aGUgY29udGFpbmluZyBibG9jaydzIGNvb3JkaW5hdGUgc3BhY2UuIElm
IHRoZSBjb250YWluaW5nIGJsb2NrIGlzIGZsaXBwZWQKICAgICAvLyBhbG9uZyB0aGlzIGF4aXMs
IHRoZW4gd2UgbmVlZCB0byBmbGlwIHRoZSBjb29yZGluYXRlLiBBdXRvIHBvc2l0aW9uZWQgaXRl
bXMgZG8gbm90IG5lZWQgdGhpcyBjb3JyZWN0aW9uIGFzIGl0IHdhcyBwcm9wZXJseSBoYW5kbGVk
IGluCiAgICAgLy8gY29tcHV0ZUlubGluZVN0YXRpY0Rpc3RhbmNlKCkuCi0gICAgaWYgKGlzT3J0
aG9nb25hbCgqY2hpbGQsIGNvbnRhaW5lckJsb2NrKSAmJiAhbG9naWNhbExlZnRBbmRSaWdodEFy
ZUF1dG8gJiYgY29udGFpbmVyQmxvY2suc3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9k
ZSgpKSB7CisgICAgaWYgKGlzT3J0aG9nb25hbCgqY2hpbGQsIGNvbnRhaW5lckJsb2NrKSAmJiAh
bG9naWNhbExlZnRBbmRSaWdodEFyZUF1dG8gJiYgIWlzT3ZlcmNvbnN0cmFpbmVkICYmIGNvbnRh
aW5lckJsb2NrLnN0eWxlKCkuaXNGbGlwcGVkQmxvY2tzV3JpdGluZ01vZGUoKSkgewogICAgICAg
ICBsb2dpY2FsTGVmdFBvcyA9IGNvbnRhaW5lckxvZ2ljYWxXaWR0aCAtIGxvZ2ljYWxXaWR0aFZh
bHVlIC0gbG9naWNhbExlZnRQb3M7CiAgICAgICAgIGxvZ2ljYWxMZWZ0UG9zICs9IChjaGlsZC0+
aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGNvbnRhaW5lckJsb2NrLmJvcmRlclJpZ2h0KCkg
OiBjb250YWluZXJCbG9jay5ib3JkZXJCb3R0b20oKSk7CiAgICAgfSBlbHNlCkBAIC00MDMxLDcg
KzQwMzIsOCBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsV2lkdGhV
c2luZyhTaXplVHlwZSB3aWR0aFR5cGUsIExlbmd0aCBsbwogCiAgICAgICAgICAgICAvLyBVc2Ug
dGhlIGNvbnRhaW5pbmcgYmxvY2sncyBkaXJlY3Rpb24gcmF0aGVyIHRoYW4gdGhlIHBhcmVudCBi
bG9jaydzCiAgICAgICAgICAgICAvLyBwZXIgQ1NTIDIuMSByZWZlcmVuY2UgdGVzdCBhYnNwb3Mt
bm9uLXJlcGxhY2VkLXdpZHRoLW1hcmdpbi0wMDAuCi0gICAgICAgICAgICBpZiAoY29udGFpbmVy
RGlyZWN0aW9uID09IFRleHREaXJlY3Rpb246OlJUTCkKKyAgICAgICAgICAgIGJvb2wgaXNMZWZ0
UmlnaHRPdmVyY29uc3RyYWluZWQgPSAhaXNPcnRob2dvbmFsKCp0aGlzLCBjb250YWluZXJCbG9j
ayk7CisgICAgICAgICAgICBpZiAoaXNMZWZ0UmlnaHRPdmVyY29uc3RyYWluZWQgJiYgY29udGFp
bmVyRGlyZWN0aW9uID09IFRleHREaXJlY3Rpb246OlJUTCkKICAgICAgICAgICAgICAgICBsb2dp
Y2FsTGVmdFZhbHVlID0gKGF2YWlsYWJsZVNwYWNlICsgbG9naWNhbExlZnRWYWx1ZSkgLSBtYXJn
aW5Mb2dpY2FsTGVmdFZhbHVlIC0gbWFyZ2luTG9naWNhbFJpZ2h0VmFsdWU7CiAgICAgICAgIH0K
ICAgICB9IGVsc2UgewpAQCAtNDEzNSw3ICs0MTM3LDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1
dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoVXNpbmcoU2l6ZVR5cGUgd2lkdGhUeXBlLCBMZW5ndGgg
bG8KICAgICB9CiAKICAgICBjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9uID0gbG9naWNhbExlZnRW
YWx1ZSArIG1hcmdpbkxvZ2ljYWxMZWZ0VmFsdWU7Ci0gICAgY29tcHV0ZUxvZ2ljYWxMZWZ0UG9z
aXRpb25lZE9mZnNldChjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9uLCB0aGlzLCBjb21wdXRlZFZh
bHVlcy5tX2V4dGVudCArIGJvcmRlcnNQbHVzUGFkZGluZywgY29udGFpbmVyQmxvY2ssIGNvbnRh
aW5lckxvZ2ljYWxXaWR0aCk7CisgICAgY29tcHV0ZUxvZ2ljYWxMZWZ0UG9zaXRpb25lZE9mZnNl
dChjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9uLCB0aGlzLCBjb21wdXRlZFZhbHVlcy5tX2V4dGVu
dCArIGJvcmRlcnNQbHVzUGFkZGluZywgY29udGFpbmVyQmxvY2ssIGNvbnRhaW5lckxvZ2ljYWxX
aWR0aCwgc3R5bGUoKS5sb2dpY2FsTGVmdCgpLmlzQXV0bygpLCBzdHlsZSgpLmxvZ2ljYWxSaWdo
dCgpLmlzQXV0bygpKTsKIH0KIAogc3RhdGljIHZvaWQgY29tcHV0ZUJsb2NrU3RhdGljRGlzdGFu
Y2UoTGVuZ3RoJiBsb2dpY2FsVG9wLCBMZW5ndGgmIGxvZ2ljYWxCb3R0b20sIGNvbnN0IFJlbmRl
ckJveCogY2hpbGQsIGNvbnN0IFJlbmRlckJveE1vZGVsT2JqZWN0JiBjb250YWluZXJCbG9jaykK
QEAgLTQyODEsMTcgKzQyODMsMjAgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVk
TG9naWNhbEhlaWdodChMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmIGNvbXAKIC8vIFRoZSB8
Y29udGFpbmVyTG9naWNhbEhlaWdodEZvclBvc2l0aW9uZWR8IGlzIGFscmVhZHkgYXdhcmUgb2Yg
b3J0aG9nb25hbCBmbG93cy4KIC8vIFRoZSBsb2dpY2FsVG9wIGNvbmNlcHQgaXMgY29uZnVzaW5n
IGhlcmUuIEl0J3MgdGhlIGxvZ2ljYWwgdG9wIGZyb20gdGhlIGNoaWxkJ3MgUE9WLiBUaGlzIG1l
YW5zIHRoYXQgaXMgdGhlIHBoeXNpY2FsCiAvLyB5IGlmIHRoZSBjaGlsZCBpcyB2ZXJ0aWNhbCBv
ciB0aGUgcGh5c2ljYWwgeCBpZiB0aGUgY2hpbGQgaXMgaG9yaXpvbnRhbC4KLXN0YXRpYyB2b2lk
IGNvbXB1dGVMb2dpY2FsVG9wUG9zaXRpb25lZE9mZnNldChMYXlvdXRVbml0JiBsb2dpY2FsVG9w
UG9zLCBjb25zdCBSZW5kZXJCb3gqIGNoaWxkLCBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHRWYWx1
ZSwgY29uc3QgUmVuZGVyQm94TW9kZWxPYmplY3QmIGNvbnRhaW5lckJsb2NrLCBMYXlvdXRVbml0
IGNvbnRhaW5lckxvZ2ljYWxIZWlnaHRGb3JQb3NpdGlvbmVkKQorc3RhdGljIHZvaWQgY29tcHV0
ZUxvZ2ljYWxUb3BQb3NpdGlvbmVkT2Zmc2V0KExheW91dFVuaXQmIGxvZ2ljYWxUb3BQb3MsIGNv
bnN0IFJlbmRlckJveCogY2hpbGQsIExheW91dFVuaXQgbG9naWNhbEhlaWdodFZhbHVlLCBjb25z
dCBSZW5kZXJCb3hNb2RlbE9iamVjdCYgY29udGFpbmVyQmxvY2ssIExheW91dFVuaXQgY29udGFp
bmVyTG9naWNhbEhlaWdodEZvclBvc2l0aW9uZWQsIGJvb2wgbG9naWNhbFRvcElzQXV0bywgYm9v
bCBsb2dpY2FsQm90dG9tSXNBdXRvKQogewotICAgIGF1dG8gbG9naWNhbFRvcEFuZEJvdHRvbUFy
ZUF1dG8gPSBjaGlsZC0+c3R5bGUoKS5sb2dpY2FsVG9wKCkuaXNBdXRvKCkgJiYgY2hpbGQtPnN0
eWxlKCkubG9naWNhbEJvdHRvbSgpLmlzQXV0bygpOworICAgIGF1dG8gbG9naWNhbFRvcEFuZEJv
dHRvbUFyZUF1dG8gPSBsb2dpY2FsVG9wSXNBdXRvICYmIGxvZ2ljYWxCb3R0b21Jc0F1dG87CiAg
ICAgYXV0byBoYXZlT3J0aG9nb25hbFdyaXRpbmdNb2RlcyA9IGlzT3J0aG9nb25hbCgqY2hpbGQs
IGNvbnRhaW5lckJsb2NrKTsKICAgICBhdXRvIGhhdmVGbGlwcGVkQmxvY2tBeGlzID0gY2hpbGQt
PnN0eWxlKCkuaXNGbGlwcGVkQmxvY2tzV3JpdGluZ01vZGUoKSAhPSBjb250YWluZXJCbG9jay5z
dHlsZSgpLmlzRmxpcHBlZEJsb2Nrc1dyaXRpbmdNb2RlKCk7CisgICAgYm9vbCBpc092ZXJjb25z
dHJhaW5lZCA9ICFsb2dpY2FsVG9wSXNBdXRvICYmICFsb2dpY2FsQm90dG9tSXNBdXRvICYmICFj
aGlsZC0+c3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCkuaXNBdXRvKCk7CiAKICAgICAvLyBEZWFsIHdp
dGggZGlmZmVyaW5nIHdyaXRpbmcgbW9kZXMgaGVyZS4gIE91ciBvZmZzZXQgbmVlZHMgdG8gYmUg
aW4gdGhlIGNvbnRhaW5pbmcgYmxvY2sncyBjb29yZGluYXRlIHNwYWNlLiBJZiB0aGUgY29udGFp
bmluZyBibG9jayBpcyBmbGlwcGVkCiAgICAgLy8gYWxvbmcgdGhpcyBheGlzLCB0aGVuIHdlIG5l
ZWQgdG8gZmxpcCB0aGUgY29vcmRpbmF0ZS4gIFRoaXMgY2FuIG9ubHkgaGFwcGVuIGlmIHRoZSBj
b250YWluaW5nIGJsb2NrIGlzIGJvdGggYSBmbGlwcGVkIG1vZGUgYW5kIHBlcnBlbmRpY3VsYXIg
dG8gdXMuCi0gICAgaWYgKChoYXZlT3J0aG9nb25hbFdyaXRpbmdNb2RlcyAmJiAhbG9naWNhbFRv
cEFuZEJvdHRvbUFyZUF1dG8gJiYgY2hpbGQtPnN0eWxlKCkuaXNGbGlwcGVkQmxvY2tzV3JpdGlu
Z01vZGUoKSkKLSAgICAgICAgfHwgKGhhdmVGbGlwcGVkQmxvY2tBeGlzICYmICFoYXZlT3J0aG9n
b25hbFdyaXRpbmdNb2RlcykpCi0gICAgICAgIGxvZ2ljYWxUb3BQb3MgPSBjb250YWluZXJMb2dp
Y2FsSGVpZ2h0Rm9yUG9zaXRpb25lZCAtIGxvZ2ljYWxIZWlnaHRWYWx1ZSAtIGxvZ2ljYWxUb3BQ
b3M7CisgICAgaWYgKCFpc092ZXJjb25zdHJhaW5lZCkgeworICAgICAgICBpZiAoKGhhdmVPcnRo
b2dvbmFsV3JpdGluZ01vZGVzICYmICFsb2dpY2FsVG9wQW5kQm90dG9tQXJlQXV0byAmJiBjaGls
ZC0+c3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9kZSgpKQorICAgICAgICAgICAgfHwg
KGhhdmVGbGlwcGVkQmxvY2tBeGlzICYmICFoYXZlT3J0aG9nb25hbFdyaXRpbmdNb2RlcykpCisg
ICAgICAgICAgICBsb2dpY2FsVG9wUG9zID0gY29udGFpbmVyTG9naWNhbEhlaWdodEZvclBvc2l0
aW9uZWQgLSBsb2dpY2FsSGVpZ2h0VmFsdWUgLSBsb2dpY2FsVG9wUG9zOworICAgIH0KIAogICAg
IC8vIE91ciBvZmZzZXQgaXMgZnJvbSB0aGUgbG9naWNhbCBib3R0b20gZWRnZSBpbiBhIGZsaXBw
ZWQgZW52aXJvbm1lbnQsIGUuZy4sIHJpZ2h0IGZvciB2ZXJ0aWNhbC1ybCBhbmQgYm90dG9tIGZv
ciBob3Jpem9udGFsLWJ0LgogICAgIGlmIChjb250YWluZXJCbG9jay5zdHlsZSgpLmlzRmxpcHBl
ZEJsb2Nrc1dyaXRpbmdNb2RlKCkgJiYgIWhhdmVPcnRob2dvbmFsV3JpdGluZ01vZGVzKSB7CkBA
IC00Mzg2LDYgKzQzOTEsMTQgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9n
aWNhbEhlaWdodFVzaW5nKFNpemVUeXBlIGhlaWdodFR5cGUsIExlbmd0aAogICAgICAgICAgICAg
Ly8gT3Zlci1jb25zdHJhaW5lZCwgKG5vIG5lZWQgc29sdmUgZm9yIGJvdHRvbSkKICAgICAgICAg
ICAgIGNvbXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5tX2JlZm9yZSA9IHZhbHVlRm9yTGVuZ3RoKG1h
cmdpbkJlZm9yZSwgY29udGFpbmVyUmVsYXRpdmVMb2dpY2FsV2lkdGgpOwogICAgICAgICAgICAg
Y29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fYWZ0ZXIgPSB2YWx1ZUZvckxlbmd0aChtYXJnaW5B
ZnRlciwgY29udGFpbmVyUmVsYXRpdmVMb2dpY2FsV2lkdGgpOworCisgICAgICAgICAgICBib29s
IGlzTGVmdFJpZ2h0T3ZlcmNvbnN0cmFpbmVkID0gaXNPcnRob2dvbmFsKCp0aGlzLCBjb250YWlu
ZXJCbG9jayk7CisgICAgICAgICAgICBpZiAoaXNMZWZ0UmlnaHRPdmVyY29uc3RyYWluZWQpIHsK
KyAgICAgICAgICAgICAgICBpZiAoY29udGFpbmVyQmxvY2suc3R5bGUoKS5kaXJlY3Rpb24oKSA9
PSBUZXh0RGlyZWN0aW9uOjpSVEwpCisgICAgICAgICAgICAgICAgICAgIGxvZ2ljYWxUb3BWYWx1
ZSA9IChhdmFpbGFibGVTcGFjZSArIGxvZ2ljYWxUb3BWYWx1ZSkgLSBjb21wdXRlZFZhbHVlcy5t
X21hcmdpbnMubV9iZWZvcmUgLSBjb21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9hZnRlcjsKKyAg
ICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgIGxvZ2ljYWxUb3BWYWx1ZSA9
IHZhbHVlRm9yTGVuZ3RoKHN0eWxlKCkubGVmdCgpLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0KTsK
KyAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0gZWxzZSB7CiAgICAgICAgIC8qLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0qXApAQCAtNDQ0Niw3ICs0NDU5LDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3Np
dGlvbmVkTG9naWNhbEhlaWdodFVzaW5nKFNpemVUeXBlIGhlaWdodFR5cGUsIExlbmd0aAogCiAg
ICAgLy8gVXNlIGNvbXB1dGVkIHZhbHVlcyB0byBjYWxjdWxhdGUgdGhlIHZlcnRpY2FsIHBvc2l0
aW9uLgogICAgIGNvbXB1dGVkVmFsdWVzLm1fcG9zaXRpb24gPSBsb2dpY2FsVG9wVmFsdWUgKyBj
b21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9iZWZvcmU7Ci0gICAgY29tcHV0ZUxvZ2ljYWxUb3BQ
b3NpdGlvbmVkT2Zmc2V0KGNvbXB1dGVkVmFsdWVzLm1fcG9zaXRpb24sIHRoaXMsIGxvZ2ljYWxI
ZWlnaHRWYWx1ZSArIGJvcmRlcnNQbHVzUGFkZGluZywgY29udGFpbmVyQmxvY2ssIGNvbnRhaW5l
ckxvZ2ljYWxIZWlnaHQpOworICAgIGNvbXB1dGVMb2dpY2FsVG9wUG9zaXRpb25lZE9mZnNldChj
b21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9uLCB0aGlzLCBsb2dpY2FsSGVpZ2h0VmFsdWUgKyBib3Jk
ZXJzUGx1c1BhZGRpbmcsIGNvbnRhaW5lckJsb2NrLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0LCBz
dHlsZSgpLmxvZ2ljYWxUb3AoKS5pc0F1dG8oKSwgc3R5bGUoKS5sb2dpY2FsQm90dG9tKCkuaXNB
dXRvKCkpOwogfQogCiB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsV2lk
dGhSZXBsYWNlZChMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmIGNvbXB1dGVkVmFsdWVzKSBj
b25zdApAQCAtNDYxNSw3ICs0NjI4LDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlv
bmVkTG9naWNhbFdpZHRoUmVwbGFjZWQoTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWUKIAogICAg
IExheW91dFVuaXQgbG9naWNhbExlZnRQb3MgPSBsb2dpY2FsTGVmdFZhbHVlICsgbWFyZ2luTG9n
aWNhbExlZnRBbGlhczsKICAgICAvLyBCb3JkZXIgYW5kIHBhZGRpbmcgaGF2ZSBhbHJlYWR5IGJl
ZW4gaW5jbHVkZWQgaW4gY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQuCi0gICAgY29tcHV0ZUxvZ2lj
YWxMZWZ0UG9zaXRpb25lZE9mZnNldChsb2dpY2FsTGVmdFBvcywgdGhpcywgY29tcHV0ZWRWYWx1
ZXMubV9leHRlbnQsIGNvbnRhaW5lckJsb2NrLCBjb250YWluZXJMb2dpY2FsV2lkdGgpOworICAg
IGNvbXB1dGVMb2dpY2FsTGVmdFBvc2l0aW9uZWRPZmZzZXQobG9naWNhbExlZnRQb3MsIHRoaXMs
IGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50LCBjb250YWluZXJCbG9jaywgY29udGFpbmVyTG9naWNh
bFdpZHRoLCBzdHlsZSgpLmxvZ2ljYWxMZWZ0KCkuaXNBdXRvKCksIHN0eWxlKCkubG9naWNhbFJp
Z2h0KCkuaXNBdXRvKCkpOwogICAgIGNvbXB1dGVkVmFsdWVzLm1fcG9zaXRpb24gPSBsb2dpY2Fs
TGVmdFBvczsKIH0KIApAQCAtNDc0NSw3ICs0NzU4LDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1
dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFJlcGxhY2VkKExvZ2ljYWxFeHRlbnRDb21wdXRlZFZh
bHUKICAgICAvLyBVc2UgY29tcHV0ZWQgdmFsdWVzIHRvIGNhbGN1bGF0ZSB0aGUgdmVydGljYWwg
cG9zaXRpb24uCiAgICAgTGF5b3V0VW5pdCBsb2dpY2FsVG9wUG9zID0gbG9naWNhbFRvcFZhbHVl
ICsgbWFyZ2luQmVmb3JlQWxpYXM7CiAgICAgLy8gQm9yZGVyIGFuZCBwYWRkaW5nIGhhdmUgYWxy
ZWFkeSBiZWVuIGluY2x1ZGVkIGluIGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50LgotICAgIGNvbXB1
dGVMb2dpY2FsVG9wUG9zaXRpb25lZE9mZnNldChsb2dpY2FsVG9wUG9zLCB0aGlzLCBjb21wdXRl
ZFZhbHVlcy5tX2V4dGVudCwgY29udGFpbmVyQmxvY2ssIGNvbnRhaW5lckxvZ2ljYWxIZWlnaHQp
OworICAgIGNvbXB1dGVMb2dpY2FsVG9wUG9zaXRpb25lZE9mZnNldChsb2dpY2FsVG9wUG9zLCB0
aGlzLCBjb21wdXRlZFZhbHVlcy5tX2V4dGVudCwgY29udGFpbmVyQmxvY2ssIGNvbnRhaW5lckxv
Z2ljYWxIZWlnaHQsIHN0eWxlKCkubG9naWNhbFRvcCgpLmlzQXV0bygpLCBzdHlsZSgpLmxvZ2lj
YWxCb3R0b20oKS5pc0F1dG8oKSk7CiAgICAgY29tcHV0ZWRWYWx1ZXMubV9wb3NpdGlvbiA9IGxv
Z2ljYWxUb3BQb3M7CiB9CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xh
eW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2NTg1NmExZDNkN2Y0YmJlN2VkMjE2OTRkMDhmOTZj
MDc2ZTZmMjg4Li4zNWMxNmVkZThiODViZDc3NDIxMTE1ZGYxY2E1MmM2ZTc1ZTViMDczIDEwMDY0
NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n
CkBAIC0xLDMgKzEsMTIgQEAKKzIwMjEtMTEtMDQgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNv
bT4KKworICAgICAgICBGaXggYWJzcG9zLTAyMC5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53
ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIwMTIKKworICAgICAgICBOZWVkIHRoZSBidWcg
VVJMIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTExLTAz
ICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJFR1JFU1NJ
T04gKHIyNjg5MzIpOiBDUFUgdXNhZ2UgaGlnaGVyIHRoYW4gZXhwZWN0ZWQgd2l0aCBzaWJsaW5n
IGVsZW1lbnRzIHJ1bm5pbmcgV2ViQW5pbWF0aW9ucwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv
VGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggMjQ2
OTJkZWYzOTNkNjQ2M2UxMTJiYTdkYmFiMjVmZWNmZGIxODA0My4uMTNjZWQ1NjNjM2ZiNTc0MmM2
ZWM4NDFhM2Q0MTE3NzdjZGMyNDliMSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVj
dGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC0zOTk3LDE0ICsz
OTk3LDYgQEAgd2Via2l0Lm9yZy9iLzIzMDA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3MtdHJhbnNmb3Jtcy90dHdmLXRyYW4KIAogd2Via2l0Lm9yZy9iLzIwOTA4MCBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9jZW50
cmFsLWJhc2VsaW5lLWFsaWdubWVudC0wMDMueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBQYXNzIF0K
IHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXdyaXRpbmctbW9kZXMvY2xlYXJhbmNlLWNhbGN1bGF0aW9ucy12cmwtMDAyLnhodCBbIElt
YWdlT25seUZhaWx1cmUgUGFzcyBdCi13ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxh
Y2VkLWljYi12bHItMDMzLnhodCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIw
OTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rl
cy9hYnMtcG9zLW5vbi1yZXBsYWNlZC1pY2ItdnJsLTAzMC54aHQgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KLXdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdmxyLTA5NS54aHQgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQt
dmxyLTIyNS54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMDkwODAgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBv
cy1ub24tcmVwbGFjZWQtdmxyLTIyOS54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5v
cmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRp
bmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdnJsLTA4OC54aHQgWyBJbWFnZU9ubHlGYWls
dXJlIF0KLXdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdnJsLTIyMC54aHQg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFj
ZWQtdnJsLTIyNC54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAg
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYXZh
aWxhYmxlLXNpemUtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8y
MDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9k
ZXMvYXZhaWxhYmxlLXNpemUtMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5v
cmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRp
bmctbW9kZXMvYXZhaWxhYmxlLXNpemUtMDAzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KQEAg
LTQ1NTYsNyArNDU0OCw2IEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2xvdHRlZC1wbGFjCiAKICMgIGNvbnRhaW4t
aW50cmluc2ljLXNpemUKIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAxNC5odG1sIFsg
SW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMjAuaHRt
bCBbIEltYWdlT25seUZhaWx1cmUgXQogIyBmbGV4LWJhc2lzOmNvbnRlbnQKIHdlYmtpdC5vcmcv
Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h
c3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>443339</attachid>
            <date>2021-11-04 14:23:16 -0700</date>
            <delta_ts>2021-11-16 08:43:01 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232012-20211104212314.patch</filename>
            <type>text/plain</type>
            <size>16871</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MjU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzk1ZmIyMmFlNjIxMmEw
ZGViNjcyYzU1NWJmNTM0YTA1MzBlMTdlMC4uNzgwMzk5YzlkNmM5NWMxMmVjNzk1MWY2NmRkOGZi
Y2QzYmI4ZDM3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTExLTA0ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFic3Bvcy0wMjAuaHRtbAor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyMDEyCisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGV4aXN0
aW5nIHdyaXRpbmctbW9kZSBzdXBwb3J0IGZvciBhYnNvbHV0ZWx5IHBvc2l0aW9uZWQgZWxlbWVu
dHMgaGFzIHNvbWUgcHJvYmxlbXMuCisgICAgICAgIEZpcnN0LCBpbiBjb21wdXRlUG9zaXRpb25l
ZExvZ2ljYWxXaWR0aFVzaW5nIHRoZSBvdmVyLWNvbnN0cmFpbmVkIGNhc2UgYWx3YXlzIGNoZWNr
cyBmb3IgUlRMCisgICAgICAgIGRpcmVjdGlvbiwgYnV0IHRoaXMgc2hvdWxkIG5vdCBiZSBkb25l
IGlmIHdlIGFyZSBub3QgZGVhbGluZyB3aXRoIGxlZnQgYW5kIHJpZ2h0IHByb3BlcnRpZXMsCisg
ICAgICAgIGkuZS4gb25seSB3aGVuIHdlIGFyZSBub3Qgb3J0aG9nb25hbCB3aXRoIHRoZSBjb250
YWluZXIuCisgICAgICAgIFNlY29uZCwgaW4gY29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0
VXNpbmcgdGhlIG92ZXItY29uc3RyYWluZWQgY2FzZSBuZXZlciB0b29rIGludG8KKyAgICAgICAg
YWNjb3VudCBSVEwgZGlyZWN0aW9uLCBidXQgdGhpcyBzaG91bGQgYmUgZG9uZSBpZiB3ZSBhcmUg
YWN0dWFsbHkgZGVhbGluZyB3aXRoIGxlZnQvcmlnaHQgcHJvcGVydGllcy4KKyAgICAgICAgRmlu
YWxseSwgY29tcHV0ZUxvZ2ljYWxMZWZ0UG9zaXRpb25lZE9mZnNldC9jb21wdXRlTG9naWNhbFRv
cFBvc2l0aW9uZWRPZmZzZXQgc2hvdWxkIG5vdCBkbyB0aGUKKyAgICAgICAgZmxpcHBpbmcgbG9n
aWMgaW4gdGhlIG92ZXItY29uc3RyYWluZWQgY2FzZS4KKworICAgICAgICAqIHJlbmRlcmluZy9S
ZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29tcHV0ZUxvZ2ljYWxMZWZ0UG9zaXRp
b25lZE9mZnNldCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlv
bmVkTG9naWNhbFdpZHRoVXNpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Y29tcHV0ZUxv
Z2ljYWxUb3BQb3NpdGlvbmVkT2Zmc2V0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6
Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0VXNpbmcgY29uc3QpOgorICAgICAgICAoV2Vi
Q29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxXaWR0aFJlcGxhY2VkIGNv
bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dp
Y2FsSGVpZ2h0UmVwbGFjZWQgY29uc3QpOgorCiAyMDIxLTExLTAzICBBbnRvaW5lIFF1aW50ICA8
Z3Jhb3V0c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIyNjg5MzIpOiBDUFUg
dXNhZ2UgaGlnaGVyIHRoYW4gZXhwZWN0ZWQgd2l0aCBzaWJsaW5nIGVsZW1lbnRzIHJ1bm5pbmcg
V2ViQW5pbWF0aW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl
ckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCBk
NGZjYzNiZDQ2OTgxMTVkNGQ5ZTNmMjc0NjM2NzQyYmRmMzJmMGNjLi5lOWIyZGNjM2NjNzVmNGQ3
NGQwZjU1Yjg3ZTRhNzMyZTkwYzk3NDg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy
Qm94LmNwcApAQCAtMzkzMSwxMyArMzkzMSwxNCBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBv
c2l0aW9uZWRMb2dpY2FsV2lkdGgoTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzJiBjb21wdQog
ICAgIH0KIH0KIAotc3RhdGljIHZvaWQgY29tcHV0ZUxvZ2ljYWxMZWZ0UG9zaXRpb25lZE9mZnNl
dChMYXlvdXRVbml0JiBsb2dpY2FsTGVmdFBvcywgY29uc3QgUmVuZGVyQm94KiBjaGlsZCwgTGF5
b3V0VW5pdCBsb2dpY2FsV2lkdGhWYWx1ZSwgY29uc3QgUmVuZGVyQm94TW9kZWxPYmplY3QmIGNv
bnRhaW5lckJsb2NrLCBMYXlvdXRVbml0IGNvbnRhaW5lckxvZ2ljYWxXaWR0aCkKK3N0YXRpYyB2
b2lkIGNvbXB1dGVMb2dpY2FsTGVmdFBvc2l0aW9uZWRPZmZzZXQoTGF5b3V0VW5pdCYgbG9naWNh
bExlZnRQb3MsIGNvbnN0IFJlbmRlckJveCogY2hpbGQsIExheW91dFVuaXQgbG9naWNhbFdpZHRo
VmFsdWUsIGNvbnN0IFJlbmRlckJveE1vZGVsT2JqZWN0JiBjb250YWluZXJCbG9jaywgTGF5b3V0
VW5pdCBjb250YWluZXJMb2dpY2FsV2lkdGgsIGJvb2wgbG9naWNhbExlZnRJc0F1dG8sIGJvb2wg
bG9naWNhbFJpZ2h0SXNBdXRvKQogewotICAgIGF1dG8gbG9naWNhbExlZnRBbmRSaWdodEFyZUF1
dG8gPSBjaGlsZC0+c3R5bGUoKS5sb2dpY2FsTGVmdCgpLmlzQXV0bygpICYmIGNoaWxkLT5zdHls
ZSgpLmxvZ2ljYWxSaWdodCgpLmlzQXV0bygpOworICAgIGF1dG8gbG9naWNhbExlZnRBbmRSaWdo
dEFyZUF1dG8gPSBsb2dpY2FsTGVmdElzQXV0byAmJiBsb2dpY2FsUmlnaHRJc0F1dG87CisgICAg
Ym9vbCBpc092ZXJjb25zdHJhaW5lZCA9ICFsb2dpY2FsTGVmdElzQXV0byAmJiAhbG9naWNhbFJp
Z2h0SXNBdXRvICYmICFjaGlsZC0+c3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKTsKICAg
ICAvLyBEZWFsIHdpdGggZGlmZmVyaW5nIHdyaXRpbmcgbW9kZXMgaGVyZS4gT3VyIG9mZnNldCBu
ZWVkcyB0byBiZSBpbiB0aGUgY29udGFpbmluZyBibG9jaydzIGNvb3JkaW5hdGUgc3BhY2UuIElm
IHRoZSBjb250YWluaW5nIGJsb2NrIGlzIGZsaXBwZWQKICAgICAvLyBhbG9uZyB0aGlzIGF4aXMs
IHRoZW4gd2UgbmVlZCB0byBmbGlwIHRoZSBjb29yZGluYXRlLiBBdXRvIHBvc2l0aW9uZWQgaXRl
bXMgZG8gbm90IG5lZWQgdGhpcyBjb3JyZWN0aW9uIGFzIGl0IHdhcyBwcm9wZXJseSBoYW5kbGVk
IGluCiAgICAgLy8gY29tcHV0ZUlubGluZVN0YXRpY0Rpc3RhbmNlKCkuCi0gICAgaWYgKGlzT3J0
aG9nb25hbCgqY2hpbGQsIGNvbnRhaW5lckJsb2NrKSAmJiAhbG9naWNhbExlZnRBbmRSaWdodEFy
ZUF1dG8gJiYgY29udGFpbmVyQmxvY2suc3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9k
ZSgpKSB7CisgICAgaWYgKGlzT3J0aG9nb25hbCgqY2hpbGQsIGNvbnRhaW5lckJsb2NrKSAmJiAh
bG9naWNhbExlZnRBbmRSaWdodEFyZUF1dG8gJiYgIWlzT3ZlcmNvbnN0cmFpbmVkICYmIGNvbnRh
aW5lckJsb2NrLnN0eWxlKCkuaXNGbGlwcGVkQmxvY2tzV3JpdGluZ01vZGUoKSkgewogICAgICAg
ICBsb2dpY2FsTGVmdFBvcyA9IGNvbnRhaW5lckxvZ2ljYWxXaWR0aCAtIGxvZ2ljYWxXaWR0aFZh
bHVlIC0gbG9naWNhbExlZnRQb3M7CiAgICAgICAgIGxvZ2ljYWxMZWZ0UG9zICs9IChjaGlsZC0+
aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGNvbnRhaW5lckJsb2NrLmJvcmRlclJpZ2h0KCkg
OiBjb250YWluZXJCbG9jay5ib3JkZXJCb3R0b20oKSk7CiAgICAgfSBlbHNlCkBAIC00MDMxLDcg
KzQwMzIsOCBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsV2lkdGhV
c2luZyhTaXplVHlwZSB3aWR0aFR5cGUsIExlbmd0aCBsbwogCiAgICAgICAgICAgICAvLyBVc2Ug
dGhlIGNvbnRhaW5pbmcgYmxvY2sncyBkaXJlY3Rpb24gcmF0aGVyIHRoYW4gdGhlIHBhcmVudCBi
bG9jaydzCiAgICAgICAgICAgICAvLyBwZXIgQ1NTIDIuMSByZWZlcmVuY2UgdGVzdCBhYnNwb3Mt
bm9uLXJlcGxhY2VkLXdpZHRoLW1hcmdpbi0wMDAuCi0gICAgICAgICAgICBpZiAoY29udGFpbmVy
RGlyZWN0aW9uID09IFRleHREaXJlY3Rpb246OlJUTCkKKyAgICAgICAgICAgIGJvb2wgaXNMZWZ0
UmlnaHRPdmVyY29uc3RyYWluZWQgPSAhaXNPcnRob2dvbmFsKCp0aGlzLCBjb250YWluZXJCbG9j
ayk7CisgICAgICAgICAgICBpZiAoaXNMZWZ0UmlnaHRPdmVyY29uc3RyYWluZWQgJiYgY29udGFp
bmVyRGlyZWN0aW9uID09IFRleHREaXJlY3Rpb246OlJUTCkKICAgICAgICAgICAgICAgICBsb2dp
Y2FsTGVmdFZhbHVlID0gKGF2YWlsYWJsZVNwYWNlICsgbG9naWNhbExlZnRWYWx1ZSkgLSBtYXJn
aW5Mb2dpY2FsTGVmdFZhbHVlIC0gbWFyZ2luTG9naWNhbFJpZ2h0VmFsdWU7CiAgICAgICAgIH0K
ICAgICB9IGVsc2UgewpAQCAtNDEzNSw3ICs0MTM3LDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1
dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoVXNpbmcoU2l6ZVR5cGUgd2lkdGhUeXBlLCBMZW5ndGgg
bG8KICAgICB9CiAKICAgICBjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9uID0gbG9naWNhbExlZnRW
YWx1ZSArIG1hcmdpbkxvZ2ljYWxMZWZ0VmFsdWU7Ci0gICAgY29tcHV0ZUxvZ2ljYWxMZWZ0UG9z
aXRpb25lZE9mZnNldChjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9uLCB0aGlzLCBjb21wdXRlZFZh
bHVlcy5tX2V4dGVudCArIGJvcmRlcnNQbHVzUGFkZGluZywgY29udGFpbmVyQmxvY2ssIGNvbnRh
aW5lckxvZ2ljYWxXaWR0aCk7CisgICAgY29tcHV0ZUxvZ2ljYWxMZWZ0UG9zaXRpb25lZE9mZnNl
dChjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9uLCB0aGlzLCBjb21wdXRlZFZhbHVlcy5tX2V4dGVu
dCArIGJvcmRlcnNQbHVzUGFkZGluZywgY29udGFpbmVyQmxvY2ssIGNvbnRhaW5lckxvZ2ljYWxX
aWR0aCwgc3R5bGUoKS5sb2dpY2FsTGVmdCgpLmlzQXV0bygpLCBzdHlsZSgpLmxvZ2ljYWxSaWdo
dCgpLmlzQXV0bygpKTsKIH0KIAogc3RhdGljIHZvaWQgY29tcHV0ZUJsb2NrU3RhdGljRGlzdGFu
Y2UoTGVuZ3RoJiBsb2dpY2FsVG9wLCBMZW5ndGgmIGxvZ2ljYWxCb3R0b20sIGNvbnN0IFJlbmRl
ckJveCogY2hpbGQsIGNvbnN0IFJlbmRlckJveE1vZGVsT2JqZWN0JiBjb250YWluZXJCbG9jaykK
QEAgLTQyODEsMTcgKzQyODMsMjAgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVk
TG9naWNhbEhlaWdodChMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmIGNvbXAKIC8vIFRoZSB8
Y29udGFpbmVyTG9naWNhbEhlaWdodEZvclBvc2l0aW9uZWR8IGlzIGFscmVhZHkgYXdhcmUgb2Yg
b3J0aG9nb25hbCBmbG93cy4KIC8vIFRoZSBsb2dpY2FsVG9wIGNvbmNlcHQgaXMgY29uZnVzaW5n
IGhlcmUuIEl0J3MgdGhlIGxvZ2ljYWwgdG9wIGZyb20gdGhlIGNoaWxkJ3MgUE9WLiBUaGlzIG1l
YW5zIHRoYXQgaXMgdGhlIHBoeXNpY2FsCiAvLyB5IGlmIHRoZSBjaGlsZCBpcyB2ZXJ0aWNhbCBv
ciB0aGUgcGh5c2ljYWwgeCBpZiB0aGUgY2hpbGQgaXMgaG9yaXpvbnRhbC4KLXN0YXRpYyB2b2lk
IGNvbXB1dGVMb2dpY2FsVG9wUG9zaXRpb25lZE9mZnNldChMYXlvdXRVbml0JiBsb2dpY2FsVG9w
UG9zLCBjb25zdCBSZW5kZXJCb3gqIGNoaWxkLCBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHRWYWx1
ZSwgY29uc3QgUmVuZGVyQm94TW9kZWxPYmplY3QmIGNvbnRhaW5lckJsb2NrLCBMYXlvdXRVbml0
IGNvbnRhaW5lckxvZ2ljYWxIZWlnaHRGb3JQb3NpdGlvbmVkKQorc3RhdGljIHZvaWQgY29tcHV0
ZUxvZ2ljYWxUb3BQb3NpdGlvbmVkT2Zmc2V0KExheW91dFVuaXQmIGxvZ2ljYWxUb3BQb3MsIGNv
bnN0IFJlbmRlckJveCogY2hpbGQsIExheW91dFVuaXQgbG9naWNhbEhlaWdodFZhbHVlLCBjb25z
dCBSZW5kZXJCb3hNb2RlbE9iamVjdCYgY29udGFpbmVyQmxvY2ssIExheW91dFVuaXQgY29udGFp
bmVyTG9naWNhbEhlaWdodEZvclBvc2l0aW9uZWQsIGJvb2wgbG9naWNhbFRvcElzQXV0bywgYm9v
bCBsb2dpY2FsQm90dG9tSXNBdXRvKQogewotICAgIGF1dG8gbG9naWNhbFRvcEFuZEJvdHRvbUFy
ZUF1dG8gPSBjaGlsZC0+c3R5bGUoKS5sb2dpY2FsVG9wKCkuaXNBdXRvKCkgJiYgY2hpbGQtPnN0
eWxlKCkubG9naWNhbEJvdHRvbSgpLmlzQXV0bygpOworICAgIGF1dG8gbG9naWNhbFRvcEFuZEJv
dHRvbUFyZUF1dG8gPSBsb2dpY2FsVG9wSXNBdXRvICYmIGxvZ2ljYWxCb3R0b21Jc0F1dG87CiAg
ICAgYXV0byBoYXZlT3J0aG9nb25hbFdyaXRpbmdNb2RlcyA9IGlzT3J0aG9nb25hbCgqY2hpbGQs
IGNvbnRhaW5lckJsb2NrKTsKICAgICBhdXRvIGhhdmVGbGlwcGVkQmxvY2tBeGlzID0gY2hpbGQt
PnN0eWxlKCkuaXNGbGlwcGVkQmxvY2tzV3JpdGluZ01vZGUoKSAhPSBjb250YWluZXJCbG9jay5z
dHlsZSgpLmlzRmxpcHBlZEJsb2Nrc1dyaXRpbmdNb2RlKCk7CisgICAgYm9vbCBpc092ZXJjb25z
dHJhaW5lZCA9ICFsb2dpY2FsVG9wSXNBdXRvICYmICFsb2dpY2FsQm90dG9tSXNBdXRvICYmICFj
aGlsZC0+c3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCkuaXNBdXRvKCk7CiAKICAgICAvLyBEZWFsIHdp
dGggZGlmZmVyaW5nIHdyaXRpbmcgbW9kZXMgaGVyZS4gIE91ciBvZmZzZXQgbmVlZHMgdG8gYmUg
aW4gdGhlIGNvbnRhaW5pbmcgYmxvY2sncyBjb29yZGluYXRlIHNwYWNlLiBJZiB0aGUgY29udGFp
bmluZyBibG9jayBpcyBmbGlwcGVkCiAgICAgLy8gYWxvbmcgdGhpcyBheGlzLCB0aGVuIHdlIG5l
ZWQgdG8gZmxpcCB0aGUgY29vcmRpbmF0ZS4gIFRoaXMgY2FuIG9ubHkgaGFwcGVuIGlmIHRoZSBj
b250YWluaW5nIGJsb2NrIGlzIGJvdGggYSBmbGlwcGVkIG1vZGUgYW5kIHBlcnBlbmRpY3VsYXIg
dG8gdXMuCi0gICAgaWYgKChoYXZlT3J0aG9nb25hbFdyaXRpbmdNb2RlcyAmJiAhbG9naWNhbFRv
cEFuZEJvdHRvbUFyZUF1dG8gJiYgY2hpbGQtPnN0eWxlKCkuaXNGbGlwcGVkQmxvY2tzV3JpdGlu
Z01vZGUoKSkKLSAgICAgICAgfHwgKGhhdmVGbGlwcGVkQmxvY2tBeGlzICYmICFoYXZlT3J0aG9n
b25hbFdyaXRpbmdNb2RlcykpCi0gICAgICAgIGxvZ2ljYWxUb3BQb3MgPSBjb250YWluZXJMb2dp
Y2FsSGVpZ2h0Rm9yUG9zaXRpb25lZCAtIGxvZ2ljYWxIZWlnaHRWYWx1ZSAtIGxvZ2ljYWxUb3BQ
b3M7CisgICAgaWYgKCFpc092ZXJjb25zdHJhaW5lZCkgeworICAgICAgICBpZiAoKGhhdmVPcnRo
b2dvbmFsV3JpdGluZ01vZGVzICYmICFsb2dpY2FsVG9wQW5kQm90dG9tQXJlQXV0byAmJiBjaGls
ZC0+c3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9kZSgpKQorICAgICAgICAgICAgfHwg
KGhhdmVGbGlwcGVkQmxvY2tBeGlzICYmICFoYXZlT3J0aG9nb25hbFdyaXRpbmdNb2RlcykpCisg
ICAgICAgICAgICBsb2dpY2FsVG9wUG9zID0gY29udGFpbmVyTG9naWNhbEhlaWdodEZvclBvc2l0
aW9uZWQgLSBsb2dpY2FsSGVpZ2h0VmFsdWUgLSBsb2dpY2FsVG9wUG9zOworICAgIH0KIAogICAg
IC8vIE91ciBvZmZzZXQgaXMgZnJvbSB0aGUgbG9naWNhbCBib3R0b20gZWRnZSBpbiBhIGZsaXBw
ZWQgZW52aXJvbm1lbnQsIGUuZy4sIHJpZ2h0IGZvciB2ZXJ0aWNhbC1ybCBhbmQgYm90dG9tIGZv
ciBob3Jpem9udGFsLWJ0LgogICAgIGlmIChjb250YWluZXJCbG9jay5zdHlsZSgpLmlzRmxpcHBl
ZEJsb2Nrc1dyaXRpbmdNb2RlKCkgJiYgIWhhdmVPcnRob2dvbmFsV3JpdGluZ01vZGVzKSB7CkBA
IC00Mzg2LDYgKzQzOTEsMTQgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9n
aWNhbEhlaWdodFVzaW5nKFNpemVUeXBlIGhlaWdodFR5cGUsIExlbmd0aAogICAgICAgICAgICAg
Ly8gT3Zlci1jb25zdHJhaW5lZCwgKG5vIG5lZWQgc29sdmUgZm9yIGJvdHRvbSkKICAgICAgICAg
ICAgIGNvbXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5tX2JlZm9yZSA9IHZhbHVlRm9yTGVuZ3RoKG1h
cmdpbkJlZm9yZSwgY29udGFpbmVyUmVsYXRpdmVMb2dpY2FsV2lkdGgpOwogICAgICAgICAgICAg
Y29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fYWZ0ZXIgPSB2YWx1ZUZvckxlbmd0aChtYXJnaW5B
ZnRlciwgY29udGFpbmVyUmVsYXRpdmVMb2dpY2FsV2lkdGgpOworCisgICAgICAgICAgICBib29s
IGlzTGVmdFJpZ2h0T3ZlcmNvbnN0cmFpbmVkID0gaXNPcnRob2dvbmFsKCp0aGlzLCBjb250YWlu
ZXJCbG9jayk7CisgICAgICAgICAgICBpZiAoaXNMZWZ0UmlnaHRPdmVyY29uc3RyYWluZWQpIHsK
KyAgICAgICAgICAgICAgICBpZiAoY29udGFpbmVyQmxvY2suc3R5bGUoKS5kaXJlY3Rpb24oKSA9
PSBUZXh0RGlyZWN0aW9uOjpSVEwpCisgICAgICAgICAgICAgICAgICAgIGxvZ2ljYWxUb3BWYWx1
ZSA9IChhdmFpbGFibGVTcGFjZSArIGxvZ2ljYWxUb3BWYWx1ZSkgLSBjb21wdXRlZFZhbHVlcy5t
X21hcmdpbnMubV9iZWZvcmUgLSBjb21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9hZnRlcjsKKyAg
ICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgIGxvZ2ljYWxUb3BWYWx1ZSA9
IHZhbHVlRm9yTGVuZ3RoKHN0eWxlKCkubGVmdCgpLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0KTsK
KyAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0gZWxzZSB7CiAgICAgICAgIC8qLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0qXApAQCAtNDQ0Niw3ICs0NDU5LDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3Np
dGlvbmVkTG9naWNhbEhlaWdodFVzaW5nKFNpemVUeXBlIGhlaWdodFR5cGUsIExlbmd0aAogCiAg
ICAgLy8gVXNlIGNvbXB1dGVkIHZhbHVlcyB0byBjYWxjdWxhdGUgdGhlIHZlcnRpY2FsIHBvc2l0
aW9uLgogICAgIGNvbXB1dGVkVmFsdWVzLm1fcG9zaXRpb24gPSBsb2dpY2FsVG9wVmFsdWUgKyBj
b21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9iZWZvcmU7Ci0gICAgY29tcHV0ZUxvZ2ljYWxUb3BQ
b3NpdGlvbmVkT2Zmc2V0KGNvbXB1dGVkVmFsdWVzLm1fcG9zaXRpb24sIHRoaXMsIGxvZ2ljYWxI
ZWlnaHRWYWx1ZSArIGJvcmRlcnNQbHVzUGFkZGluZywgY29udGFpbmVyQmxvY2ssIGNvbnRhaW5l
ckxvZ2ljYWxIZWlnaHQpOworICAgIGNvbXB1dGVMb2dpY2FsVG9wUG9zaXRpb25lZE9mZnNldChj
b21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9uLCB0aGlzLCBsb2dpY2FsSGVpZ2h0VmFsdWUgKyBib3Jk
ZXJzUGx1c1BhZGRpbmcsIGNvbnRhaW5lckJsb2NrLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0LCBz
dHlsZSgpLmxvZ2ljYWxUb3AoKS5pc0F1dG8oKSwgc3R5bGUoKS5sb2dpY2FsQm90dG9tKCkuaXNB
dXRvKCkpOwogfQogCiB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsV2lk
dGhSZXBsYWNlZChMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmIGNvbXB1dGVkVmFsdWVzKSBj
b25zdApAQCAtNDYxNSw3ICs0NjI4LDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlv
bmVkTG9naWNhbFdpZHRoUmVwbGFjZWQoTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWUKIAogICAg
IExheW91dFVuaXQgbG9naWNhbExlZnRQb3MgPSBsb2dpY2FsTGVmdFZhbHVlICsgbWFyZ2luTG9n
aWNhbExlZnRBbGlhczsKICAgICAvLyBCb3JkZXIgYW5kIHBhZGRpbmcgaGF2ZSBhbHJlYWR5IGJl
ZW4gaW5jbHVkZWQgaW4gY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQuCi0gICAgY29tcHV0ZUxvZ2lj
YWxMZWZ0UG9zaXRpb25lZE9mZnNldChsb2dpY2FsTGVmdFBvcywgdGhpcywgY29tcHV0ZWRWYWx1
ZXMubV9leHRlbnQsIGNvbnRhaW5lckJsb2NrLCBjb250YWluZXJMb2dpY2FsV2lkdGgpOworICAg
IGNvbXB1dGVMb2dpY2FsTGVmdFBvc2l0aW9uZWRPZmZzZXQobG9naWNhbExlZnRQb3MsIHRoaXMs
IGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50LCBjb250YWluZXJCbG9jaywgY29udGFpbmVyTG9naWNh
bFdpZHRoLCBzdHlsZSgpLmxvZ2ljYWxMZWZ0KCkuaXNBdXRvKCksIHN0eWxlKCkubG9naWNhbFJp
Z2h0KCkuaXNBdXRvKCkpOwogICAgIGNvbXB1dGVkVmFsdWVzLm1fcG9zaXRpb24gPSBsb2dpY2Fs
TGVmdFBvczsKIH0KIApAQCAtNDc0NSw3ICs0NzU4LDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1
dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFJlcGxhY2VkKExvZ2ljYWxFeHRlbnRDb21wdXRlZFZh
bHUKICAgICAvLyBVc2UgY29tcHV0ZWQgdmFsdWVzIHRvIGNhbGN1bGF0ZSB0aGUgdmVydGljYWwg
cG9zaXRpb24uCiAgICAgTGF5b3V0VW5pdCBsb2dpY2FsVG9wUG9zID0gbG9naWNhbFRvcFZhbHVl
ICsgbWFyZ2luQmVmb3JlQWxpYXM7CiAgICAgLy8gQm9yZGVyIGFuZCBwYWRkaW5nIGhhdmUgYWxy
ZWFkeSBiZWVuIGluY2x1ZGVkIGluIGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50LgotICAgIGNvbXB1
dGVMb2dpY2FsVG9wUG9zaXRpb25lZE9mZnNldChsb2dpY2FsVG9wUG9zLCB0aGlzLCBjb21wdXRl
ZFZhbHVlcy5tX2V4dGVudCwgY29udGFpbmVyQmxvY2ssIGNvbnRhaW5lckxvZ2ljYWxIZWlnaHQp
OworICAgIGNvbXB1dGVMb2dpY2FsVG9wUG9zaXRpb25lZE9mZnNldChsb2dpY2FsVG9wUG9zLCB0
aGlzLCBjb21wdXRlZFZhbHVlcy5tX2V4dGVudCwgY29udGFpbmVyQmxvY2ssIGNvbnRhaW5lckxv
Z2ljYWxIZWlnaHQsIHN0eWxlKCkubG9naWNhbFRvcCgpLmlzQXV0bygpLCBzdHlsZSgpLmxvZ2lj
YWxCb3R0b20oKS5pc0F1dG8oKSk7CiAgICAgY29tcHV0ZWRWYWx1ZXMubV9wb3NpdGlvbiA9IGxv
Z2ljYWxUb3BQb3M7CiB9CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xh
eW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2NTg1NmExZDNkN2Y0YmJlN2VkMjE2OTRkMDhmOTZj
MDc2ZTZmMjg4Li4zMGQzMDY1YTYyMDhkOWY2YTBlYWE5ZjE5MzI3NWI1ZmFhZWJhNDg3IDEwMDY0
NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n
CkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMTEtMDQgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNv
bT4KKworICAgICAgICBGaXggYWJzcG9zLTAyMC5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53
ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIwMTIKKworICAgICAgICBSZXZpZXdlZCBieSBO
T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisgICAgICAgICog
cGxhdGZvcm0vaW9zL1Rlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMTEtMDMgIEFudG9pbmUgUXVp
bnQgIDxncmFvdXRzQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjI2ODkzMik6
IENQVSB1c2FnZSBoaWdoZXIgdGhhbiBleHBlY3RlZCB3aXRoIHNpYmxpbmcgZWxlbWVudHMgcnVu
bmluZyBXZWJBbmltYXRpb25zCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRp
b25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCAyNDY5MmRlZjM5M2Q2NDYz
ZTExMmJhN2RiYWIyNWZlY2ZkYjE4MDQzLi4xM2NlZDU2M2MzZmI1NzQyYzZlYzg0MWEzZDQxMTc3
N2NkYzI0OWIxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBi
L0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTM5OTcsMTQgKzM5OTcsNiBAQCB3ZWJr
aXQub3JnL2IvMjMwMDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy10
cmFuc2Zvcm1zL3R0d2YtdHJhbgogCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2NlbnRyYWwtYmFzZWxpbmUt
YWxpZ25tZW50LTAwMy54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIFBhc3MgXQogd2Via2l0Lm9yZy9i
LzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1t
b2Rlcy9jbGVhcmFuY2UtY2FsY3VsYXRpb25zLXZybC0wMDIueGh0IFsgSW1hZ2VPbmx5RmFpbHVy
ZSBQYXNzIF0KLXdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtaWNiLXZsci0w
MzMueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9u
LXJlcGxhY2VkLWljYi12cmwtMDMwLnhodCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9y
Zy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGlu
Zy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12bHItMDk1LnhodCBbIEltYWdlT25seUZhaWx1
cmUgXQotd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12bHItMjI1LnhodCBb
IEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNl
ZC12bHItMjI5LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIwOTA4MCBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMt
cG9zLW5vbi1yZXBsYWNlZC12cmwtMDg4LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0
Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3Jp
dGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12cmwtMjIwLnhodCBbIEltYWdlT25seUZh
aWx1cmUgXQotd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12cmwtMjI0Lnho
dCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hdmFpbGFibGUtc2l6ZS0w
MDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hdmFpbGFibGUt
c2l6ZS0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4MCBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hdmFp
bGFibGUtc2l6ZS0wMDMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpAQCAtNDU1Niw3ICs0NTQ4
LDYgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtc2NvcGluZy9zbG90dGVkLXBsYWMKIAogIyAgY29udGFpbi1pbnRyaW5zaWMtc2l6
ZQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAyMC5odG1sIFsgSW1hZ2VPbmx5
RmFpbHVyZSBdCiAjIGZsZXgtYmFzaXM6Y29udGVudAogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9m
bGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9y
Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n
L2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbCBbIEltYWdlT25seUZhaWx1
cmUgXQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zL1Rlc3RFeHBlY3RhdGlv
bnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvVGVzdEV4cGVjdGF0aW9ucwppbmRleCA3ZWJh
YTNiZjM2MWZiNTdiYjNhMWE4OThhZGUzOWUzOWZhMDU4N2Q4Li4zMDczZTcyNDI3NWQ1ZTA4ZmYy
ZTU5Nzk3ODhkZjMzNmM1MmI4ODZlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9p
b3MvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvVGVzdEV4
cGVjdGF0aW9ucwpAQCAtMzUyNyw2ICszNTI3LDcgQEAgd2Via2l0Lm9yZy9iLzIyOTM5NyBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG8K
IHdlYmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdnJsLTA1Mi54aHQgWyBJbWFn
ZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdnJs
LTA2NC54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1u
b24tcmVwbGFjZWQtdnJsLTA3Ni54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KK3dlYmtpdC5vcmcv
Yi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmct
bW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdnJsLTA4OC54aHQgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KIHdlYmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdnJsLTEwNC54aHQgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQt
dnJsLTEwOC54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMjkzOTcgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBv
cy1ub24tcmVwbGFjZWQtdnJsLTExMi54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KQEAgLTM1NDUs
NiArMzU0NiwxMSBAQCB3ZWJraXQub3JnL2IvMjI5Mzk3IGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wbwogd2Via2l0Lm9yZy9iLzIyOTM5
NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9h
YnMtcG9zLW5vbi1yZXBsYWNlZC12cmwtMTkyLnhodCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Vi
a2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
d3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12cmwtMjA0LnhodCBbIEltYWdlT25s
eUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12cmwtMjA4
LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQord2Via2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1y
ZXBsYWNlZC12cmwtMjIwLnhodCBbIEltYWdlT25seUZhaWx1cmUgXQord2Via2l0Lm9yZy9iLzIy
OTM5NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rl
cy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12cmwtMjI0LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQor
d2Via2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12bHItMDk1LnhodCBbIEltYWdl
T25seUZhaWx1cmUgXQord2Via2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12bHIt
MjI1LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQord2Via2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5v
bi1yZXBsYWNlZC12bHItMjI5LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9i
LzIyOTM5NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1t
b2Rlcy9jbGlwLXJlY3QtdnJsLTAwMi54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5v
cmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRp
bmctbW9kZXMvY2xpcC1yZWN0LXZybC0wMDQueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJr
aXQub3JnL2IvMjI5Mzk3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13
cml0aW5nLW1vZGVzL2NsaXAtcmVjdC12cmwtMDA2LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>444394</attachid>
            <date>2021-11-16 08:43:07 -0800</date>
            <delta_ts>2021-11-17 01:19:37 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232012-20211116164304.patch</filename>
            <type>text/plain</type>
            <size>11356</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1ODYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDMzMTRkNTUyNTU5NmYy
NDY3YjIyNmYxNThjYTAwNDRlYTIzMmJjOC4uNjk0NWFjNWVmN2Y0ZDVjNWQ5Mjg4NDY0NWZiNjNl
MjI4NzBmNzMxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTExLTE2ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQWRkIG92ZXItY29uc3RyYWluZWQg
ZGlyZWN0aW9uIGNoZWNrIHRvIGNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFVzaW5nCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIwMTIKKwor
ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBjb21wdXRl
UG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyB0aGUgb3Zlci1jb25zdHJhaW5lZCBjYXNlIG5l
dmVyIHRvb2sgaW50bworICAgICAgICBhY2NvdW50IFJUTCBkaXJlY3Rpb24sIGJ1dCB0aGlzIHNo
b3VsZCBiZSBkb25lIGlmIHdlIGFyZSBhY3R1YWxseSBkZWFsaW5nIHdpdGggbGVmdC9yaWdodCBw
cm9wZXJ0aWVzLiBbMV0KKyAgICAgICAgRmluYWxseSwgY29tcHV0ZUxvZ2ljYWxUb3BQb3NpdGlv
bmVkT2Zmc2V0IHNob3VsZCBub3QgZG8gdGhlIGZsaXBwaW5nIGxvZ2ljIGluIHRoZSBvdmVyLWNv
bnN0cmFpbmVkIGNhc2UuCisKKyAgICAgICAgWzFdIGh0dHA6Ly93d3cudzMub3JnL1RSL2Nzcy13
cml0aW5nLW1vZGVzLTMvI3ZlcnRpY2FsLWxheW91dAorCisgICAgICAgICogcmVuZGVyaW5nL1Jl
bmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb21wdXRlTG9naWNhbFRvcFBvc2l0aW9u
ZWRPZmZzZXQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25l
ZExvZ2ljYWxIZWlnaHRVc2luZyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6
OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFJlcGxhY2VkIGNvbnN0KToKKwogMjAyMS0x
MS0xNiAgQW5kcmV1IEJvdGVsbGEgIDxhbmRyZXVAYW5kcmV1Ym90ZWxsYS5jb20+CiAKICAgICAg
ICAgRW1wdHkgPGlucHV0IHR5cGU9ZmlsZT4gaXMgcmVwcmVzZW50ZWQgaW5jb3JyZWN0bHkgaW4g
Rm9ybURhdGEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu
Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggNzEwZTEw
NGU3MWU3NmFjMjIzOGFjNzllZTRhZTBjNTc0MmNhZTlhZi4uMjE3NGFiMDM0NDYyOWRjYTBkZWI5
YjM0N2E4N2ExNDAyNjIxMWMwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n
L1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5j
cHAKQEAgLTQzMzksMTcgKzQzMzksMjAgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlv
bmVkTG9naWNhbEhlaWdodChMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmIGNvbXAKIC8vIFRo
ZSB8Y29udGFpbmVyTG9naWNhbEhlaWdodEZvclBvc2l0aW9uZWR8IGlzIGFscmVhZHkgYXdhcmUg
b2Ygb3J0aG9nb25hbCBmbG93cy4KIC8vIFRoZSBsb2dpY2FsVG9wIGNvbmNlcHQgaXMgY29uZnVz
aW5nIGhlcmUuIEl0J3MgdGhlIGxvZ2ljYWwgdG9wIGZyb20gdGhlIGNoaWxkJ3MgUE9WLiBUaGlz
IG1lYW5zIHRoYXQgaXMgdGhlIHBoeXNpY2FsCiAvLyB5IGlmIHRoZSBjaGlsZCBpcyB2ZXJ0aWNh
bCBvciB0aGUgcGh5c2ljYWwgeCBpZiB0aGUgY2hpbGQgaXMgaG9yaXpvbnRhbC4KLXN0YXRpYyB2
b2lkIGNvbXB1dGVMb2dpY2FsVG9wUG9zaXRpb25lZE9mZnNldChMYXlvdXRVbml0JiBsb2dpY2Fs
VG9wUG9zLCBjb25zdCBSZW5kZXJCb3gqIGNoaWxkLCBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHRW
YWx1ZSwgY29uc3QgUmVuZGVyQm94TW9kZWxPYmplY3QmIGNvbnRhaW5lckJsb2NrLCBMYXlvdXRV
bml0IGNvbnRhaW5lckxvZ2ljYWxIZWlnaHRGb3JQb3NpdGlvbmVkKQorc3RhdGljIHZvaWQgY29t
cHV0ZUxvZ2ljYWxUb3BQb3NpdGlvbmVkT2Zmc2V0KExheW91dFVuaXQmIGxvZ2ljYWxUb3BQb3Ms
IGNvbnN0IFJlbmRlckJveCogY2hpbGQsIExheW91dFVuaXQgbG9naWNhbEhlaWdodFZhbHVlLCBj
b25zdCBSZW5kZXJCb3hNb2RlbE9iamVjdCYgY29udGFpbmVyQmxvY2ssIExheW91dFVuaXQgY29u
dGFpbmVyTG9naWNhbEhlaWdodEZvclBvc2l0aW9uZWQsIGJvb2wgbG9naWNhbFRvcElzQXV0bywg
Ym9vbCBsb2dpY2FsQm90dG9tSXNBdXRvKQogewotICAgIGF1dG8gbG9naWNhbFRvcEFuZEJvdHRv
bUFyZUF1dG8gPSBjaGlsZC0+c3R5bGUoKS5sb2dpY2FsVG9wKCkuaXNBdXRvKCkgJiYgY2hpbGQt
PnN0eWxlKCkubG9naWNhbEJvdHRvbSgpLmlzQXV0bygpOworICAgIGF1dG8gbG9naWNhbFRvcEFu
ZEJvdHRvbUFyZUF1dG8gPSBsb2dpY2FsVG9wSXNBdXRvICYmIGxvZ2ljYWxCb3R0b21Jc0F1dG87
CiAgICAgYXV0byBoYXZlT3J0aG9nb25hbFdyaXRpbmdNb2RlcyA9IGlzT3J0aG9nb25hbCgqY2hp
bGQsIGNvbnRhaW5lckJsb2NrKTsKICAgICBhdXRvIGhhdmVGbGlwcGVkQmxvY2tBeGlzID0gY2hp
bGQtPnN0eWxlKCkuaXNGbGlwcGVkQmxvY2tzV3JpdGluZ01vZGUoKSAhPSBjb250YWluZXJCbG9j
ay5zdHlsZSgpLmlzRmxpcHBlZEJsb2Nrc1dyaXRpbmdNb2RlKCk7CisgICAgYm9vbCBpc092ZXJj
b25zdHJhaW5lZCA9ICFsb2dpY2FsVG9wSXNBdXRvICYmICFsb2dpY2FsQm90dG9tSXNBdXRvICYm
ICFjaGlsZC0+c3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCkuaXNBdXRvKCk7CiAKICAgICAvLyBEZWFs
IHdpdGggZGlmZmVyaW5nIHdyaXRpbmcgbW9kZXMgaGVyZS4gIE91ciBvZmZzZXQgbmVlZHMgdG8g
YmUgaW4gdGhlIGNvbnRhaW5pbmcgYmxvY2sncyBjb29yZGluYXRlIHNwYWNlLiBJZiB0aGUgY29u
dGFpbmluZyBibG9jayBpcyBmbGlwcGVkCiAgICAgLy8gYWxvbmcgdGhpcyBheGlzLCB0aGVuIHdl
IG5lZWQgdG8gZmxpcCB0aGUgY29vcmRpbmF0ZS4gIFRoaXMgY2FuIG9ubHkgaGFwcGVuIGlmIHRo
ZSBjb250YWluaW5nIGJsb2NrIGlzIGJvdGggYSBmbGlwcGVkIG1vZGUgYW5kIHBlcnBlbmRpY3Vs
YXIgdG8gdXMuCi0gICAgaWYgKChoYXZlT3J0aG9nb25hbFdyaXRpbmdNb2RlcyAmJiAhbG9naWNh
bFRvcEFuZEJvdHRvbUFyZUF1dG8gJiYgY2hpbGQtPnN0eWxlKCkuaXNGbGlwcGVkQmxvY2tzV3Jp
dGluZ01vZGUoKSkKLSAgICAgICAgfHwgKGhhdmVGbGlwcGVkQmxvY2tBeGlzICYmICFoYXZlT3J0
aG9nb25hbFdyaXRpbmdNb2RlcykpCi0gICAgICAgIGxvZ2ljYWxUb3BQb3MgPSBjb250YWluZXJM
b2dpY2FsSGVpZ2h0Rm9yUG9zaXRpb25lZCAtIGxvZ2ljYWxIZWlnaHRWYWx1ZSAtIGxvZ2ljYWxU
b3BQb3M7CisgICAgaWYgKCFpc092ZXJjb25zdHJhaW5lZCkgeworICAgICAgICBpZiAoKGhhdmVP
cnRob2dvbmFsV3JpdGluZ01vZGVzICYmICFsb2dpY2FsVG9wQW5kQm90dG9tQXJlQXV0byAmJiBj
aGlsZC0+c3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9kZSgpKQorICAgICAgICAgICAg
fHwgKGhhdmVGbGlwcGVkQmxvY2tBeGlzICYmICFoYXZlT3J0aG9nb25hbFdyaXRpbmdNb2Rlcykp
CisgICAgICAgICAgICBsb2dpY2FsVG9wUG9zID0gY29udGFpbmVyTG9naWNhbEhlaWdodEZvclBv
c2l0aW9uZWQgLSBsb2dpY2FsSGVpZ2h0VmFsdWUgLSBsb2dpY2FsVG9wUG9zOworICAgIH0KIAog
ICAgIC8vIE91ciBvZmZzZXQgaXMgZnJvbSB0aGUgbG9naWNhbCBib3R0b20gZWRnZSBpbiBhIGZs
aXBwZWQgZW52aXJvbm1lbnQsIGUuZy4sIHJpZ2h0IGZvciB2ZXJ0aWNhbC1ybCBhbmQgYm90dG9t
IGZvciBob3Jpem9udGFsLWJ0LgogICAgIGlmIChjb250YWluZXJCbG9jay5zdHlsZSgpLmlzRmxp
cHBlZEJsb2Nrc1dyaXRpbmdNb2RlKCkgJiYgIWhhdmVPcnRob2dvbmFsV3JpdGluZ01vZGVzKSB7
CkBAIC00NDQ0LDYgKzQ0NDcsMTMgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVk
TG9naWNhbEhlaWdodFVzaW5nKFNpemVUeXBlIGhlaWdodFR5cGUsIExlbmd0aAogICAgICAgICAg
ICAgLy8gT3Zlci1jb25zdHJhaW5lZCwgKG5vIG5lZWQgc29sdmUgZm9yIGJvdHRvbSkKICAgICAg
ICAgICAgIGNvbXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5tX2JlZm9yZSA9IHZhbHVlRm9yTGVuZ3Ro
KG1hcmdpbkJlZm9yZSwgY29udGFpbmVyUmVsYXRpdmVMb2dpY2FsV2lkdGgpOwogICAgICAgICAg
ICAgY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fYWZ0ZXIgPSB2YWx1ZUZvckxlbmd0aChtYXJn
aW5BZnRlciwgY29udGFpbmVyUmVsYXRpdmVMb2dpY2FsV2lkdGgpOworCisgICAgICAgICAgICBp
ZiAoaXNPcnRob2dvbmFsKCp0aGlzLCBjb250YWluZXJCbG9jaykpIHsKKyAgICAgICAgICAgICAg
ICBpZiAoY29udGFpbmVyQmxvY2suc3R5bGUoKS5kaXJlY3Rpb24oKSA9PSBUZXh0RGlyZWN0aW9u
OjpSVEwpCisgICAgICAgICAgICAgICAgICAgIGxvZ2ljYWxUb3BWYWx1ZSA9IChhdmFpbGFibGVT
cGFjZSArIGxvZ2ljYWxUb3BWYWx1ZSkgLSBjb21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9iZWZv
cmUgLSBjb21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9hZnRlcjsKKyAgICAgICAgICAgICAgICBl
bHNlCisgICAgICAgICAgICAgICAgICAgIGxvZ2ljYWxUb3BWYWx1ZSA9IHZhbHVlRm9yTGVuZ3Ro
KHN0eWxlKCkubGVmdCgpLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0KTsKKyAgICAgICAgICAgIH0K
ICAgICAgICAgfQogICAgIH0gZWxzZSB7CiAgICAgICAgIC8qLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0qXApAQCAtNDUw
NCw3ICs0NTE0LDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhl
aWdodFVzaW5nKFNpemVUeXBlIGhlaWdodFR5cGUsIExlbmd0aAogCiAgICAgLy8gVXNlIGNvbXB1
dGVkIHZhbHVlcyB0byBjYWxjdWxhdGUgdGhlIHZlcnRpY2FsIHBvc2l0aW9uLgogICAgIGNvbXB1
dGVkVmFsdWVzLm1fcG9zaXRpb24gPSBsb2dpY2FsVG9wVmFsdWUgKyBjb21wdXRlZFZhbHVlcy5t
X21hcmdpbnMubV9iZWZvcmU7Ci0gICAgY29tcHV0ZUxvZ2ljYWxUb3BQb3NpdGlvbmVkT2Zmc2V0
KGNvbXB1dGVkVmFsdWVzLm1fcG9zaXRpb24sIHRoaXMsIGxvZ2ljYWxIZWlnaHRWYWx1ZSArIGJv
cmRlcnNQbHVzUGFkZGluZywgY29udGFpbmVyQmxvY2ssIGNvbnRhaW5lckxvZ2ljYWxIZWlnaHQp
OworICAgIGNvbXB1dGVMb2dpY2FsVG9wUG9zaXRpb25lZE9mZnNldChjb21wdXRlZFZhbHVlcy5t
X3Bvc2l0aW9uLCB0aGlzLCBsb2dpY2FsSGVpZ2h0VmFsdWUgKyBib3JkZXJzUGx1c1BhZGRpbmcs
IGNvbnRhaW5lckJsb2NrLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0LCBzdHlsZSgpLmxvZ2ljYWxU
b3AoKS5pc0F1dG8oKSwgc3R5bGUoKS5sb2dpY2FsQm90dG9tKCkuaXNBdXRvKCkpOwogfQogCiB2
b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsV2lkdGhSZXBsYWNlZChMb2dp
Y2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmIGNvbXB1dGVkVmFsdWVzKSBjb25zdApAQCAtNDgwMyw3
ICs0ODEzLDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdo
dFJlcGxhY2VkKExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHUKICAgICAvLyBVc2UgY29tcHV0ZWQg
dmFsdWVzIHRvIGNhbGN1bGF0ZSB0aGUgdmVydGljYWwgcG9zaXRpb24uCiAgICAgTGF5b3V0VW5p
dCBsb2dpY2FsVG9wUG9zID0gbG9naWNhbFRvcFZhbHVlICsgbWFyZ2luQmVmb3JlQWxpYXM7CiAg
ICAgLy8gQm9yZGVyIGFuZCBwYWRkaW5nIGhhdmUgYWxyZWFkeSBiZWVuIGluY2x1ZGVkIGluIGNv
bXB1dGVkVmFsdWVzLm1fZXh0ZW50LgotICAgIGNvbXB1dGVMb2dpY2FsVG9wUG9zaXRpb25lZE9m
ZnNldChsb2dpY2FsVG9wUG9zLCB0aGlzLCBjb21wdXRlZFZhbHVlcy5tX2V4dGVudCwgY29udGFp
bmVyQmxvY2ssIGNvbnRhaW5lckxvZ2ljYWxIZWlnaHQpOworICAgIGNvbXB1dGVMb2dpY2FsVG9w
UG9zaXRpb25lZE9mZnNldChsb2dpY2FsVG9wUG9zLCB0aGlzLCBjb21wdXRlZFZhbHVlcy5tX2V4
dGVudCwgY29udGFpbmVyQmxvY2ssIGNvbnRhaW5lckxvZ2ljYWxIZWlnaHQsIHN0eWxlKCkubG9n
aWNhbFRvcCgpLmlzQXV0bygpLCBzdHlsZSgpLmxvZ2ljYWxCb3R0b20oKS5pc0F1dG8oKSk7CiAg
ICAgY29tcHV0ZWRWYWx1ZXMubV9wb3NpdGlvbiA9IGxvZ2ljYWxUb3BQb3M7CiB9CiAKZGlmZiAt
LWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRl
eCAyMWEwODZiOWQ3ZDdkOWQyN2E5YzJjYmM1ODFmZDRhNDRhZmFhMzA1Li5jYjZmYzMxOGM5ZjA5
MGQwYWI3Y2NiMTUyYTFhN2I2NDY1NTRiMzJiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEt
MTEtMTYgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBBZGQgb3Zlci1j
b25zdHJhaW5lZCBkaXJlY3Rpb24gY2hlY2sgdG8gY29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVp
Z2h0VXNpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTIzMjAxMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
ICogVGVzdEV4cGVjdGF0aW9uczogUmVtb3ZlZCA1IHRlc3RzIHRoYXQgYXJlIG5vdyBwYXNzaW5n
LgorICAgICAgICAqIHBsYXRmb3JtL2lvcy9UZXN0RXhwZWN0YXRpb25zOiBTa2lwcGVkIHNldmVy
YWwgdGVzdHMgdGhhdCBzaG93IDFweCBkaWZmIGluIHRoZSByZXN1bHQuCisKIDIwMjEtMTEtMTYg
IENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2
aWV3ZWQsIHJldmVydGluZyByMjgwMDc4LCByMjgwMjkwIGFuZCByMjgyMDA4LgpkaWZmIC0tZ2l0
IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3Rh
dGlvbnMKaW5kZXggMzY4Y2Y3ZTk0YmRmZDMzMjM1NzJjYTA4YjYwZTFmZjQ3MjY4YjQ1ZS4uZjEx
ZjlmNzVjYTQ4YTJhMjVkNDM1ZjA0Y2Q5ZDM1YzM1ZjRjMWIyYSAxMDA2NDQKLS0tIGEvTGF5b3V0
VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25z
CkBAIC00MDI5LDEyICs0MDI5LDggQEAgd2Via2l0Lm9yZy9iLzIzMDA4MCBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtdHJhbnNmb3Jtcy90dHdmLXRyYW4KIAogd2Via2l0
Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3Jp
dGluZy1tb2Rlcy9jZW50cmFsLWJhc2VsaW5lLWFsaWdubWVudC0wMDMueGh0IFsgSW1hZ2VPbmx5
RmFpbHVyZSBQYXNzIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvY2xlYXJhbmNlLWNhbGN1bGF0aW9ucy12
cmwtMDAyLnhodCBbIEltYWdlT25seUZhaWx1cmUgUGFzcyBdCi13ZWJraXQub3JnL2IvMjA5MDgw
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Fi
cy1wb3Mtbm9uLXJlcGxhY2VkLWljYi12bHItMDMzLnhodCBbIEltYWdlT25seUZhaWx1cmUgXQot
d2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC1pY2ItdnJsLTAzMC54aHQgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQt
dmxyLTA5NS54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBv
cy1ub24tcmVwbGFjZWQtdmxyLTIyNS54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5v
cmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRp
bmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdmxyLTIyOS54aHQgWyBJbWFnZU9ubHlGYWls
dXJlIF0KLXdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdnJsLTA4OC54aHQg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFj
ZWQtdnJsLTIyMC54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAg
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJz
LXBvcy1ub24tcmVwbGFjZWQtdnJsLTIyNC54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtp
dC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdy
aXRpbmctbW9kZXMvYXZhaWxhYmxlLXNpemUtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
QEAgLTQ1ODAsNyArNDU3Niw2IEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2xvdHRlZC1wbGFjCiAKICMgIGNvbnRh
aW4taW50cmluc2ljLXNpemUKIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAxNC5odG1s
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMjAu
aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFz
cGVjdC1yYXRpby0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIx
NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj
dC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQog
d2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbCBbIEltYWdl
T25seUZhaWx1cmUgXQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zL1Rlc3RF
eHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvVGVzdEV4cGVjdGF0aW9ucwpp
bmRleCBjNGI0ZWRjOThmNWNlMTgxMzNmODA2ZmQ5Mjc5YThjYmQ0YjVjNDUxLi4yOGE1NTQ3MTg4
MmU3MDQyNzFlNDQ4YjEyMjNhZWFkMGYxZmU4YmFjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9w
bGF0Zm9ybS9pb3MvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9p
b3MvVGVzdEV4cGVjdGF0aW9ucwpAQCAtMzUzMiw2ICszNTMyLDEwIEBAIHdlYmtpdC5vcmcvYi8y
MjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9k
ZXMvYWJzLXBvCiB3ZWJraXQub3JnL2IvMjI5Mzk3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZybC0xOTIu
eGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjI5Mzk3IGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJl
cGxhY2VkLXZybC0yMDQueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjI5
Mzk3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVz
L2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZybC0yMDgueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCit3
ZWJraXQub3JnL2IvMjI5Mzk3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZybC0yMjAueGh0IFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCit3ZWJraXQub3JnL2IvMjI5Mzk3IGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZybC0y
MjQueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCit3ZWJraXQub3JnL2IvMjI5Mzk3IGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9u
LXJlcGxhY2VkLXZsci0yMjUueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCit3ZWJraXQub3JnL2Iv
MjI5Mzk3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1v
ZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZsci0yMjkueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBd
CiB3ZWJraXQub3JnL2IvMjI5Mzk3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy13cml0aW5nLW1vZGVzL2NsaXAtcmVjdC12cmwtMDAyLnhodCBbIEltYWdlT25seUZhaWx1
cmUgXQogd2Via2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9jbGlwLXJlY3QtdnJsLTAwNC54aHQgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvY2xpcC1yZWN0LXZybC0wMDYueGh0IFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>444494</attachid>
            <date>2021-11-17 01:19:42 -0800</date>
            <delta_ts>2021-12-03 02:15:35 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232012-20211117091940.patch</filename>
            <type>text/plain</type>
            <size>13139</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1OTE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGZiNzNhYTgyYTEyMWVi
ZWUyYzlmZWFiZDdjN2FkMzEwMWQ3ZTU0Mi4uZGFmMmU3N2I0NzRhYzQ1MjM1YTViMjhiMzEwZTI3
NzY3YjQ5NDI2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTExLTE3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQWRkIG92ZXItY29uc3RyYWluZWQg
ZGlyZWN0aW9uIGNoZWNrIHRvIGNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFVzaW5nCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIwMTIKKwor
ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBjb21wdXRl
UG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyB0aGUgb3Zlci1jb25zdHJhaW5lZCBjYXNlIG5l
dmVyIHRvb2sgaW50bworICAgICAgICBhY2NvdW50IFJUTCBkaXJlY3Rpb24sIGJ1dCB0aGlzIHNo
b3VsZCBiZSBkb25lIGlmIHdlIGFyZSBhY3R1YWxseSBkZWFsaW5nIHdpdGggbGVmdC9yaWdodCBw
cm9wZXJ0aWVzLiBbMV0KKyAgICAgICAgRmluYWxseSwgY29tcHV0ZUxvZ2ljYWxUb3BQb3NpdGlv
bmVkT2Zmc2V0IHNob3VsZCBub3QgZG8gdGhlIGZsaXBwaW5nIGxvZ2ljIGluIHRoZSBvdmVyLWNv
bnN0cmFpbmVkIGNhc2UuCisKKyAgICAgICAgWzFdIGh0dHA6Ly93d3cudzMub3JnL1RSL2Nzcy13
cml0aW5nLW1vZGVzLTMvI3ZlcnRpY2FsLWxheW91dAorCisgICAgICAgICogcmVuZGVyaW5nL1Jl
bmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb21wdXRlTG9naWNhbFRvcFBvc2l0aW9u
ZWRPZmZzZXQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25l
ZExvZ2ljYWxIZWlnaHRVc2luZyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6
OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFJlcGxhY2VkIGNvbnN0KToKKwogMjAyMS0x
MS0xNiAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFJlLWFkZCAnc3R5
bGUnIHRvIGNvbnRhaW46c3RyaWN0IGFuZCBjb250YWluOmNvbnRlbnQgQ1NTIHByb3BlcnRpZXMK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291
cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggNWIzZTZhNWM0MTA3N2Nh
OGIyZGQ5MGFjODc2MzM0MTVlOTBlZDQxNi4uZDM2ZjI2YjFhMjlmYmQ3M2UzNmM1ZTA1MjUzNWQz
NTZiYTJlYWMzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJv
eC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTQz
MzksMTcgKzQzMzksMjAgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNh
bEhlaWdodChMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmIGNvbXAKIC8vIFRoZSB8Y29udGFp
bmVyTG9naWNhbEhlaWdodEZvclBvc2l0aW9uZWR8IGlzIGFscmVhZHkgYXdhcmUgb2Ygb3J0aG9n
b25hbCBmbG93cy4KIC8vIFRoZSBsb2dpY2FsVG9wIGNvbmNlcHQgaXMgY29uZnVzaW5nIGhlcmUu
IEl0J3MgdGhlIGxvZ2ljYWwgdG9wIGZyb20gdGhlIGNoaWxkJ3MgUE9WLiBUaGlzIG1lYW5zIHRo
YXQgaXMgdGhlIHBoeXNpY2FsCiAvLyB5IGlmIHRoZSBjaGlsZCBpcyB2ZXJ0aWNhbCBvciB0aGUg
cGh5c2ljYWwgeCBpZiB0aGUgY2hpbGQgaXMgaG9yaXpvbnRhbC4KLXN0YXRpYyB2b2lkIGNvbXB1
dGVMb2dpY2FsVG9wUG9zaXRpb25lZE9mZnNldChMYXlvdXRVbml0JiBsb2dpY2FsVG9wUG9zLCBj
b25zdCBSZW5kZXJCb3gqIGNoaWxkLCBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHRWYWx1ZSwgY29u
c3QgUmVuZGVyQm94TW9kZWxPYmplY3QmIGNvbnRhaW5lckJsb2NrLCBMYXlvdXRVbml0IGNvbnRh
aW5lckxvZ2ljYWxIZWlnaHRGb3JQb3NpdGlvbmVkKQorc3RhdGljIHZvaWQgY29tcHV0ZUxvZ2lj
YWxUb3BQb3NpdGlvbmVkT2Zmc2V0KExheW91dFVuaXQmIGxvZ2ljYWxUb3BQb3MsIGNvbnN0IFJl
bmRlckJveCogY2hpbGQsIExheW91dFVuaXQgbG9naWNhbEhlaWdodFZhbHVlLCBjb25zdCBSZW5k
ZXJCb3hNb2RlbE9iamVjdCYgY29udGFpbmVyQmxvY2ssIExheW91dFVuaXQgY29udGFpbmVyTG9n
aWNhbEhlaWdodEZvclBvc2l0aW9uZWQsIGJvb2wgbG9naWNhbFRvcElzQXV0bywgYm9vbCBsb2dp
Y2FsQm90dG9tSXNBdXRvKQogewotICAgIGF1dG8gbG9naWNhbFRvcEFuZEJvdHRvbUFyZUF1dG8g
PSBjaGlsZC0+c3R5bGUoKS5sb2dpY2FsVG9wKCkuaXNBdXRvKCkgJiYgY2hpbGQtPnN0eWxlKCku
bG9naWNhbEJvdHRvbSgpLmlzQXV0bygpOworICAgIGF1dG8gbG9naWNhbFRvcEFuZEJvdHRvbUFy
ZUF1dG8gPSBsb2dpY2FsVG9wSXNBdXRvICYmIGxvZ2ljYWxCb3R0b21Jc0F1dG87CiAgICAgYXV0
byBoYXZlT3J0aG9nb25hbFdyaXRpbmdNb2RlcyA9IGlzT3J0aG9nb25hbCgqY2hpbGQsIGNvbnRh
aW5lckJsb2NrKTsKICAgICBhdXRvIGhhdmVGbGlwcGVkQmxvY2tBeGlzID0gY2hpbGQtPnN0eWxl
KCkuaXNGbGlwcGVkQmxvY2tzV3JpdGluZ01vZGUoKSAhPSBjb250YWluZXJCbG9jay5zdHlsZSgp
LmlzRmxpcHBlZEJsb2Nrc1dyaXRpbmdNb2RlKCk7CisgICAgYm9vbCBpc092ZXJjb25zdHJhaW5l
ZCA9ICFsb2dpY2FsVG9wSXNBdXRvICYmICFsb2dpY2FsQm90dG9tSXNBdXRvICYmICFjaGlsZC0+
c3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCkuaXNBdXRvKCk7CiAKICAgICAvLyBEZWFsIHdpdGggZGlm
ZmVyaW5nIHdyaXRpbmcgbW9kZXMgaGVyZS4gIE91ciBvZmZzZXQgbmVlZHMgdG8gYmUgaW4gdGhl
IGNvbnRhaW5pbmcgYmxvY2sncyBjb29yZGluYXRlIHNwYWNlLiBJZiB0aGUgY29udGFpbmluZyBi
bG9jayBpcyBmbGlwcGVkCiAgICAgLy8gYWxvbmcgdGhpcyBheGlzLCB0aGVuIHdlIG5lZWQgdG8g
ZmxpcCB0aGUgY29vcmRpbmF0ZS4gIFRoaXMgY2FuIG9ubHkgaGFwcGVuIGlmIHRoZSBjb250YWlu
aW5nIGJsb2NrIGlzIGJvdGggYSBmbGlwcGVkIG1vZGUgYW5kIHBlcnBlbmRpY3VsYXIgdG8gdXMu
Ci0gICAgaWYgKChoYXZlT3J0aG9nb25hbFdyaXRpbmdNb2RlcyAmJiAhbG9naWNhbFRvcEFuZEJv
dHRvbUFyZUF1dG8gJiYgY2hpbGQtPnN0eWxlKCkuaXNGbGlwcGVkQmxvY2tzV3JpdGluZ01vZGUo
KSkKLSAgICAgICAgfHwgKGhhdmVGbGlwcGVkQmxvY2tBeGlzICYmICFoYXZlT3J0aG9nb25hbFdy
aXRpbmdNb2RlcykpCi0gICAgICAgIGxvZ2ljYWxUb3BQb3MgPSBjb250YWluZXJMb2dpY2FsSGVp
Z2h0Rm9yUG9zaXRpb25lZCAtIGxvZ2ljYWxIZWlnaHRWYWx1ZSAtIGxvZ2ljYWxUb3BQb3M7Cisg
ICAgaWYgKCFpc092ZXJjb25zdHJhaW5lZCkgeworICAgICAgICBpZiAoKGhhdmVPcnRob2dvbmFs
V3JpdGluZ01vZGVzICYmICFsb2dpY2FsVG9wQW5kQm90dG9tQXJlQXV0byAmJiBjaGlsZC0+c3R5
bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9kZSgpKQorICAgICAgICAgICAgfHwgKGhhdmVG
bGlwcGVkQmxvY2tBeGlzICYmICFoYXZlT3J0aG9nb25hbFdyaXRpbmdNb2RlcykpCisgICAgICAg
ICAgICBsb2dpY2FsVG9wUG9zID0gY29udGFpbmVyTG9naWNhbEhlaWdodEZvclBvc2l0aW9uZWQg
LSBsb2dpY2FsSGVpZ2h0VmFsdWUgLSBsb2dpY2FsVG9wUG9zOworICAgIH0KIAogICAgIC8vIE91
ciBvZmZzZXQgaXMgZnJvbSB0aGUgbG9naWNhbCBib3R0b20gZWRnZSBpbiBhIGZsaXBwZWQgZW52
aXJvbm1lbnQsIGUuZy4sIHJpZ2h0IGZvciB2ZXJ0aWNhbC1ybCBhbmQgYm90dG9tIGZvciBob3Jp
em9udGFsLWJ0LgogICAgIGlmIChjb250YWluZXJCbG9jay5zdHlsZSgpLmlzRmxpcHBlZEJsb2Nr
c1dyaXRpbmdNb2RlKCkgJiYgIWhhdmVPcnRob2dvbmFsV3JpdGluZ01vZGVzKSB7CkBAIC00NDQ0
LDYgKzQ0NDcsMTMgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhl
aWdodFVzaW5nKFNpemVUeXBlIGhlaWdodFR5cGUsIExlbmd0aAogICAgICAgICAgICAgLy8gT3Zl
ci1jb25zdHJhaW5lZCwgKG5vIG5lZWQgc29sdmUgZm9yIGJvdHRvbSkKICAgICAgICAgICAgIGNv
bXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5tX2JlZm9yZSA9IHZhbHVlRm9yTGVuZ3RoKG1hcmdpbkJl
Zm9yZSwgY29udGFpbmVyUmVsYXRpdmVMb2dpY2FsV2lkdGgpOwogICAgICAgICAgICAgY29tcHV0
ZWRWYWx1ZXMubV9tYXJnaW5zLm1fYWZ0ZXIgPSB2YWx1ZUZvckxlbmd0aChtYXJnaW5BZnRlciwg
Y29udGFpbmVyUmVsYXRpdmVMb2dpY2FsV2lkdGgpOworCisgICAgICAgICAgICBpZiAoaXNPcnRo
b2dvbmFsKCp0aGlzLCBjb250YWluZXJCbG9jaykpIHsKKyAgICAgICAgICAgICAgICBpZiAoY29u
dGFpbmVyQmxvY2suc3R5bGUoKS5kaXJlY3Rpb24oKSA9PSBUZXh0RGlyZWN0aW9uOjpSVEwpCisg
ICAgICAgICAgICAgICAgICAgIGxvZ2ljYWxUb3BWYWx1ZSA9IChhdmFpbGFibGVTcGFjZSArIGxv
Z2ljYWxUb3BWYWx1ZSkgLSBjb21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9iZWZvcmUgLSBjb21w
dXRlZFZhbHVlcy5tX21hcmdpbnMubV9hZnRlcjsKKyAgICAgICAgICAgICAgICBlbHNlCisgICAg
ICAgICAgICAgICAgICAgIGxvZ2ljYWxUb3BWYWx1ZSA9IHZhbHVlRm9yTGVuZ3RoKHN0eWxlKCku
bGVmdCgpLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0KTsKKyAgICAgICAgICAgIH0KICAgICAgICAg
fQogICAgIH0gZWxzZSB7CiAgICAgICAgIC8qLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0qXApAQCAtNDUwNCw3ICs0NTE0
LDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFVzaW5n
KFNpemVUeXBlIGhlaWdodFR5cGUsIExlbmd0aAogCiAgICAgLy8gVXNlIGNvbXB1dGVkIHZhbHVl
cyB0byBjYWxjdWxhdGUgdGhlIHZlcnRpY2FsIHBvc2l0aW9uLgogICAgIGNvbXB1dGVkVmFsdWVz
Lm1fcG9zaXRpb24gPSBsb2dpY2FsVG9wVmFsdWUgKyBjb21wdXRlZFZhbHVlcy5tX21hcmdpbnMu
bV9iZWZvcmU7Ci0gICAgY29tcHV0ZUxvZ2ljYWxUb3BQb3NpdGlvbmVkT2Zmc2V0KGNvbXB1dGVk
VmFsdWVzLm1fcG9zaXRpb24sIHRoaXMsIGxvZ2ljYWxIZWlnaHRWYWx1ZSArIGJvcmRlcnNQbHVz
UGFkZGluZywgY29udGFpbmVyQmxvY2ssIGNvbnRhaW5lckxvZ2ljYWxIZWlnaHQpOworICAgIGNv
bXB1dGVMb2dpY2FsVG9wUG9zaXRpb25lZE9mZnNldChjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9u
LCB0aGlzLCBsb2dpY2FsSGVpZ2h0VmFsdWUgKyBib3JkZXJzUGx1c1BhZGRpbmcsIGNvbnRhaW5l
ckJsb2NrLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0LCBzdHlsZSgpLmxvZ2ljYWxUb3AoKS5pc0F1
dG8oKSwgc3R5bGUoKS5sb2dpY2FsQm90dG9tKCkuaXNBdXRvKCkpOwogfQogCiB2b2lkIFJlbmRl
ckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsV2lkdGhSZXBsYWNlZChMb2dpY2FsRXh0ZW50
Q29tcHV0ZWRWYWx1ZXMmIGNvbXB1dGVkVmFsdWVzKSBjb25zdApAQCAtNDgwMyw3ICs0ODEzLDcg
QEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFJlcGxhY2Vk
KExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHUKICAgICAvLyBVc2UgY29tcHV0ZWQgdmFsdWVzIHRv
IGNhbGN1bGF0ZSB0aGUgdmVydGljYWwgcG9zaXRpb24uCiAgICAgTGF5b3V0VW5pdCBsb2dpY2Fs
VG9wUG9zID0gbG9naWNhbFRvcFZhbHVlICsgbWFyZ2luQmVmb3JlQWxpYXM7CiAgICAgLy8gQm9y
ZGVyIGFuZCBwYWRkaW5nIGhhdmUgYWxyZWFkeSBiZWVuIGluY2x1ZGVkIGluIGNvbXB1dGVkVmFs
dWVzLm1fZXh0ZW50LgotICAgIGNvbXB1dGVMb2dpY2FsVG9wUG9zaXRpb25lZE9mZnNldChsb2dp
Y2FsVG9wUG9zLCB0aGlzLCBjb21wdXRlZFZhbHVlcy5tX2V4dGVudCwgY29udGFpbmVyQmxvY2ss
IGNvbnRhaW5lckxvZ2ljYWxIZWlnaHQpOworICAgIGNvbXB1dGVMb2dpY2FsVG9wUG9zaXRpb25l
ZE9mZnNldChsb2dpY2FsVG9wUG9zLCB0aGlzLCBjb21wdXRlZFZhbHVlcy5tX2V4dGVudCwgY29u
dGFpbmVyQmxvY2ssIGNvbnRhaW5lckxvZ2ljYWxIZWlnaHQsIHN0eWxlKCkubG9naWNhbFRvcCgp
LmlzQXV0bygpLCBzdHlsZSgpLmxvZ2ljYWxCb3R0b20oKS5pc0F1dG8oKSk7CiAgICAgY29tcHV0
ZWRWYWx1ZXMubV9wb3NpdGlvbiA9IGxvZ2ljYWxUb3BQb3M7CiB9CiAKZGlmZiAtLWdpdCBhL0xh
eW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA0ZjBiMWY5
N2E3ZWY1MWRhYTIzN2U5YTlkYWU4NTMwZjJlMzE1M2Q0Li5hZTM4MDE0Y2ZkOTQ5MzlkYzNiMmQ1
NzIzMjhlOWZmODJjZTA3NGM1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysr
IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMTEtMTcgIFJv
YiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBBZGQgb3Zlci1jb25zdHJhaW5l
ZCBkaXJlY3Rpb24gY2hlY2sgdG8gY29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0VXNpbmcK
KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjAxMgor
CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdEV4
cGVjdGF0aW9uczogUmVtb3ZlZCA1IHRlc3RzIHRoYXQgYXJlIG5vdyBwYXNzaW5nLgorICAgICAg
ICAqIHBsYXRmb3JtL2lvcy9UZXN0RXhwZWN0YXRpb25zOiBTa2lwcGVkIHNldmVyYWwgdGVzdHMg
dGhhdCBzaG93IDFweCBkaWZmIGluIHRoZSByZXN1bHQuCisKIDIwMjEtMTEtMTYgIFJvYiBCdWlz
ICA8cmJ1aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBSZS1hZGQgJ3N0eWxlJyB0byBjb250YWlu
OnN0cmljdCBhbmQgY29udGFpbjpjb250ZW50IENTUyBwcm9wZXJ0aWVzCmRpZmYgLS1naXQgYS9M
YXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9u
cwppbmRleCAyNDk3MTA5ZGI3Y2JkYjcyZmNkNGI3ZDgxYWNhYmNlMzIxNjhhZjc0Li5jZWZkNmNj
MTMzMWZkMWM4M2ExZWJmOGQ4ZmZkMDFhYmMzYmQ1MTY0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0
cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAg
LTQwMjksMTIgKzQwMjksOCBAQCB3ZWJraXQub3JnL2IvMjMwMDgwIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy10cmFuc2Zvcm1zL3R0d2YtdHJhbgogCiB3ZWJraXQub3Jn
L2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5n
LW1vZGVzL2NlbnRyYWwtYmFzZWxpbmUtYWxpZ25tZW50LTAwMy54aHQgWyBJbWFnZU9ubHlGYWls
dXJlIFBhc3MgXQogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9jbGVhcmFuY2UtY2FsY3VsYXRpb25zLXZybC0w
MDIueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBQYXNzIF0KLXdlYmtpdC5vcmcvYi8yMDkwODAgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBv
cy1ub24tcmVwbGFjZWQtaWNiLXZsci0wMzMueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJr
aXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13
cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLWljYi12cmwtMDMwLnhodCBbIEltYWdl
T25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12bHIt
MDk1LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5v
bi1yZXBsYWNlZC12bHItMjI1LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9i
LzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1t
b2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12bHItMjI5LnhodCBbIEltYWdlT25seUZhaWx1cmUg
XQotd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12cmwtMDg4LnhodCBbIElt
YWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12
cmwtMjIwLnhodCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9z
LW5vbi1yZXBsYWNlZC12cmwtMjI0LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9y
Zy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGlu
Zy1tb2Rlcy9hdmFpbGFibGUtc2l6ZS0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpAQCAt
NDU4MCw3ICs0NTc2LDYgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zbG90dGVkLXBsYWMKIAogIyAgY29udGFpbi1p
bnRyaW5zaWMtc2l6ZQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDE0Lmh0bWwgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAyMC5odG1s
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0
LXJhdGlvLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYz
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh
dGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAwNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJr
aXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z
aXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1sIFsgSW1hZ2VPbmx5
RmFpbHVyZSBdCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvVGVzdEV4cGVj
dGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9UZXN0RXhwZWN0YXRpb25zCmluZGV4
IGM0YjRlZGM5OGY1Y2UxODEzM2Y4MDZmZDkyNzlhOGNiZDRiNWM0NTEuLjkzYmVkZmY1MzNkMzIy
MzM0NDFiMmIxMDRiNzJiYjcwZDVmZmU0OTggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRm
b3JtL2lvcy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9U
ZXN0RXhwZWN0YXRpb25zCkBAIC0zNDk3LDYgKzM0OTcsNyBAQCBpbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2h0bWwvY2FudmFzL2VsZW1lbnQvd2lkZS1nYW11dC1jYW52YXMvMmQuY29s
b3Iucwogc3RvcmFnZS9pbmRleGVkZGIvc3RydWN0dXJlZC1jbG9uZS1pbWFnZS1kYXRhLWRpc3Bs
YXktcDMuaHRtbCBbIFBhc3MgXQogCiAjIFNob3cgMXB4IGRpZmYgaW4gdGhlIHJlc3VsdC4gTWF5
YmUgaGl0dGluZyB0aGUgYmFja2dyb3VuZCBibGVlZCBhdm9pZGFuY2UgY29kZSBwYXRoLgord2Vi
a2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
d3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12bHItMDk1LnhodCBbIEltYWdlT25s
eUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12bHItMTA5
LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1y
ZXBsYWNlZC12bHItMTI1LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIy
OTM5NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rl
cy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12bHItMTQxLnhodCBbIEltYWdlT25seUZhaWx1cmUgXQpA
QCAtMzUxNCw2ICszNTE1LDcgQEAgd2Via2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG8KIHdlYmtpdC5vcmcv
Yi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmct
bW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdnJsLTA1Mi54aHQgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KIHdlYmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdnJsLTA2NC54aHQgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQt
dnJsLTA3Ni54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KK3dlYmtpdC5vcmcvYi8yMjkzOTcgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBv
cy1ub24tcmVwbGFjZWQtdnJsLTA4OC54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5v
cmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRp
bmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdnJsLTEwNC54aHQgWyBJbWFnZU9ubHlGYWls
dXJlIF0KIHdlYmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdnJsLTEwOC54aHQg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFj
ZWQtdnJsLTExMi54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KQEAgLTM1MzIsNiArMzUzNCwxMCBA
QCB3ZWJraXQub3JnL2IvMjI5Mzk3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wbwogd2Via2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1y
ZXBsYWNlZC12cmwtMTkyLnhodCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIy
OTM5NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rl
cy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12cmwtMjA0LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQog
d2Via2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12cmwtMjA4LnhodCBbIEltYWdl
T25seUZhaWx1cmUgXQord2Via2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12cmwt
MjIwLnhodCBbIEltYWdlT25seUZhaWx1cmUgXQord2Via2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5v
bi1yZXBsYWNlZC12cmwtMjI0LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQord2Via2l0Lm9yZy9i
LzIyOTM5NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1t
b2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12bHItMjI1LnhodCBbIEltYWdlT25seUZhaWx1cmUg
XQord2Via2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12bHItMjI5LnhodCBbIElt
YWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9jbGlwLXJlY3QtdnJsLTAwMi54aHQg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvY2xpcC1yZWN0LXZybC0wMDQu
eGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjI5Mzk3IGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2NsaXAtcmVjdC12cmwt
MDA2LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>445824</attachid>
            <date>2021-12-03 02:15:40 -0800</date>
            <delta_ts>2021-12-07 02:12:44 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232012-20211203101539.patch</filename>
            <type>text/plain</type>
            <size>11650</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2NDg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTNkMGM4ZDg4OTA4MTAw
YjAyODFhMDU5M2VhOGE0YzEzYWE1MDc0Mi4uZGE4OTM3ZjczOTZhYzMwYTJmZmRiZWM3YjU5YmY2
YzEwZmQ3OGFkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTEyLTAzICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQWRkIG92ZXItY29uc3RyYWluZWQg
ZGlyZWN0aW9uIGNoZWNrIHRvIGNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFVzaW5nCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIwMTIKKwor
ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBjb21wdXRl
UG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyB0aGUgb3Zlci1jb25zdHJhaW5lZCBjYXNlIG5l
dmVyIHRvb2sgaW50bworICAgICAgICBhY2NvdW50IFJUTCBkaXJlY3Rpb24sIGJ1dCB0aGlzIHNo
b3VsZCBiZSBkb25lIGlmIHdlIGFyZSBhY3R1YWxseSBkZWFsaW5nIHdpdGggbGVmdC9yaWdodCBw
cm9wZXJ0aWVzLiBbMV0KKyAgICAgICAgRmluYWxseSwgY29tcHV0ZUxvZ2ljYWxUb3BQb3NpdGlv
bmVkT2Zmc2V0IHNob3VsZCBub3QgZG8gdGhlIGZsaXBwaW5nIGxvZ2ljIGluIHRoZSBvdmVyLWNv
bnN0cmFpbmVkIGNhc2UuCisKKyAgICAgICAgWzFdIGh0dHA6Ly93d3cudzMub3JnL1RSL2Nzcy13
cml0aW5nLW1vZGVzLTMvI3ZlcnRpY2FsLWxheW91dAorCisgICAgICAgICogcmVuZGVyaW5nL1Jl
bmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb21wdXRlTG9naWNhbFRvcFBvc2l0aW9u
ZWRPZmZzZXQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25l
ZExvZ2ljYWxIZWlnaHRVc2luZyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6
OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFJlcGxhY2VkIGNvbnN0KToKKwogMjAyMS0x
Mi0wMyAgQWxpY2lhIEJveWEgR2FyY8OtYSAgPGFib3lhQGlnYWxpYS5jb20+CiAKICAgICAgICAg
W01TRV0gRml4IGVyYXNlIHJhbmdlIHRvIHByZXZlbnQgYWNjaWRlbnRhbCBkZWxldGlvbiBpbiBm
aWxlcyB3aXRoIGNoYW5naW5nIGR1cmF0aW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv
cmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy
Qm94LmNwcAppbmRleCBlNzQwZDUyYTJiMDMyYTFhMmY0ZTQyZmVkY2M3ZDI5OTZjZWNhYTE1Li44
MjkwMWU2NDYyZmViOThmYjk3MjY5NjY0MDQ0YzY5MjJlZDM3M2Y3IDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y
ZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtNDM0MywxNyArNDM0MywyMCBAQCB2b2lkIFJlbmRl
ckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0KExvZ2ljYWxFeHRlbnRDb21wdXRl
ZFZhbHVlcyYgY29tcAogLy8gVGhlIHxjb250YWluZXJMb2dpY2FsSGVpZ2h0Rm9yUG9zaXRpb25l
ZHwgaXMgYWxyZWFkeSBhd2FyZSBvZiBvcnRob2dvbmFsIGZsb3dzLgogLy8gVGhlIGxvZ2ljYWxU
b3AgY29uY2VwdCBpcyBjb25mdXNpbmcgaGVyZS4gSXQncyB0aGUgbG9naWNhbCB0b3AgZnJvbSB0
aGUgY2hpbGQncyBQT1YuIFRoaXMgbWVhbnMgdGhhdCBpcyB0aGUgcGh5c2ljYWwKIC8vIHkgaWYg
dGhlIGNoaWxkIGlzIHZlcnRpY2FsIG9yIHRoZSBwaHlzaWNhbCB4IGlmIHRoZSBjaGlsZCBpcyBo
b3Jpem9udGFsLgotc3RhdGljIHZvaWQgY29tcHV0ZUxvZ2ljYWxUb3BQb3NpdGlvbmVkT2Zmc2V0
KExheW91dFVuaXQmIGxvZ2ljYWxUb3BQb3MsIGNvbnN0IFJlbmRlckJveCogY2hpbGQsIExheW91
dFVuaXQgbG9naWNhbEhlaWdodFZhbHVlLCBjb25zdCBSZW5kZXJCb3hNb2RlbE9iamVjdCYgY29u
dGFpbmVyQmxvY2ssIExheW91dFVuaXQgY29udGFpbmVyTG9naWNhbEhlaWdodEZvclBvc2l0aW9u
ZWQpCitzdGF0aWMgdm9pZCBjb21wdXRlTG9naWNhbFRvcFBvc2l0aW9uZWRPZmZzZXQoTGF5b3V0
VW5pdCYgbG9naWNhbFRvcFBvcywgY29uc3QgUmVuZGVyQm94KiBjaGlsZCwgTGF5b3V0VW5pdCBs
b2dpY2FsSGVpZ2h0VmFsdWUsIGNvbnN0IFJlbmRlckJveE1vZGVsT2JqZWN0JiBjb250YWluZXJC
bG9jaywgTGF5b3V0VW5pdCBjb250YWluZXJMb2dpY2FsSGVpZ2h0Rm9yUG9zaXRpb25lZCwgYm9v
bCBsb2dpY2FsVG9wSXNBdXRvLCBib29sIGxvZ2ljYWxCb3R0b21Jc0F1dG8pCiB7Ci0gICAgYXV0
byBsb2dpY2FsVG9wQW5kQm90dG9tQXJlQXV0byA9IGNoaWxkLT5zdHlsZSgpLmxvZ2ljYWxUb3Ao
KS5pc0F1dG8oKSAmJiBjaGlsZC0+c3R5bGUoKS5sb2dpY2FsQm90dG9tKCkuaXNBdXRvKCk7Cisg
ICAgYXV0byBsb2dpY2FsVG9wQW5kQm90dG9tQXJlQXV0byA9IGxvZ2ljYWxUb3BJc0F1dG8gJiYg
bG9naWNhbEJvdHRvbUlzQXV0bzsKICAgICBhdXRvIGhhdmVPcnRob2dvbmFsV3JpdGluZ01vZGVz
ID0gaXNPcnRob2dvbmFsKCpjaGlsZCwgY29udGFpbmVyQmxvY2spOwogICAgIGF1dG8gaGF2ZUZs
aXBwZWRCbG9ja0F4aXMgPSBjaGlsZC0+c3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9k
ZSgpICE9IGNvbnRhaW5lckJsb2NrLnN0eWxlKCkuaXNGbGlwcGVkQmxvY2tzV3JpdGluZ01vZGUo
KTsKKyAgICBib29sIGlzT3ZlcmNvbnN0cmFpbmVkID0gIWxvZ2ljYWxUb3BJc0F1dG8gJiYgIWxv
Z2ljYWxCb3R0b21Jc0F1dG8gJiYgIWNoaWxkLT5zdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKS5pc0F1
dG8oKTsKIAogICAgIC8vIERlYWwgd2l0aCBkaWZmZXJpbmcgd3JpdGluZyBtb2RlcyBoZXJlLiAg
T3VyIG9mZnNldCBuZWVkcyB0byBiZSBpbiB0aGUgY29udGFpbmluZyBibG9jaydzIGNvb3JkaW5h
dGUgc3BhY2UuIElmIHRoZSBjb250YWluaW5nIGJsb2NrIGlzIGZsaXBwZWQKICAgICAvLyBhbG9u
ZyB0aGlzIGF4aXMsIHRoZW4gd2UgbmVlZCB0byBmbGlwIHRoZSBjb29yZGluYXRlLiAgVGhpcyBj
YW4gb25seSBoYXBwZW4gaWYgdGhlIGNvbnRhaW5pbmcgYmxvY2sgaXMgYm90aCBhIGZsaXBwZWQg
bW9kZSBhbmQgcGVycGVuZGljdWxhciB0byB1cy4KLSAgICBpZiAoKGhhdmVPcnRob2dvbmFsV3Jp
dGluZ01vZGVzICYmICFsb2dpY2FsVG9wQW5kQm90dG9tQXJlQXV0byAmJiBjaGlsZC0+c3R5bGUo
KS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9kZSgpKQotICAgICAgICB8fCAoaGF2ZUZsaXBwZWRC
bG9ja0F4aXMgJiYgIWhhdmVPcnRob2dvbmFsV3JpdGluZ01vZGVzKSkKLSAgICAgICAgbG9naWNh
bFRvcFBvcyA9IGNvbnRhaW5lckxvZ2ljYWxIZWlnaHRGb3JQb3NpdGlvbmVkIC0gbG9naWNhbEhl
aWdodFZhbHVlIC0gbG9naWNhbFRvcFBvczsKKyAgICBpZiAoIWlzT3ZlcmNvbnN0cmFpbmVkKSB7
CisgICAgICAgIGlmICgoaGF2ZU9ydGhvZ29uYWxXcml0aW5nTW9kZXMgJiYgIWxvZ2ljYWxUb3BB
bmRCb3R0b21BcmVBdXRvICYmIGNoaWxkLT5zdHlsZSgpLmlzRmxpcHBlZEJsb2Nrc1dyaXRpbmdN
b2RlKCkpCisgICAgICAgICAgICB8fCAoaGF2ZUZsaXBwZWRCbG9ja0F4aXMgJiYgIWhhdmVPcnRo
b2dvbmFsV3JpdGluZ01vZGVzKSkKKyAgICAgICAgICAgIGxvZ2ljYWxUb3BQb3MgPSBjb250YWlu
ZXJMb2dpY2FsSGVpZ2h0Rm9yUG9zaXRpb25lZCAtIGxvZ2ljYWxIZWlnaHRWYWx1ZSAtIGxvZ2lj
YWxUb3BQb3M7CisgICAgfQogCiAgICAgLy8gT3VyIG9mZnNldCBpcyBmcm9tIHRoZSBsb2dpY2Fs
IGJvdHRvbSBlZGdlIGluIGEgZmxpcHBlZCBlbnZpcm9ubWVudCwgZS5nLiwgcmlnaHQgZm9yIHZl
cnRpY2FsLXJsIGFuZCBib3R0b20gZm9yIGhvcml6b250YWwtYnQuCiAgICAgaWYgKGNvbnRhaW5l
ckJsb2NrLnN0eWxlKCkuaXNGbGlwcGVkQmxvY2tzV3JpdGluZ01vZGUoKSAmJiAhaGF2ZU9ydGhv
Z29uYWxXcml0aW5nTW9kZXMpIHsKQEAgLTQ0NDgsNiArNDQ1MSwxNCBAQCB2b2lkIFJlbmRlckJv
eDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0VXNpbmcoU2l6ZVR5cGUgaGVpZ2h0VHlw
ZSwgTGVuZ3RoCiAgICAgICAgICAgICAvLyBPdmVyLWNvbnN0cmFpbmVkLCAobm8gbmVlZCBzb2x2
ZSBmb3IgYm90dG9tKQogICAgICAgICAgICAgY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fYmVm
b3JlID0gdmFsdWVGb3JMZW5ndGgobWFyZ2luQmVmb3JlLCBjb250YWluZXJSZWxhdGl2ZUxvZ2lj
YWxXaWR0aCk7CiAgICAgICAgICAgICBjb21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9hZnRlciA9
IHZhbHVlRm9yTGVuZ3RoKG1hcmdpbkFmdGVyLCBjb250YWluZXJSZWxhdGl2ZUxvZ2ljYWxXaWR0
aCk7CisKKyAgICAgICAgICAgIGlmIChpc09ydGhvZ29uYWwoKnRoaXMsIGNvbnRhaW5lckJsb2Nr
KSkgeworICAgICAgICAgICAgICAgIGxvZ2ljYWxUb3BWYWx1ZSA9IHZhbHVlRm9yTGVuZ3RoKHN0
eWxlKCkubGVmdCgpLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0KTsKKyAgICAgICAgICAgICAgICBp
ZiAoY29udGFpbmVyQmxvY2suc3R5bGUoKS5kaXJlY3Rpb24oKSA9PSBUZXh0RGlyZWN0aW9uOjpS
VEwpIHsKKyAgICAgICAgICAgICAgICAgICAgTGF5b3V0VW5pdCBhdmFpbGFibGVTcGFjZSA9IGNv
bnRhaW5lckxvZ2ljYWxIZWlnaHQgLSAobG9naWNhbFRvcFZhbHVlICsgbG9naWNhbEhlaWdodFZh
bHVlICsgdmFsdWVGb3JMZW5ndGgoc3R5bGUoKS5yaWdodCgpLCBjb250YWluZXJMb2dpY2FsSGVp
Z2h0KSArIGJvcmRlcnNQbHVzUGFkZGluZyk7CisgICAgICAgICAgICAgICAgICAgIGxvZ2ljYWxU
b3BWYWx1ZSA9IChhdmFpbGFibGVTcGFjZSArIGxvZ2ljYWxUb3BWYWx1ZSkgLSBjb21wdXRlZFZh
bHVlcy5tX21hcmdpbnMubV9iZWZvcmUgLSBjb21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9hZnRl
cjsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9IGVs
c2UgewogICAgICAgICAvKi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tKlwKQEAgLTQ1MDgsNyArNDUxOSw3IEBAIHZvaWQg
UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyhTaXplVHlwZSBo
ZWlnaHRUeXBlLCBMZW5ndGgKIAogICAgIC8vIFVzZSBjb21wdXRlZCB2YWx1ZXMgdG8gY2FsY3Vs
YXRlIHRoZSB2ZXJ0aWNhbCBwb3NpdGlvbi4KICAgICBjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9u
ID0gbG9naWNhbFRvcFZhbHVlICsgY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fYmVmb3JlOwot
ICAgIGNvbXB1dGVMb2dpY2FsVG9wUG9zaXRpb25lZE9mZnNldChjb21wdXRlZFZhbHVlcy5tX3Bv
c2l0aW9uLCB0aGlzLCBsb2dpY2FsSGVpZ2h0VmFsdWUgKyBib3JkZXJzUGx1c1BhZGRpbmcsIGNv
bnRhaW5lckJsb2NrLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0KTsKKyAgICBjb21wdXRlTG9naWNh
bFRvcFBvc2l0aW9uZWRPZmZzZXQoY29tcHV0ZWRWYWx1ZXMubV9wb3NpdGlvbiwgdGhpcywgbG9n
aWNhbEhlaWdodFZhbHVlICsgYm9yZGVyc1BsdXNQYWRkaW5nLCBjb250YWluZXJCbG9jaywgY29u
dGFpbmVyTG9naWNhbEhlaWdodCwgc3R5bGUoKS5sb2dpY2FsVG9wKCkuaXNBdXRvKCksIHN0eWxl
KCkubG9naWNhbEJvdHRvbSgpLmlzQXV0bygpKTsKIH0KIAogdm9pZCBSZW5kZXJCb3g6OmNvbXB1
dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoUmVwbGFjZWQoTG9naWNhbEV4dGVudENvbXB1dGVkVmFs
dWVzJiBjb21wdXRlZFZhbHVlcykgY29uc3QKQEAgLTQ4MDcsNyArNDgxOCw3IEBAIHZvaWQgUmVu
ZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRSZXBsYWNlZChMb2dpY2FsRXh0
ZW50Q29tcHV0ZWRWYWx1CiAgICAgLy8gVXNlIGNvbXB1dGVkIHZhbHVlcyB0byBjYWxjdWxhdGUg
dGhlIHZlcnRpY2FsIHBvc2l0aW9uLgogICAgIExheW91dFVuaXQgbG9naWNhbFRvcFBvcyA9IGxv
Z2ljYWxUb3BWYWx1ZSArIG1hcmdpbkJlZm9yZUFsaWFzOwogICAgIC8vIEJvcmRlciBhbmQgcGFk
ZGluZyBoYXZlIGFscmVhZHkgYmVlbiBpbmNsdWRlZCBpbiBjb21wdXRlZFZhbHVlcy5tX2V4dGVu
dC4KLSAgICBjb21wdXRlTG9naWNhbFRvcFBvc2l0aW9uZWRPZmZzZXQobG9naWNhbFRvcFBvcywg
dGhpcywgY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQsIGNvbnRhaW5lckJsb2NrLCBjb250YWluZXJM
b2dpY2FsSGVpZ2h0KTsKKyAgICBjb21wdXRlTG9naWNhbFRvcFBvc2l0aW9uZWRPZmZzZXQobG9n
aWNhbFRvcFBvcywgdGhpcywgY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQsIGNvbnRhaW5lckJsb2Nr
LCBjb250YWluZXJMb2dpY2FsSGVpZ2h0LCBzdHlsZSgpLmxvZ2ljYWxUb3AoKS5pc0F1dG8oKSwg
c3R5bGUoKS5sb2dpY2FsQm90dG9tKCkuaXNBdXRvKCkpOwogICAgIGNvbXB1dGVkVmFsdWVzLm1f
cG9zaXRpb24gPSBsb2dpY2FsVG9wUG9zOwogfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9D
aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggODY2Yjc0ODM0YTViNDJmZGYy
MGZlZmU0Mzk3YWQwN2ZiYmU1NGJhMC4uYjY3MjEyOTE3ZmJmYzNhMjAwZjRkZjBiMmU2ZDdkM2Ez
YWU1ZGNmZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRl
c3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIxLTEyLTAzICBSb2IgQnVpcyAgPHJi
dWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQWRkIG92ZXItY29uc3RyYWluZWQgZGlyZWN0aW9u
IGNoZWNrIHRvIGNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFVzaW5nCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIwMTIKKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6
IFJlbW92ZWQgNSB0ZXN0cyB0aGF0IGFyZSBub3cgcGFzc2luZy4KKwogMjAyMS0xMi0wMyAgQWxp
Y2lhIEJveWEgR2FyY8OtYSAgPGFib3lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW01TRV0gRml4
IGVyYXNlIHJhbmdlIHRvIHByZXZlbnQgYWNjaWRlbnRhbCBkZWxldGlvbiBpbiBmaWxlcyB3aXRo
IGNoYW5naW5nIGR1cmF0aW9ucwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0
aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggNzAwMGMwMjEzNWZiNzNm
OWRmYTQwZmIzNGNiZWZjNDY2NDFiZGIyOC4uNjgwZTQxZmM3MzcxNDlhNTQ1ZDlhY2VlODM0MTAx
ODZkOTE0YzEyOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysg
Yi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00MDEyLDEwICs0MDEyLDYgQEAgd2Vi
a2l0Lm9yZy9iLzIzMDA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
dHJhbnNmb3Jtcy90dHdmLXRyYW4KIAogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9jZW50cmFsLWJhc2VsaW5l
LWFsaWdubWVudC0wMDMueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBQYXNzIF0KIHdlYmtpdC5vcmcv
Yi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmct
bW9kZXMvY2xlYXJhbmNlLWNhbGN1bGF0aW9ucy12cmwtMDAyLnhodCBbIEltYWdlT25seUZhaWx1
cmUgUGFzcyBdCi13ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLWljYi12bHIt
MDMzLnhodCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5v
bi1yZXBsYWNlZC1pY2ItdnJsLTAzMC54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5v
cmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRp
bmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdmxyLTA5NS54aHQgWyBJbWFnZU9ubHlGYWls
dXJlIF0KLXdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdnJsLTA4OC54aHQg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYXZhaWxhYmxlLXNpemUtMDAx
Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYXZhaWxhYmxlLXNp
emUtMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYXZhaWxh
YmxlLXNpemUtMDAzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KQEAgLTQ1NjAsNyArNDU1Niw2
IEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXNjb3Bpbmcvc2xvdHRlZC1wbGFjCiAKICMgIGNvbnRhaW4taW50cmluc2ljLXNpemUK
IHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMjAuaHRtbCBbIEltYWdlT25seUZh
aWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDIuaHRt
bCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVj
dC1yYXRpby0wMDQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2
MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y
YXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpkaWZm
IC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlv
dXRUZXN0cy9wbGF0Zm9ybS9pb3MvVGVzdEV4cGVjdGF0aW9ucwppbmRleCBkODUyMmI3NTRkOTM5
YWZhYzFkZWY1MjIwMzQxOTg1NDU2OTlkNThkLi5kNTA0NGE1Zjg3ZWQ5NTBiYWVkN2UzMmUzYTI2
ZDFlNjM5MWIzNGJjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvVGVzdEV4
cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvVGVzdEV4cGVjdGF0aW9u
cwpAQCAtMzUwMCw2ICszNTAwLDcgQEAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9o
dG1sL2NhbnZhcy9lbGVtZW50L3dpZGUtZ2FtdXQtY2FudmFzLzJkLmNvbG9yLnMKIHN0b3JhZ2Uv
aW5kZXhlZGRiL3N0cnVjdHVyZWQtY2xvbmUtaW1hZ2UtZGF0YS1kaXNwbGF5LXAzLmh0bWwgWyBQ
YXNzIF0KIAogIyBTaG93IDFweCBkaWZmIGluIHRoZSByZXN1bHQuIE1heWJlIGhpdHRpbmcgdGhl
IGJhY2tncm91bmQgYmxlZWQgYXZvaWRhbmNlIGNvZGUgcGF0aC4KK3dlYmtpdC5vcmcvYi8yMjkz
OTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMv
YWJzLXBvcy1ub24tcmVwbGFjZWQtdmxyLTA5NS54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdl
YmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdmxyLTEwOS54aHQgWyBJbWFnZU9u
bHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdmxyLTEy
NS54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24t
cmVwbGFjZWQtdmxyLTE0MS54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KQEAgLTM1MTcsNiArMzUx
OCw3IEBAIHdlYmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvCiB3ZWJraXQub3JnL2IvMjI5Mzk3IGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mt
bm9uLXJlcGxhY2VkLXZybC0wNTIueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3Jn
L2IvMjI5Mzk3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5n
LW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZybC0wNjQueGh0IFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCiB3ZWJraXQub3JnL2IvMjI5Mzk3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZybC0wNzYueGh0IFsg
SW1hZ2VPbmx5RmFpbHVyZSBdCit3ZWJraXQub3JnL2IvMjI5Mzk3IGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2Vk
LXZybC0wODgueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjI5Mzk3IGlt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1w
b3Mtbm9uLXJlcGxhY2VkLXZybC0xMDQueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQu
b3JnL2IvMjI5Mzk3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0
aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZybC0xMDgueGh0IFsgSW1hZ2VPbmx5RmFp
bHVyZSBdCiB3ZWJraXQub3JnL2IvMjI5Mzk3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZybC0xMTIueGh0
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>446140</attachid>
            <date>2021-12-07 02:12:48 -0800</date>
            <delta_ts>2022-01-14 01:38:46 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232012-20211207101247.patch</filename>
            <type>text/plain</type>
            <size>11772</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2NTkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzAxMzUwMmRmOTE2N2Ji
ZjNkNDk1NjAzZDc2YjYyYjMxMDgzYTRjZi4uMDNkYTQ5YTk2M2MzYzBhYjRlZjEzYjc3NjY5NTY5
ZDQ1OTRhYmUxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTEyLTA3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQWRkIG92ZXItY29uc3RyYWluZWQg
ZGlyZWN0aW9uIGNoZWNrIHRvIGNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFVzaW5nCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIwMTIKKwor
ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBjb21wdXRl
UG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyB0aGUgb3Zlci1jb25zdHJhaW5lZCBjYXNlIG5l
dmVyIHRvb2sgaW50bworICAgICAgICBhY2NvdW50IFJUTCBkaXJlY3Rpb24sIGJ1dCB0aGlzIHNo
b3VsZCBiZSBkb25lIGlmIHdlIGFyZSBhY3R1YWxseSBkZWFsaW5nIHdpdGggbGVmdC9yaWdodCBw
cm9wZXJ0aWVzLiBbMV0KKyAgICAgICAgRmluYWxseSwgY29tcHV0ZUxvZ2ljYWxUb3BQb3NpdGlv
bmVkT2Zmc2V0IHNob3VsZCBub3QgZG8gdGhlIGZsaXBwaW5nIGxvZ2ljIGluIHRoZSBvdmVyLWNv
bnN0cmFpbmVkIGNhc2UuCisKKyAgICAgICAgWzFdIGh0dHA6Ly93d3cudzMub3JnL1RSL2Nzcy13
cml0aW5nLW1vZGVzLTMvI3ZlcnRpY2FsLWxheW91dAorCisgICAgICAgICogcmVuZGVyaW5nL1Jl
bmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb21wdXRlTG9naWNhbFRvcFBvc2l0aW9u
ZWRPZmZzZXQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25l
ZExvZ2ljYWxIZWlnaHRVc2luZyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6
OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFJlcGxhY2VkIGNvbnN0KToKKwogMjAyMS0x
Mi0wNyAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQHdlYmtpdC5vcmc+CiAKICAgICAgICAg
cGVyc3BlY3RpdmUoKSA8PSAxcHggc2hvdWxkIGJlIGNsYW1wZWQgdG8gMXB4CmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IGU3NDBkNTJhMmIwMzJhMWEyZjRlNDJmZWRj
YzdkMjk5NmNlY2FhMTUuLmJmN2IwZDljMzQ4MTM2MDAwYzAxODA3NmJmZjUyMjBlNWI3NWM4ODAg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBi
L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC00MzQzLDE3ICs0MzQz
LDIwIEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHQoTG9n
aWNhbEV4dGVudENvbXB1dGVkVmFsdWVzJiBjb21wCiAvLyBUaGUgfGNvbnRhaW5lckxvZ2ljYWxI
ZWlnaHRGb3JQb3NpdGlvbmVkfCBpcyBhbHJlYWR5IGF3YXJlIG9mIG9ydGhvZ29uYWwgZmxvd3Mu
CiAvLyBUaGUgbG9naWNhbFRvcCBjb25jZXB0IGlzIGNvbmZ1c2luZyBoZXJlLiBJdCdzIHRoZSBs
b2dpY2FsIHRvcCBmcm9tIHRoZSBjaGlsZCdzIFBPVi4gVGhpcyBtZWFucyB0aGF0IGlzIHRoZSBw
aHlzaWNhbAogLy8geSBpZiB0aGUgY2hpbGQgaXMgdmVydGljYWwgb3IgdGhlIHBoeXNpY2FsIHgg
aWYgdGhlIGNoaWxkIGlzIGhvcml6b250YWwuCi1zdGF0aWMgdm9pZCBjb21wdXRlTG9naWNhbFRv
cFBvc2l0aW9uZWRPZmZzZXQoTGF5b3V0VW5pdCYgbG9naWNhbFRvcFBvcywgY29uc3QgUmVuZGVy
Qm94KiBjaGlsZCwgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0VmFsdWUsIGNvbnN0IFJlbmRlckJv
eE1vZGVsT2JqZWN0JiBjb250YWluZXJCbG9jaywgTGF5b3V0VW5pdCBjb250YWluZXJMb2dpY2Fs
SGVpZ2h0Rm9yUG9zaXRpb25lZCkKK3N0YXRpYyB2b2lkIGNvbXB1dGVMb2dpY2FsVG9wUG9zaXRp
b25lZE9mZnNldChMYXlvdXRVbml0JiBsb2dpY2FsVG9wUG9zLCBjb25zdCBSZW5kZXJCb3gqIGNo
aWxkLCBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHRWYWx1ZSwgY29uc3QgUmVuZGVyQm94TW9kZWxP
YmplY3QmIGNvbnRhaW5lckJsb2NrLCBMYXlvdXRVbml0IGNvbnRhaW5lckxvZ2ljYWxIZWlnaHRG
b3JQb3NpdGlvbmVkLCBib29sIGxvZ2ljYWxUb3BJc0F1dG8sIGJvb2wgbG9naWNhbEJvdHRvbUlz
QXV0bykKIHsKLSAgICBhdXRvIGxvZ2ljYWxUb3BBbmRCb3R0b21BcmVBdXRvID0gY2hpbGQtPnN0
eWxlKCkubG9naWNhbFRvcCgpLmlzQXV0bygpICYmIGNoaWxkLT5zdHlsZSgpLmxvZ2ljYWxCb3R0
b20oKS5pc0F1dG8oKTsKKyAgICBhdXRvIGxvZ2ljYWxUb3BBbmRCb3R0b21BcmVBdXRvID0gbG9n
aWNhbFRvcElzQXV0byAmJiBsb2dpY2FsQm90dG9tSXNBdXRvOwogICAgIGF1dG8gaGF2ZU9ydGhv
Z29uYWxXcml0aW5nTW9kZXMgPSBpc09ydGhvZ29uYWwoKmNoaWxkLCBjb250YWluZXJCbG9jayk7
CiAgICAgYXV0byBoYXZlRmxpcHBlZEJsb2NrQXhpcyA9IGNoaWxkLT5zdHlsZSgpLmlzRmxpcHBl
ZEJsb2Nrc1dyaXRpbmdNb2RlKCkgIT0gY29udGFpbmVyQmxvY2suc3R5bGUoKS5pc0ZsaXBwZWRC
bG9ja3NXcml0aW5nTW9kZSgpOworICAgIGJvb2wgaXNPdmVyY29uc3RyYWluZWQgPSAhbG9naWNh
bFRvcElzQXV0byAmJiAhbG9naWNhbEJvdHRvbUlzQXV0byAmJiAhY2hpbGQtPnN0eWxlKCkubG9n
aWNhbEhlaWdodCgpLmlzQXV0bygpOwogCiAgICAgLy8gRGVhbCB3aXRoIGRpZmZlcmluZyB3cml0
aW5nIG1vZGVzIGhlcmUuICBPdXIgb2Zmc2V0IG5lZWRzIHRvIGJlIGluIHRoZSBjb250YWluaW5n
IGJsb2NrJ3MgY29vcmRpbmF0ZSBzcGFjZS4gSWYgdGhlIGNvbnRhaW5pbmcgYmxvY2sgaXMgZmxp
cHBlZAogICAgIC8vIGFsb25nIHRoaXMgYXhpcywgdGhlbiB3ZSBuZWVkIHRvIGZsaXAgdGhlIGNv
b3JkaW5hdGUuICBUaGlzIGNhbiBvbmx5IGhhcHBlbiBpZiB0aGUgY29udGFpbmluZyBibG9jayBp
cyBib3RoIGEgZmxpcHBlZCBtb2RlIGFuZCBwZXJwZW5kaWN1bGFyIHRvIHVzLgotICAgIGlmICgo
aGF2ZU9ydGhvZ29uYWxXcml0aW5nTW9kZXMgJiYgIWxvZ2ljYWxUb3BBbmRCb3R0b21BcmVBdXRv
ICYmIGNoaWxkLT5zdHlsZSgpLmlzRmxpcHBlZEJsb2Nrc1dyaXRpbmdNb2RlKCkpCi0gICAgICAg
IHx8IChoYXZlRmxpcHBlZEJsb2NrQXhpcyAmJiAhaGF2ZU9ydGhvZ29uYWxXcml0aW5nTW9kZXMp
KQotICAgICAgICBsb2dpY2FsVG9wUG9zID0gY29udGFpbmVyTG9naWNhbEhlaWdodEZvclBvc2l0
aW9uZWQgLSBsb2dpY2FsSGVpZ2h0VmFsdWUgLSBsb2dpY2FsVG9wUG9zOworICAgIGlmICghaXNP
dmVyY29uc3RyYWluZWQpIHsKKyAgICAgICAgaWYgKChoYXZlT3J0aG9nb25hbFdyaXRpbmdNb2Rl
cyAmJiAhbG9naWNhbFRvcEFuZEJvdHRvbUFyZUF1dG8gJiYgY2hpbGQtPnN0eWxlKCkuaXNGbGlw
cGVkQmxvY2tzV3JpdGluZ01vZGUoKSkKKyAgICAgICAgICAgIHx8IChoYXZlRmxpcHBlZEJsb2Nr
QXhpcyAmJiAhaGF2ZU9ydGhvZ29uYWxXcml0aW5nTW9kZXMpKQorICAgICAgICAgICAgbG9naWNh
bFRvcFBvcyA9IGNvbnRhaW5lckxvZ2ljYWxIZWlnaHRGb3JQb3NpdGlvbmVkIC0gbG9naWNhbEhl
aWdodFZhbHVlIC0gbG9naWNhbFRvcFBvczsKKyAgICB9CiAKICAgICAvLyBPdXIgb2Zmc2V0IGlz
IGZyb20gdGhlIGxvZ2ljYWwgYm90dG9tIGVkZ2UgaW4gYSBmbGlwcGVkIGVudmlyb25tZW50LCBl
LmcuLCByaWdodCBmb3IgdmVydGljYWwtcmwgYW5kIGJvdHRvbSBmb3IgaG9yaXpvbnRhbC1idC4K
ICAgICBpZiAoY29udGFpbmVyQmxvY2suc3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9k
ZSgpICYmICFoYXZlT3J0aG9nb25hbFdyaXRpbmdNb2RlcykgewpAQCAtNDQ0OCw2ICs0NDUxLDE2
IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyhT
aXplVHlwZSBoZWlnaHRUeXBlLCBMZW5ndGgKICAgICAgICAgICAgIC8vIE92ZXItY29uc3RyYWlu
ZWQsIChubyBuZWVkIHNvbHZlIGZvciBib3R0b20pCiAgICAgICAgICAgICBjb21wdXRlZFZhbHVl
cy5tX21hcmdpbnMubV9iZWZvcmUgPSB2YWx1ZUZvckxlbmd0aChtYXJnaW5CZWZvcmUsIGNvbnRh
aW5lclJlbGF0aXZlTG9naWNhbFdpZHRoKTsKICAgICAgICAgICAgIGNvbXB1dGVkVmFsdWVzLm1f
bWFyZ2lucy5tX2FmdGVyID0gdmFsdWVGb3JMZW5ndGgobWFyZ2luQWZ0ZXIsIGNvbnRhaW5lclJl
bGF0aXZlTG9naWNhbFdpZHRoKTsKKworICAgICAgICAgICAgaWYgKGlzT3J0aG9nb25hbCgqdGhp
cywgY29udGFpbmVyQmxvY2spKSB7CisgICAgICAgICAgICAgICAgLy8gV2hlbiBvcnRob2dvbmFs
IHdlIHdhbnQgdG8gZXhwbGljaXRseSBkZWFsIHdpdGggbGVmdC9yaWdodCBpbnN0ZWFkIG9mIHRv
cC9ib3R0b20sIHNvIGNvbXB1dGUgcGh5c2ljYWwgbGVmdCBuZXh0LgorICAgICAgICAgICAgICAg
IGxvZ2ljYWxUb3BWYWx1ZSA9IHZhbHVlRm9yTGVuZ3RoKHN0eWxlKCkubGVmdCgpLCBjb250YWlu
ZXJMb2dpY2FsSGVpZ2h0KTsKKyAgICAgICAgICAgICAgICBpZiAoY29udGFpbmVyQmxvY2suc3R5
bGUoKS5kaXJlY3Rpb24oKSA9PSBUZXh0RGlyZWN0aW9uOjpSVEwpIHsKKyAgICAgICAgICAgICAg
ICAgICAgLy8gUmVjb21wdXRlIGF2YWlsYWJsZVNwYWNlIHdpdGggcGh5c2ljYWwgbGVmdC4KKyAg
ICAgICAgICAgICAgICAgICAgTGF5b3V0VW5pdCBhdmFpbGFibGVTcGFjZSA9IGNvbnRhaW5lckxv
Z2ljYWxIZWlnaHQgLSAobG9naWNhbFRvcFZhbHVlICsgbG9naWNhbEhlaWdodFZhbHVlICsgdmFs
dWVGb3JMZW5ndGgoc3R5bGUoKS5yaWdodCgpLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0KSArIGJv
cmRlcnNQbHVzUGFkZGluZyk7CisgICAgICAgICAgICAgICAgICAgIGxvZ2ljYWxUb3BWYWx1ZSA9
IChhdmFpbGFibGVTcGFjZSArIGxvZ2ljYWxUb3BWYWx1ZSkgLSBjb21wdXRlZFZhbHVlcy5tX21h
cmdpbnMubV9iZWZvcmUgLSBjb21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9hZnRlcjsKKyAgICAg
ICAgICAgICAgICB9CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9IGVsc2UgewogICAg
ICAgICAvKi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tKlwKQEAgLTQ1MDgsNyArNDUyMSw3IEBAIHZvaWQgUmVuZGVyQm94
Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyhTaXplVHlwZSBoZWlnaHRUeXBl
LCBMZW5ndGgKIAogICAgIC8vIFVzZSBjb21wdXRlZCB2YWx1ZXMgdG8gY2FsY3VsYXRlIHRoZSB2
ZXJ0aWNhbCBwb3NpdGlvbi4KICAgICBjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9uID0gbG9naWNh
bFRvcFZhbHVlICsgY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fYmVmb3JlOwotICAgIGNvbXB1
dGVMb2dpY2FsVG9wUG9zaXRpb25lZE9mZnNldChjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9uLCB0
aGlzLCBsb2dpY2FsSGVpZ2h0VmFsdWUgKyBib3JkZXJzUGx1c1BhZGRpbmcsIGNvbnRhaW5lckJs
b2NrLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0KTsKKyAgICBjb21wdXRlTG9naWNhbFRvcFBvc2l0
aW9uZWRPZmZzZXQoY29tcHV0ZWRWYWx1ZXMubV9wb3NpdGlvbiwgdGhpcywgbG9naWNhbEhlaWdo
dFZhbHVlICsgYm9yZGVyc1BsdXNQYWRkaW5nLCBjb250YWluZXJCbG9jaywgY29udGFpbmVyTG9n
aWNhbEhlaWdodCwgc3R5bGUoKS5sb2dpY2FsVG9wKCkuaXNBdXRvKCksIHN0eWxlKCkubG9naWNh
bEJvdHRvbSgpLmlzQXV0bygpKTsKIH0KIAogdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlv
bmVkTG9naWNhbFdpZHRoUmVwbGFjZWQoTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzJiBjb21w
dXRlZFZhbHVlcykgY29uc3QKQEAgLTQ4MDcsNyArNDgyMCw3IEBAIHZvaWQgUmVuZGVyQm94Ojpj
b21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRSZXBsYWNlZChMb2dpY2FsRXh0ZW50Q29tcHV0
ZWRWYWx1CiAgICAgLy8gVXNlIGNvbXB1dGVkIHZhbHVlcyB0byBjYWxjdWxhdGUgdGhlIHZlcnRp
Y2FsIHBvc2l0aW9uLgogICAgIExheW91dFVuaXQgbG9naWNhbFRvcFBvcyA9IGxvZ2ljYWxUb3BW
YWx1ZSArIG1hcmdpbkJlZm9yZUFsaWFzOwogICAgIC8vIEJvcmRlciBhbmQgcGFkZGluZyBoYXZl
IGFscmVhZHkgYmVlbiBpbmNsdWRlZCBpbiBjb21wdXRlZFZhbHVlcy5tX2V4dGVudC4KLSAgICBj
b21wdXRlTG9naWNhbFRvcFBvc2l0aW9uZWRPZmZzZXQobG9naWNhbFRvcFBvcywgdGhpcywgY29t
cHV0ZWRWYWx1ZXMubV9leHRlbnQsIGNvbnRhaW5lckJsb2NrLCBjb250YWluZXJMb2dpY2FsSGVp
Z2h0KTsKKyAgICBjb21wdXRlTG9naWNhbFRvcFBvc2l0aW9uZWRPZmZzZXQobG9naWNhbFRvcFBv
cywgdGhpcywgY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQsIGNvbnRhaW5lckJsb2NrLCBjb250YWlu
ZXJMb2dpY2FsSGVpZ2h0LCBzdHlsZSgpLmxvZ2ljYWxUb3AoKS5pc0F1dG8oKSwgc3R5bGUoKS5s
b2dpY2FsQm90dG9tKCkuaXNBdXRvKCkpOwogICAgIGNvbXB1dGVkVmFsdWVzLm1fcG9zaXRpb24g
PSBsb2dpY2FsVG9wUG9zOwogfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cg
Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggY2QzZDgxNmMwOTYxNDZjMmYxZDY5OTEwNDIw
NjNiZWZkZGU2NGQzYy4uMTdiOWYyMjE0ZWNhMzFlMGUzZTkyODM2NzA1ZTdiYWEwMWZmMDQyZiAx
MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n
ZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIxLTEyLTA3ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxp
YS5jb20+CisKKyAgICAgICAgQWRkIG92ZXItY29uc3RyYWluZWQgZGlyZWN0aW9uIGNoZWNrIHRv
IGNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFVzaW5nCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIwMTIKKworICAgICAgICBSZXZpZXdlZCBi
eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6IFJlbW92ZWQg
NSB0ZXN0cyB0aGF0IGFyZSBub3cgcGFzc2luZy4KKwogMjAyMS0xMi0wNyAgTWFydGluIFJvYmlu
c29uICA8bXJvYmluc29uQHdlYmtpdC5vcmc+CiAKICAgICAgICAgcGVyc3BlY3RpdmUoKSA8PSAx
cHggc2hvdWxkIGJlIGNsYW1wZWQgdG8gMXB4CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0
RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCBlODBhOTA1
YjM0NDgwM2Q3ZmRhZWRkMmZkMGRhYjU3YmUyMmE3N2ZkLi44MTc5YmM1YjMyNTgwMjhjMDE3YWY0
NGFhOTA1N2Y1NWI5MTM0Nzk1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRp
b25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTQwMDgsMTAgKzQwMDgs
NiBAQCB3ZWJraXQub3JnL2IvMjMwMDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy10cmFuc2Zvcm1zL3R0d2YtdHJhbgogCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2NlbnRyYWwt
YmFzZWxpbmUtYWxpZ25tZW50LTAwMy54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIFBhc3MgXQogd2Vi
a2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
d3JpdGluZy1tb2Rlcy9jbGVhcmFuY2UtY2FsY3VsYXRpb25zLXZybC0wMDIueGh0IFsgSW1hZ2VP
bmx5RmFpbHVyZSBQYXNzIF0KLXdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQt
aWNiLXZsci0wMzMueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA5MDgw
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Fi
cy1wb3Mtbm9uLXJlcGxhY2VkLWljYi12cmwtMDMwLnhodCBbIEltYWdlT25seUZhaWx1cmUgXQot
d2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12bHItMDk1LnhodCBbIEltYWdl
T25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12cmwt
MDg4LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hdmFpbGFibGUt
c2l6ZS0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4MCBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hdmFp
bGFibGUtc2l6ZS0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIw
OTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rl
cy9hdmFpbGFibGUtc2l6ZS0wMDMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpAQCAtNDU1NSw3
ICs0NTUxLDYgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zbG90dGVkLXBsYWMKIAogIyAgY29udGFpbi1pbnRyaW5z
aWMtc2l6ZQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDE0Lmh0bWwgWyBJbWFnZU9u
bHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAyMC5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlv
LTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Zs
ZXgtYXNwZWN0LXJhdGlvLTAwNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3Jn
L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv
YXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvVGVzdEV4cGVjdGF0aW9u
cyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGQ4NTIy
Yjc1NGQ5MzlhZmFjMWRlZjUyMjAzNDE5ODU0NTY5OWQ1OGQuLmQ1MDQ0YTVmODdlZDk1MGJhZWQ3
ZTMyZTNhMjZkMWU2MzkxYjM0YmMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2lv
cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9UZXN0RXhw
ZWN0YXRpb25zCkBAIC0zNTAwLDYgKzM1MDAsNyBAQCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2h0bWwvY2FudmFzL2VsZW1lbnQvd2lkZS1nYW11dC1jYW52YXMvMmQuY29sb3Iucwog
c3RvcmFnZS9pbmRleGVkZGIvc3RydWN0dXJlZC1jbG9uZS1pbWFnZS1kYXRhLWRpc3BsYXktcDMu
aHRtbCBbIFBhc3MgXQogCiAjIFNob3cgMXB4IGRpZmYgaW4gdGhlIHJlc3VsdC4gTWF5YmUgaGl0
dGluZyB0aGUgYmFja2dyb3VuZCBibGVlZCBhdm9pZGFuY2UgY29kZSBwYXRoLgord2Via2l0Lm9y
Zy9iLzIyOTM5NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGlu
Zy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12bHItMDk1LnhodCBbIEltYWdlT25seUZhaWx1
cmUgXQogd2Via2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12bHItMTA5LnhodCBb
IEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNl
ZC12bHItMTI1LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIyOTM5NyBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMt
cG9zLW5vbi1yZXBsYWNlZC12bHItMTQxLnhodCBbIEltYWdlT25seUZhaWx1cmUgXQpAQCAtMzUx
Nyw2ICszNTE4LDcgQEAgd2Via2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG8KIHdlYmtpdC5vcmcvYi8yMjkz
OTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMv
YWJzLXBvcy1ub24tcmVwbGFjZWQtdnJsLTA1Mi54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdl
YmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdnJsLTA2NC54aHQgWyBJbWFnZU9u
bHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdnJsLTA3
Ni54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KK3dlYmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24t
cmVwbGFjZWQtdnJsLTA4OC54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8y
MjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9k
ZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdnJsLTEwNC54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
IHdlYmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdnJsLTEwOC54aHQgWyBJbWFn
ZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdnJs
LTExMi54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>449148</attachid>
            <date>2022-01-14 01:38:51 -0800</date>
            <delta_ts>2022-04-21 01:46:09 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232012-20220114093850.patch</filename>
            <type>text/plain</type>
            <size>11803</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4MDEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2U5ZDRjN2Y3ZGQ5Mzcy
MmI5MGNkMmY4YWM0N2YxZjU2MmJlOGVhNS4uYjRmOWUyYTkyNjcyODQ4ZTA2YzhkNTM2OGZjNTRh
NmEwOThlZDdiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIyLTAxLTE0ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQWRkIG92ZXItY29uc3RyYWluZWQg
ZGlyZWN0aW9uIGNoZWNrIHRvIGNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFVzaW5nCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIwMTIKKwor
ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBjb21wdXRl
UG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyB0aGUgb3Zlci1jb25zdHJhaW5lZCBjYXNlIG5l
dmVyIHRvb2sgaW50bworICAgICAgICBhY2NvdW50IFJUTCBkaXJlY3Rpb24sIGJ1dCB0aGlzIHNo
b3VsZCBiZSBkb25lIGlmIHdlIGFyZSBhY3R1YWxseSBkZWFsaW5nIHdpdGggbGVmdC9yaWdodCBw
cm9wZXJ0aWVzLiBbMV0KKyAgICAgICAgRmluYWxseSwgY29tcHV0ZUxvZ2ljYWxUb3BQb3NpdGlv
bmVkT2Zmc2V0IHNob3VsZCBub3QgZG8gdGhlIGZsaXBwaW5nIGxvZ2ljIGluIHRoZSBvdmVyLWNv
bnN0cmFpbmVkIGNhc2UuCisKKyAgICAgICAgWzFdIGh0dHA6Ly93d3cudzMub3JnL1RSL2Nzcy13
cml0aW5nLW1vZGVzLTMvI3ZlcnRpY2FsLWxheW91dAorCisgICAgICAgICogcmVuZGVyaW5nL1Jl
bmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb21wdXRlTG9naWNhbFRvcFBvc2l0aW9u
ZWRPZmZzZXQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25l
ZExvZ2ljYWxIZWlnaHRVc2luZyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6
OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFJlcGxhY2VkIGNvbnN0KToKKwogMjAyMi0w
MS0xMyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBE
b24ndCBjYWxsIGludmFsaWRhdGVSZWN0c0ZvckFsbE1hcmtlcnMoKSBmb3IgZXZlcnkgbGF5ZXIg
aW4gdGhlIHVwZGF0ZUxheWVyUG9zaXRpb25zKCkgdHJhdmVyc2FsCmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl
cmluZy9SZW5kZXJCb3guY3BwCmluZGV4IGMyODFjNjM5YmRiNzcyMWE1MDgwYmUwODhiYWFiOWI2
MGVhOGM3MTcuLmEwNjRjZGNlOTNmYTg5NjNmMTA0ODI4Y2VhYTJjNmQ4ZTFlODBiNmUgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJj
ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC00MzUwLDE3ICs0MzUwLDIwIEBA
IHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHQoTG9naWNhbEV4
dGVudENvbXB1dGVkVmFsdWVzJiBjb21wCiAvLyBUaGUgfGNvbnRhaW5lckxvZ2ljYWxIZWlnaHRG
b3JQb3NpdGlvbmVkfCBpcyBhbHJlYWR5IGF3YXJlIG9mIG9ydGhvZ29uYWwgZmxvd3MuCiAvLyBU
aGUgbG9naWNhbFRvcCBjb25jZXB0IGlzIGNvbmZ1c2luZyBoZXJlLiBJdCdzIHRoZSBsb2dpY2Fs
IHRvcCBmcm9tIHRoZSBjaGlsZCdzIFBPVi4gVGhpcyBtZWFucyB0aGF0IGlzIHRoZSBwaHlzaWNh
bAogLy8geSBpZiB0aGUgY2hpbGQgaXMgdmVydGljYWwgb3IgdGhlIHBoeXNpY2FsIHggaWYgdGhl
IGNoaWxkIGlzIGhvcml6b250YWwuCi1zdGF0aWMgdm9pZCBjb21wdXRlTG9naWNhbFRvcFBvc2l0
aW9uZWRPZmZzZXQoTGF5b3V0VW5pdCYgbG9naWNhbFRvcFBvcywgY29uc3QgUmVuZGVyQm94KiBj
aGlsZCwgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0VmFsdWUsIGNvbnN0IFJlbmRlckJveE1vZGVs
T2JqZWN0JiBjb250YWluZXJCbG9jaywgTGF5b3V0VW5pdCBjb250YWluZXJMb2dpY2FsSGVpZ2h0
Rm9yUG9zaXRpb25lZCkKK3N0YXRpYyB2b2lkIGNvbXB1dGVMb2dpY2FsVG9wUG9zaXRpb25lZE9m
ZnNldChMYXlvdXRVbml0JiBsb2dpY2FsVG9wUG9zLCBjb25zdCBSZW5kZXJCb3gqIGNoaWxkLCBM
YXlvdXRVbml0IGxvZ2ljYWxIZWlnaHRWYWx1ZSwgY29uc3QgUmVuZGVyQm94TW9kZWxPYmplY3Qm
IGNvbnRhaW5lckJsb2NrLCBMYXlvdXRVbml0IGNvbnRhaW5lckxvZ2ljYWxIZWlnaHRGb3JQb3Np
dGlvbmVkLCBib29sIGxvZ2ljYWxUb3BJc0F1dG8sIGJvb2wgbG9naWNhbEJvdHRvbUlzQXV0bykK
IHsKLSAgICBhdXRvIGxvZ2ljYWxUb3BBbmRCb3R0b21BcmVBdXRvID0gY2hpbGQtPnN0eWxlKCku
bG9naWNhbFRvcCgpLmlzQXV0bygpICYmIGNoaWxkLT5zdHlsZSgpLmxvZ2ljYWxCb3R0b20oKS5p
c0F1dG8oKTsKKyAgICBhdXRvIGxvZ2ljYWxUb3BBbmRCb3R0b21BcmVBdXRvID0gbG9naWNhbFRv
cElzQXV0byAmJiBsb2dpY2FsQm90dG9tSXNBdXRvOwogICAgIGF1dG8gaGF2ZU9ydGhvZ29uYWxX
cml0aW5nTW9kZXMgPSBpc09ydGhvZ29uYWwoKmNoaWxkLCBjb250YWluZXJCbG9jayk7CiAgICAg
YXV0byBoYXZlRmxpcHBlZEJsb2NrQXhpcyA9IGNoaWxkLT5zdHlsZSgpLmlzRmxpcHBlZEJsb2Nr
c1dyaXRpbmdNb2RlKCkgIT0gY29udGFpbmVyQmxvY2suc3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NX
cml0aW5nTW9kZSgpOworICAgIGJvb2wgaXNPdmVyY29uc3RyYWluZWQgPSAhbG9naWNhbFRvcElz
QXV0byAmJiAhbG9naWNhbEJvdHRvbUlzQXV0byAmJiAhY2hpbGQtPnN0eWxlKCkubG9naWNhbEhl
aWdodCgpLmlzQXV0bygpOwogCiAgICAgLy8gRGVhbCB3aXRoIGRpZmZlcmluZyB3cml0aW5nIG1v
ZGVzIGhlcmUuICBPdXIgb2Zmc2V0IG5lZWRzIHRvIGJlIGluIHRoZSBjb250YWluaW5nIGJsb2Nr
J3MgY29vcmRpbmF0ZSBzcGFjZS4gSWYgdGhlIGNvbnRhaW5pbmcgYmxvY2sgaXMgZmxpcHBlZAog
ICAgIC8vIGFsb25nIHRoaXMgYXhpcywgdGhlbiB3ZSBuZWVkIHRvIGZsaXAgdGhlIGNvb3JkaW5h
dGUuICBUaGlzIGNhbiBvbmx5IGhhcHBlbiBpZiB0aGUgY29udGFpbmluZyBibG9jayBpcyBib3Ro
IGEgZmxpcHBlZCBtb2RlIGFuZCBwZXJwZW5kaWN1bGFyIHRvIHVzLgotICAgIGlmICgoaGF2ZU9y
dGhvZ29uYWxXcml0aW5nTW9kZXMgJiYgIWxvZ2ljYWxUb3BBbmRCb3R0b21BcmVBdXRvICYmIGNo
aWxkLT5zdHlsZSgpLmlzRmxpcHBlZEJsb2Nrc1dyaXRpbmdNb2RlKCkpCi0gICAgICAgIHx8ICho
YXZlRmxpcHBlZEJsb2NrQXhpcyAmJiAhaGF2ZU9ydGhvZ29uYWxXcml0aW5nTW9kZXMpKQotICAg
ICAgICBsb2dpY2FsVG9wUG9zID0gY29udGFpbmVyTG9naWNhbEhlaWdodEZvclBvc2l0aW9uZWQg
LSBsb2dpY2FsSGVpZ2h0VmFsdWUgLSBsb2dpY2FsVG9wUG9zOworICAgIGlmICghaXNPdmVyY29u
c3RyYWluZWQpIHsKKyAgICAgICAgaWYgKChoYXZlT3J0aG9nb25hbFdyaXRpbmdNb2RlcyAmJiAh
bG9naWNhbFRvcEFuZEJvdHRvbUFyZUF1dG8gJiYgY2hpbGQtPnN0eWxlKCkuaXNGbGlwcGVkQmxv
Y2tzV3JpdGluZ01vZGUoKSkKKyAgICAgICAgICAgIHx8IChoYXZlRmxpcHBlZEJsb2NrQXhpcyAm
JiAhaGF2ZU9ydGhvZ29uYWxXcml0aW5nTW9kZXMpKQorICAgICAgICAgICAgbG9naWNhbFRvcFBv
cyA9IGNvbnRhaW5lckxvZ2ljYWxIZWlnaHRGb3JQb3NpdGlvbmVkIC0gbG9naWNhbEhlaWdodFZh
bHVlIC0gbG9naWNhbFRvcFBvczsKKyAgICB9CiAKICAgICAvLyBPdXIgb2Zmc2V0IGlzIGZyb20g
dGhlIGxvZ2ljYWwgYm90dG9tIGVkZ2UgaW4gYSBmbGlwcGVkIGVudmlyb25tZW50LCBlLmcuLCBy
aWdodCBmb3IgdmVydGljYWwtcmwgYW5kIGJvdHRvbSBmb3IgaG9yaXpvbnRhbC1idC4KICAgICBp
ZiAoY29udGFpbmVyQmxvY2suc3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9kZSgpICYm
ICFoYXZlT3J0aG9nb25hbFdyaXRpbmdNb2RlcykgewpAQCAtNDQ1NSw2ICs0NDU4LDE2IEBAIHZv
aWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyhTaXplVHlw
ZSBoZWlnaHRUeXBlLCBMZW5ndGgKICAgICAgICAgICAgIC8vIE92ZXItY29uc3RyYWluZWQsIChu
byBuZWVkIHNvbHZlIGZvciBib3R0b20pCiAgICAgICAgICAgICBjb21wdXRlZFZhbHVlcy5tX21h
cmdpbnMubV9iZWZvcmUgPSB2YWx1ZUZvckxlbmd0aChtYXJnaW5CZWZvcmUsIGNvbnRhaW5lclJl
bGF0aXZlTG9naWNhbFdpZHRoKTsKICAgICAgICAgICAgIGNvbXB1dGVkVmFsdWVzLm1fbWFyZ2lu
cy5tX2FmdGVyID0gdmFsdWVGb3JMZW5ndGgobWFyZ2luQWZ0ZXIsIGNvbnRhaW5lclJlbGF0aXZl
TG9naWNhbFdpZHRoKTsKKworICAgICAgICAgICAgaWYgKGlzT3J0aG9nb25hbCgqdGhpcywgY29u
dGFpbmVyQmxvY2spKSB7CisgICAgICAgICAgICAgICAgLy8gV2hlbiBvcnRob2dvbmFsIHdlIHdh
bnQgdG8gZXhwbGljaXRseSBkZWFsIHdpdGggbGVmdC9yaWdodCBpbnN0ZWFkIG9mIHRvcC9ib3R0
b20sIHNvIGNvbXB1dGUgcGh5c2ljYWwgbGVmdCBuZXh0LgorICAgICAgICAgICAgICAgIGxvZ2lj
YWxUb3BWYWx1ZSA9IHZhbHVlRm9yTGVuZ3RoKHN0eWxlKCkubGVmdCgpLCBjb250YWluZXJMb2dp
Y2FsSGVpZ2h0KTsKKyAgICAgICAgICAgICAgICBpZiAoY29udGFpbmVyQmxvY2suc3R5bGUoKS5k
aXJlY3Rpb24oKSA9PSBUZXh0RGlyZWN0aW9uOjpSVEwpIHsKKyAgICAgICAgICAgICAgICAgICAg
Ly8gUmVjb21wdXRlIGF2YWlsYWJsZVNwYWNlIHdpdGggcGh5c2ljYWwgbGVmdC4KKyAgICAgICAg
ICAgICAgICAgICAgTGF5b3V0VW5pdCBhdmFpbGFibGVTcGFjZSA9IGNvbnRhaW5lckxvZ2ljYWxI
ZWlnaHQgLSAobG9naWNhbFRvcFZhbHVlICsgbG9naWNhbEhlaWdodFZhbHVlICsgdmFsdWVGb3JM
ZW5ndGgoc3R5bGUoKS5yaWdodCgpLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0KSArIGJvcmRlcnNQ
bHVzUGFkZGluZyk7CisgICAgICAgICAgICAgICAgICAgIGxvZ2ljYWxUb3BWYWx1ZSA9IChhdmFp
bGFibGVTcGFjZSArIGxvZ2ljYWxUb3BWYWx1ZSkgLSBjb21wdXRlZFZhbHVlcy5tX21hcmdpbnMu
bV9iZWZvcmUgLSBjb21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9hZnRlcjsKKyAgICAgICAgICAg
ICAgICB9CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICAv
Ki0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tKlwKQEAgLTQ1MTUsNyArNDUyOCw3IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21w
dXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyhTaXplVHlwZSBoZWlnaHRUeXBlLCBMZW5n
dGgKIAogICAgIC8vIFVzZSBjb21wdXRlZCB2YWx1ZXMgdG8gY2FsY3VsYXRlIHRoZSB2ZXJ0aWNh
bCBwb3NpdGlvbi4KICAgICBjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9uID0gbG9naWNhbFRvcFZh
bHVlICsgY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fYmVmb3JlOwotICAgIGNvbXB1dGVMb2dp
Y2FsVG9wUG9zaXRpb25lZE9mZnNldChjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9uLCB0aGlzLCBs
b2dpY2FsSGVpZ2h0VmFsdWUgKyBib3JkZXJzUGx1c1BhZGRpbmcsIGNvbnRhaW5lckJsb2NrLCBj
b250YWluZXJMb2dpY2FsSGVpZ2h0KTsKKyAgICBjb21wdXRlTG9naWNhbFRvcFBvc2l0aW9uZWRP
ZmZzZXQoY29tcHV0ZWRWYWx1ZXMubV9wb3NpdGlvbiwgdGhpcywgbG9naWNhbEhlaWdodFZhbHVl
ICsgYm9yZGVyc1BsdXNQYWRkaW5nLCBjb250YWluZXJCbG9jaywgY29udGFpbmVyTG9naWNhbEhl
aWdodCwgc3R5bGUoKS5sb2dpY2FsVG9wKCkuaXNBdXRvKCksIHN0eWxlKCkubG9naWNhbEJvdHRv
bSgpLmlzQXV0bygpKTsKIH0KIAogdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9n
aWNhbFdpZHRoUmVwbGFjZWQoTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzJiBjb21wdXRlZFZh
bHVlcykgY29uc3QKQEAgLTQ4MTQsNyArNDgyNyw3IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRl
UG9zaXRpb25lZExvZ2ljYWxIZWlnaHRSZXBsYWNlZChMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1
CiAgICAgLy8gVXNlIGNvbXB1dGVkIHZhbHVlcyB0byBjYWxjdWxhdGUgdGhlIHZlcnRpY2FsIHBv
c2l0aW9uLgogICAgIExheW91dFVuaXQgbG9naWNhbFRvcFBvcyA9IGxvZ2ljYWxUb3BWYWx1ZSAr
IG1hcmdpbkJlZm9yZUFsaWFzOwogICAgIC8vIEJvcmRlciBhbmQgcGFkZGluZyBoYXZlIGFscmVh
ZHkgYmVlbiBpbmNsdWRlZCBpbiBjb21wdXRlZFZhbHVlcy5tX2V4dGVudC4KLSAgICBjb21wdXRl
TG9naWNhbFRvcFBvc2l0aW9uZWRPZmZzZXQobG9naWNhbFRvcFBvcywgdGhpcywgY29tcHV0ZWRW
YWx1ZXMubV9leHRlbnQsIGNvbnRhaW5lckJsb2NrLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0KTsK
KyAgICBjb21wdXRlTG9naWNhbFRvcFBvc2l0aW9uZWRPZmZzZXQobG9naWNhbFRvcFBvcywgdGhp
cywgY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQsIGNvbnRhaW5lckJsb2NrLCBjb250YWluZXJMb2dp
Y2FsSGVpZ2h0LCBzdHlsZSgpLmxvZ2ljYWxUb3AoKS5pc0F1dG8oKSwgc3R5bGUoKS5sb2dpY2Fs
Qm90dG9tKCkuaXNBdXRvKCkpOwogICAgIGNvbXB1dGVkVmFsdWVzLm1fcG9zaXRpb24gPSBsb2dp
Y2FsVG9wUG9zOwogfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlv
dXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggODFkY2U3NjNlMGJiNTdmNjJlNzE1ZDg4OGFjMmY3MWEw
NzAwMWM3Ny4uOTUzN2RhY2Y5YjAwOThmMmU5NjhmY2Q4M2ZmNzg1NzZmZDI5MzVlZSAxMDA2NDQK
LS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpA
QCAtMSwzICsxLDEyIEBACisyMDIyLTAxLTE0ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+
CisKKyAgICAgICAgQWRkIG92ZXItY29uc3RyYWluZWQgZGlyZWN0aW9uIGNoZWNrIHRvIGNvbXB1
dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFVzaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIwMTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP
RFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6IFJlbW92ZWQgNSB0ZXN0
cyB0aGF0IGFyZSBub3cgcGFzc2luZy4KKwogMjAyMi0wMS0xMyAgQW50b2luZSBRdWludCAgPGdy
YW91dHNAd2Via2l0Lm9yZz4KIAogICAgICAgICBVcGRhdGUgV1BUIGZvciBjc3MvY3NzLXBzZXVk
bwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3Rz
L1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggM2RjYzM5MTJjNmQyNjIwYzFmZjlmNjUxYTkxM2ZkOGI1
NjU0NWM3MC4uZjE2NmVjYTRkYzBkZjFkNjc0ZWExZDczNDUxZGYwZGEyOGFlMTU5YSAxMDA2NDQK
LS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0
RXhwZWN0YXRpb25zCkBAIC00MDM4LDEwICs0MDM4LDYgQEAgd2Via2l0Lm9yZy9iLzE2Njk0MSBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9sb2dp
Y2EKIAogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9jZW50cmFsLWJhc2VsaW5lLWFsaWdubWVudC0wMDMueGh0
IFsgSW1hZ2VPbmx5RmFpbHVyZSBQYXNzIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvY2xlYXJhbmNlLWNh
bGN1bGF0aW9ucy12cmwtMDAyLnhodCBbIEltYWdlT25seUZhaWx1cmUgUGFzcyBdCi13ZWJraXQu
b3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0
aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLWljYi12bHItMDMzLnhodCBbIEltYWdlT25s
eUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC1pY2ItdnJs
LTAzMC54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1u
b24tcmVwbGFjZWQtdmxyLTA5NS54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcv
Yi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmct
bW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdnJsLTA4OC54aHQgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXdyaXRpbmctbW9kZXMvYXZhaWxhYmxlLXNpemUtMDAxLmh0bWwgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYXZhaWxhYmxlLXNpemUtMDAyLmh0bWwgWyBJbWFn
ZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYXZhaWxhYmxlLXNpemUtMDAzLmh0bWwg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KQEAgLTQ1OTMsNyArNDU4OSw2IEBAIHdlYmtpdC5vcmcvYi8y
MTQ0NjIgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2xv
dHRlZC1wbGFjCiAKICMgIGNvbnRhaW4taW50cmluc2ljLXNpemUKIHdlYmtpdC5vcmcvYi8yMTQ0
NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt
cmF0aW8vYWJzcG9zLTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2Iv
MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw
ZWN0LXJhdGlvL2Fic3Bvcy0wMjAuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9y
Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n
L2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1
cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDQuaHRtbCBb
IEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1y
YXRpby0wMjUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz
dHMvcGxhdGZvcm0vaW9zL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9p
b3MvVGVzdEV4cGVjdGF0aW9ucwppbmRleCA4YTRkYzBiNmQ5MTAxOTVmOTk2NjIwYzA2NjMwMjI1
ZTRmMGUwMzlmLi43NGQyZTMxZmM1NDIyZmNlYWE0NDZhODVkNGQ4ZWRmZWVlNTIxYmVkIDEwMDY0
NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvVGVzdEV4cGVjdGF0aW9ucworKysgYi9M
YXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvVGVzdEV4cGVjdGF0aW9ucwpAQCAtMzM4MSw2ICszMzgx
LDcgQEAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL2NhbnZhcy9lbGVtZW50
L3dpZGUtZ2FtdXQtY2FudmFzLzJkLmNvbG9yLnMKIHN0b3JhZ2UvaW5kZXhlZGRiL3N0cnVjdHVy
ZWQtY2xvbmUtaW1hZ2UtZGF0YS1kaXNwbGF5LXAzLmh0bWwgWyBQYXNzIF0KIAogIyBTaG93IDFw
eCBkaWZmIGluIHRoZSByZXN1bHQuIE1heWJlIGhpdHRpbmcgdGhlIGJhY2tncm91bmQgYmxlZWQg
YXZvaWRhbmNlIGNvZGUgcGF0aC4KK3dlYmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFj
ZWQtdmxyLTA5NS54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMjkzOTcg
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJz
LXBvcy1ub24tcmVwbGFjZWQtdmxyLTEwOS54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtp
dC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdy
aXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdmxyLTEyNS54aHQgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdmxyLTE0MS54
aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KQEAgLTMzOTgsNiArMzM5OSw3IEBAIHdlYmtpdC5vcmcv
Yi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmct
bW9kZXMvYWJzLXBvCiB3ZWJraXQub3JnL2IvMjI5Mzk3IGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZybC0w
NTIueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjI5Mzk3IGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9u
LXJlcGxhY2VkLXZybC0wNjQueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2Iv
MjI5Mzk3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1v
ZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZybC0wNzYueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBd
Cit3ZWJraXQub3JnL2IvMjI5Mzk3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZybC0wODgueGh0IFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjI5Mzk3IGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZy
bC0xMDQueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjI5Mzk3IGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mt
bm9uLXJlcGxhY2VkLXZybC0xMDgueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3Jn
L2IvMjI5Mzk3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5n
LW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZybC0xMTIueGh0IFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>458043</attachid>
            <date>2022-04-21 01:46:13 -0700</date>
            <delta_ts>2022-08-22 03:20:46 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232012-20220421094612.patch</filename>
            <type>text/plain</type>
            <size>11798</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzMTQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODhmOWFjZDEwZWJmOTFl
Y2QwNmJiMzhjOTEzMjczMTM3MjkzMTM5Mi4uNjU4MjgyNzBmMDBiZmE1ZjA5Y2I5ZWI2NmI3ZmY2
NTg1MTllZjFmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIyLTA0LTIxICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQWRkIG92ZXItY29uc3RyYWluZWQg
ZGlyZWN0aW9uIGNoZWNrIHRvIGNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFVzaW5nCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIwMTIKKwor
ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBjb21wdXRl
UG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyB0aGUgb3Zlci1jb25zdHJhaW5lZCBjYXNlIG5l
dmVyIHRvb2sgaW50bworICAgICAgICBhY2NvdW50IFJUTCBkaXJlY3Rpb24sIGJ1dCB0aGlzIHNo
b3VsZCBiZSBkb25lIGlmIHdlIGFyZSBhY3R1YWxseSBkZWFsaW5nIHdpdGggbGVmdC9yaWdodCBw
cm9wZXJ0aWVzLiBbMV0KKyAgICAgICAgRmluYWxseSwgY29tcHV0ZUxvZ2ljYWxUb3BQb3NpdGlv
bmVkT2Zmc2V0IHNob3VsZCBub3QgZG8gdGhlIGZsaXBwaW5nIGxvZ2ljIGluIHRoZSBvdmVyLWNv
bnN0cmFpbmVkIGNhc2UuCisKKyAgICAgICAgWzFdIGh0dHA6Ly93d3cudzMub3JnL1RSL2Nzcy13
cml0aW5nLW1vZGVzLTMvI3ZlcnRpY2FsLWxheW91dAorCisgICAgICAgICogcmVuZGVyaW5nL1Jl
bmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb21wdXRlTG9naWNhbFRvcFBvc2l0aW9u
ZWRPZmZzZXQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25l
ZExvZ2ljYWxIZWlnaHRVc2luZyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6
OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFJlcGxhY2VkIGNvbnN0KToKKwogMjAyMi0w
NC0yMSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFNraXAgcmVsZWFz
ZSBhc3NlcnQgZHVyaW5nIGNvbnRhaW5lciBxdWVyeSByZXNvbHV0aW9uCmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl
bmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IGQ1MWRlNjZlYjQzY2Q1MmJhNzk0ZTg5NzE4Mzcy
N2IzYjUwNGRiYWYuLjI4YzgyYmY2NjhjZDE1Mjg4MjM0NDE0OGVhN2MzMGJiMGZhYTUwZjMgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC00Mzc1LDE3ICs0Mzc1LDIw
IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHQoTG9naWNh
bEV4dGVudENvbXB1dGVkVmFsdWVzJiBjb21wCiAvLyBUaGUgfGNvbnRhaW5lckxvZ2ljYWxIZWln
aHRGb3JQb3NpdGlvbmVkfCBpcyBhbHJlYWR5IGF3YXJlIG9mIG9ydGhvZ29uYWwgZmxvd3MuCiAv
LyBUaGUgbG9naWNhbFRvcCBjb25jZXB0IGlzIGNvbmZ1c2luZyBoZXJlLiBJdCdzIHRoZSBsb2dp
Y2FsIHRvcCBmcm9tIHRoZSBjaGlsZCdzIFBPVi4gVGhpcyBtZWFucyB0aGF0IGlzIHRoZSBwaHlz
aWNhbAogLy8geSBpZiB0aGUgY2hpbGQgaXMgdmVydGljYWwgb3IgdGhlIHBoeXNpY2FsIHggaWYg
dGhlIGNoaWxkIGlzIGhvcml6b250YWwuCi1zdGF0aWMgdm9pZCBjb21wdXRlTG9naWNhbFRvcFBv
c2l0aW9uZWRPZmZzZXQoTGF5b3V0VW5pdCYgbG9naWNhbFRvcFBvcywgY29uc3QgUmVuZGVyQm94
KiBjaGlsZCwgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0VmFsdWUsIGNvbnN0IFJlbmRlckJveE1v
ZGVsT2JqZWN0JiBjb250YWluZXJCbG9jaywgTGF5b3V0VW5pdCBjb250YWluZXJMb2dpY2FsSGVp
Z2h0Rm9yUG9zaXRpb25lZCkKK3N0YXRpYyB2b2lkIGNvbXB1dGVMb2dpY2FsVG9wUG9zaXRpb25l
ZE9mZnNldChMYXlvdXRVbml0JiBsb2dpY2FsVG9wUG9zLCBjb25zdCBSZW5kZXJCb3gqIGNoaWxk
LCBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHRWYWx1ZSwgY29uc3QgUmVuZGVyQm94TW9kZWxPYmpl
Y3QmIGNvbnRhaW5lckJsb2NrLCBMYXlvdXRVbml0IGNvbnRhaW5lckxvZ2ljYWxIZWlnaHRGb3JQ
b3NpdGlvbmVkLCBib29sIGxvZ2ljYWxUb3BJc0F1dG8sIGJvb2wgbG9naWNhbEJvdHRvbUlzQXV0
bykKIHsKLSAgICBhdXRvIGxvZ2ljYWxUb3BBbmRCb3R0b21BcmVBdXRvID0gY2hpbGQtPnN0eWxl
KCkubG9naWNhbFRvcCgpLmlzQXV0bygpICYmIGNoaWxkLT5zdHlsZSgpLmxvZ2ljYWxCb3R0b20o
KS5pc0F1dG8oKTsKKyAgICBhdXRvIGxvZ2ljYWxUb3BBbmRCb3R0b21BcmVBdXRvID0gbG9naWNh
bFRvcElzQXV0byAmJiBsb2dpY2FsQm90dG9tSXNBdXRvOwogICAgIGF1dG8gaGF2ZU9ydGhvZ29u
YWxXcml0aW5nTW9kZXMgPSBpc09ydGhvZ29uYWwoKmNoaWxkLCBjb250YWluZXJCbG9jayk7CiAg
ICAgYXV0byBoYXZlRmxpcHBlZEJsb2NrQXhpcyA9IGNoaWxkLT5zdHlsZSgpLmlzRmxpcHBlZEJs
b2Nrc1dyaXRpbmdNb2RlKCkgIT0gY29udGFpbmVyQmxvY2suc3R5bGUoKS5pc0ZsaXBwZWRCbG9j
a3NXcml0aW5nTW9kZSgpOworICAgIGJvb2wgaXNPdmVyY29uc3RyYWluZWQgPSAhbG9naWNhbFRv
cElzQXV0byAmJiAhbG9naWNhbEJvdHRvbUlzQXV0byAmJiAhY2hpbGQtPnN0eWxlKCkubG9naWNh
bEhlaWdodCgpLmlzQXV0bygpOwogCiAgICAgLy8gRGVhbCB3aXRoIGRpZmZlcmluZyB3cml0aW5n
IG1vZGVzIGhlcmUuICBPdXIgb2Zmc2V0IG5lZWRzIHRvIGJlIGluIHRoZSBjb250YWluaW5nIGJs
b2NrJ3MgY29vcmRpbmF0ZSBzcGFjZS4gSWYgdGhlIGNvbnRhaW5pbmcgYmxvY2sgaXMgZmxpcHBl
ZAogICAgIC8vIGFsb25nIHRoaXMgYXhpcywgdGhlbiB3ZSBuZWVkIHRvIGZsaXAgdGhlIGNvb3Jk
aW5hdGUuICBUaGlzIGNhbiBvbmx5IGhhcHBlbiBpZiB0aGUgY29udGFpbmluZyBibG9jayBpcyBi
b3RoIGEgZmxpcHBlZCBtb2RlIGFuZCBwZXJwZW5kaWN1bGFyIHRvIHVzLgotICAgIGlmICgoaGF2
ZU9ydGhvZ29uYWxXcml0aW5nTW9kZXMgJiYgIWxvZ2ljYWxUb3BBbmRCb3R0b21BcmVBdXRvICYm
IGNoaWxkLT5zdHlsZSgpLmlzRmxpcHBlZEJsb2Nrc1dyaXRpbmdNb2RlKCkpCi0gICAgICAgIHx8
IChoYXZlRmxpcHBlZEJsb2NrQXhpcyAmJiAhaGF2ZU9ydGhvZ29uYWxXcml0aW5nTW9kZXMpKQot
ICAgICAgICBsb2dpY2FsVG9wUG9zID0gY29udGFpbmVyTG9naWNhbEhlaWdodEZvclBvc2l0aW9u
ZWQgLSBsb2dpY2FsSGVpZ2h0VmFsdWUgLSBsb2dpY2FsVG9wUG9zOworICAgIGlmICghaXNPdmVy
Y29uc3RyYWluZWQpIHsKKyAgICAgICAgaWYgKChoYXZlT3J0aG9nb25hbFdyaXRpbmdNb2RlcyAm
JiAhbG9naWNhbFRvcEFuZEJvdHRvbUFyZUF1dG8gJiYgY2hpbGQtPnN0eWxlKCkuaXNGbGlwcGVk
QmxvY2tzV3JpdGluZ01vZGUoKSkKKyAgICAgICAgICAgIHx8IChoYXZlRmxpcHBlZEJsb2NrQXhp
cyAmJiAhaGF2ZU9ydGhvZ29uYWxXcml0aW5nTW9kZXMpKQorICAgICAgICAgICAgbG9naWNhbFRv
cFBvcyA9IGNvbnRhaW5lckxvZ2ljYWxIZWlnaHRGb3JQb3NpdGlvbmVkIC0gbG9naWNhbEhlaWdo
dFZhbHVlIC0gbG9naWNhbFRvcFBvczsKKyAgICB9CiAKICAgICAvLyBPdXIgb2Zmc2V0IGlzIGZy
b20gdGhlIGxvZ2ljYWwgYm90dG9tIGVkZ2UgaW4gYSBmbGlwcGVkIGVudmlyb25tZW50LCBlLmcu
LCByaWdodCBmb3IgdmVydGljYWwtcmwgYW5kIGJvdHRvbSBmb3IgaG9yaXpvbnRhbC1idC4KICAg
ICBpZiAoY29udGFpbmVyQmxvY2suc3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9kZSgp
ICYmICFoYXZlT3J0aG9nb25hbFdyaXRpbmdNb2RlcykgewpAQCAtNDQ4MCw2ICs0NDgzLDE2IEBA
IHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyhTaXpl
VHlwZSBoZWlnaHRUeXBlLCBMZW5ndGgKICAgICAgICAgICAgIC8vIE92ZXItY29uc3RyYWluZWQs
IChubyBuZWVkIHNvbHZlIGZvciBib3R0b20pCiAgICAgICAgICAgICBjb21wdXRlZFZhbHVlcy5t
X21hcmdpbnMubV9iZWZvcmUgPSB2YWx1ZUZvckxlbmd0aChtYXJnaW5CZWZvcmUsIGNvbnRhaW5l
clJlbGF0aXZlTG9naWNhbFdpZHRoKTsKICAgICAgICAgICAgIGNvbXB1dGVkVmFsdWVzLm1fbWFy
Z2lucy5tX2FmdGVyID0gdmFsdWVGb3JMZW5ndGgobWFyZ2luQWZ0ZXIsIGNvbnRhaW5lclJlbGF0
aXZlTG9naWNhbFdpZHRoKTsKKworICAgICAgICAgICAgaWYgKGlzT3J0aG9nb25hbCgqdGhpcywg
Y29udGFpbmVyQmxvY2spKSB7CisgICAgICAgICAgICAgICAgLy8gV2hlbiBvcnRob2dvbmFsIHdl
IHdhbnQgdG8gZXhwbGljaXRseSBkZWFsIHdpdGggbGVmdC9yaWdodCBpbnN0ZWFkIG9mIHRvcC9i
b3R0b20sIHNvIGNvbXB1dGUgcGh5c2ljYWwgbGVmdCBuZXh0LgorICAgICAgICAgICAgICAgIGxv
Z2ljYWxUb3BWYWx1ZSA9IHZhbHVlRm9yTGVuZ3RoKHN0eWxlKCkubGVmdCgpLCBjb250YWluZXJM
b2dpY2FsSGVpZ2h0KTsKKyAgICAgICAgICAgICAgICBpZiAoY29udGFpbmVyQmxvY2suc3R5bGUo
KS5kaXJlY3Rpb24oKSA9PSBUZXh0RGlyZWN0aW9uOjpSVEwpIHsKKyAgICAgICAgICAgICAgICAg
ICAgLy8gUmVjb21wdXRlIGF2YWlsYWJsZVNwYWNlIHdpdGggcGh5c2ljYWwgbGVmdC4KKyAgICAg
ICAgICAgICAgICAgICAgTGF5b3V0VW5pdCBhdmFpbGFibGVTcGFjZSA9IGNvbnRhaW5lckxvZ2lj
YWxIZWlnaHQgLSAobG9naWNhbFRvcFZhbHVlICsgbG9naWNhbEhlaWdodFZhbHVlICsgdmFsdWVG
b3JMZW5ndGgoc3R5bGUoKS5yaWdodCgpLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0KSArIGJvcmRl
cnNQbHVzUGFkZGluZyk7CisgICAgICAgICAgICAgICAgICAgIGxvZ2ljYWxUb3BWYWx1ZSA9IChh
dmFpbGFibGVTcGFjZSArIGxvZ2ljYWxUb3BWYWx1ZSkgLSBjb21wdXRlZFZhbHVlcy5tX21hcmdp
bnMubV9iZWZvcmUgLSBjb21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9hZnRlcjsKKyAgICAgICAg
ICAgICAgICB9CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAg
ICAvKi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tKlwKQEAgLTQ1NDAsNyArNDU1Myw3IEBAIHZvaWQgUmVuZGVyQm94Ojpj
b21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyhTaXplVHlwZSBoZWlnaHRUeXBlLCBM
ZW5ndGgKIAogICAgIC8vIFVzZSBjb21wdXRlZCB2YWx1ZXMgdG8gY2FsY3VsYXRlIHRoZSB2ZXJ0
aWNhbCBwb3NpdGlvbi4KICAgICBjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9uID0gbG9naWNhbFRv
cFZhbHVlICsgY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fYmVmb3JlOwotICAgIGNvbXB1dGVM
b2dpY2FsVG9wUG9zaXRpb25lZE9mZnNldChjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9uLCB0aGlz
LCBsb2dpY2FsSGVpZ2h0VmFsdWUgKyBib3JkZXJzUGx1c1BhZGRpbmcsIGNvbnRhaW5lckJsb2Nr
LCBjb250YWluZXJMb2dpY2FsSGVpZ2h0KTsKKyAgICBjb21wdXRlTG9naWNhbFRvcFBvc2l0aW9u
ZWRPZmZzZXQoY29tcHV0ZWRWYWx1ZXMubV9wb3NpdGlvbiwgdGhpcywgbG9naWNhbEhlaWdodFZh
bHVlICsgYm9yZGVyc1BsdXNQYWRkaW5nLCBjb250YWluZXJCbG9jaywgY29udGFpbmVyTG9naWNh
bEhlaWdodCwgc3R5bGUoKS5sb2dpY2FsVG9wKCkuaXNBdXRvKCksIHN0eWxlKCkubG9naWNhbEJv
dHRvbSgpLmlzQXV0bygpKTsKIH0KIAogdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVk
TG9naWNhbFdpZHRoUmVwbGFjZWQoTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzJiBjb21wdXRl
ZFZhbHVlcykgY29uc3QKQEAgLTQ4MzksNyArNDg1Miw3IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21w
dXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRSZXBsYWNlZChMb2dpY2FsRXh0ZW50Q29tcHV0ZWRW
YWx1CiAgICAgLy8gVXNlIGNvbXB1dGVkIHZhbHVlcyB0byBjYWxjdWxhdGUgdGhlIHZlcnRpY2Fs
IHBvc2l0aW9uLgogICAgIExheW91dFVuaXQgbG9naWNhbFRvcFBvcyA9IGxvZ2ljYWxUb3BWYWx1
ZSArIG1hcmdpbkJlZm9yZUFsaWFzOwogICAgIC8vIEJvcmRlciBhbmQgcGFkZGluZyBoYXZlIGFs
cmVhZHkgYmVlbiBpbmNsdWRlZCBpbiBjb21wdXRlZFZhbHVlcy5tX2V4dGVudC4KLSAgICBjb21w
dXRlTG9naWNhbFRvcFBvc2l0aW9uZWRPZmZzZXQobG9naWNhbFRvcFBvcywgdGhpcywgY29tcHV0
ZWRWYWx1ZXMubV9leHRlbnQsIGNvbnRhaW5lckJsb2NrLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0
KTsKKyAgICBjb21wdXRlTG9naWNhbFRvcFBvc2l0aW9uZWRPZmZzZXQobG9naWNhbFRvcFBvcywg
dGhpcywgY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQsIGNvbnRhaW5lckJsb2NrLCBjb250YWluZXJM
b2dpY2FsSGVpZ2h0LCBzdHlsZSgpLmxvZ2ljYWxUb3AoKS5pc0F1dG8oKSwgc3R5bGUoKS5sb2dp
Y2FsQm90dG9tKCkuaXNBdXRvKCkpOwogICAgIGNvbXB1dGVkVmFsdWVzLm1fcG9zaXRpb24gPSBs
b2dpY2FsVG9wUG9zOwogfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9M
YXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZjU2ODM4NGVhMWU3NTY1YWU4YTU3MTlkYjI2Njlj
NjQzZjFiNTc5Yi4uNzEyZWYyNzBkNmNkZTFmMzk3NjQ5NTdjMWVmZjdjZDkzODk2NTQzNiAxMDA2
NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwpAQCAtMSwzICsxLDEyIEBACisyMDIyLTA0LTIxICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5j
b20+CisKKyAgICAgICAgQWRkIG92ZXItY29uc3RyYWluZWQgZGlyZWN0aW9uIGNoZWNrIHRvIGNv
bXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFVzaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53
ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIwMTIKKworICAgICAgICBSZXZpZXdlZCBieSBO
T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6IFJlbW92ZWQgNSB0
ZXN0cyB0aGF0IGFyZSBub3cgcGFzc2luZy4KKwogMjAyMi0wNC0yMCAgTXlsZXMgQy4gTWF4Zmll
bGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFsgaU9TIF0gcGxhdGZvcm0vaW9z
L2lvcy9mYXN0L3RleHQvb3B0aWNhbEZvbnQuaHRtbCBpcyBhIGNvbnN0YW50IGZhaWx1cmUKZGlm
ZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0
RXhwZWN0YXRpb25zCmluZGV4IGI2Mzc4YWU3ZGYyZjdmZGY5NDQyNzAzNDlhYWQyYjhjNDlmNDIw
NzMuLmNiNGJmNDA2ZmIzODgxMTdmNDE0MmQwYWE2MDdjMDlmNDAwMGQ4NTIgMTAwNjQ0Ci0tLSBh
L0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVj
dGF0aW9ucwpAQCAtMzk4NiwxMCArMzk4Niw2IEBAIHdlYmtpdC5vcmcvYi8xNjY5NDEgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvbG9naWNhCiAK
IHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXdyaXRpbmctbW9kZXMvY2VudHJhbC1iYXNlbGluZS1hbGlnbm1lbnQtMDAzLnhodCBbIElt
YWdlT25seUZhaWx1cmUgUGFzcyBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2NsZWFyYW5jZS1jYWxjdWxh
dGlvbnMtdnJsLTAwMi54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIFBhc3MgXQotd2Via2l0Lm9yZy9i
LzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1t
b2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC1pY2ItdmxyLTAzMy54aHQgWyBJbWFnZU9ubHlGYWls
dXJlIF0KLXdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtaWNiLXZybC0wMzAu
eGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJl
cGxhY2VkLXZsci0wOTUueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA5
MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVz
L2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZybC0wODgueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3
ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy13cml0aW5nLW1vZGVzL2F2YWlsYWJsZS1zaXplLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy13cml0aW5nLW1vZGVzL2F2YWlsYWJsZS1zaXplLTAwMi5odG1sIFsgSW1hZ2VPbmx5
RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2F2YWlsYWJsZS1zaXplLTAwMy5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCkBAIC00NDg4LDcgKzQ0ODQsNiBAQCB3ZWJraXQub3JnL2IvMjE0NDYy
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zY29waW5nL3Nsb3R0ZWQt
cGxhYwogCiAjICBjb250YWluLWludHJpbnNpYy1zaXplCiB3ZWJraXQub3JnL2IvMjE0NDYzIGlt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv
L2Fic3Bvcy0wMTQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2
MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y
YXRpby9hYnNwb3MtMDIwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8y
MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl
Y3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
IHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDA0Lmh0bWwgWyBJbWFn
ZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8t
MDI1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3Bs
YXRmb3JtL2lvcy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zL1Rl
c3RFeHBlY3RhdGlvbnMKaW5kZXggYTdiNDRhOWFmZWM3MDUzMTRjYzZlN2FmYjExZTkxYTlkZWI5
MTZmZS4uNGM0YWRmYTZlNDMzYzdjYTE1NDlhYmU1Mjg4Njc0NThmNjdmZGVhYiAxMDA2NDQKLS0t
IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0
VGVzdHMvcGxhdGZvcm0vaW9zL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTMzNjksNiArMzM2OSw3IEBA
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9jYW52YXMvZWxlbWVudC93aWRl
LWdhbXV0LWNhbnZhcy8yZC5jb2xvci5zCiBzdG9yYWdlL2luZGV4ZWRkYi9zdHJ1Y3R1cmVkLWNs
b25lLWltYWdlLWRhdGEtZGlzcGxheS1wMy5odG1sIFsgUGFzcyBdCiAKICMgU2hvdyAxcHggZGlm
ZiBpbiB0aGUgcmVzdWx0LiBNYXliZSBoaXR0aW5nIHRoZSBiYWNrZ3JvdW5kIGJsZWVkIGF2b2lk
YW5jZSBjb2RlIHBhdGguCit3ZWJraXQub3JnL2IvMjI5Mzk3IGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZs
ci0wOTUueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjI5Mzk3IGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mt
bm9uLXJlcGxhY2VkLXZsci0xMDkueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3Jn
L2IvMjI5Mzk3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5n
LW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZsci0xMjUueGh0IFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCiB3ZWJraXQub3JnL2IvMjI5Mzk3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZsci0xNDEueGh0IFsg
SW1hZ2VPbmx5RmFpbHVyZSBdCkBAIC0zMzg2LDYgKzMzODcsNyBAQCB3ZWJraXQub3JnL2IvMjI5
Mzk3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVz
L2Ficy1wbwogd2Via2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12cmwtMDUyLnho
dCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBs
YWNlZC12cmwtMDY0LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIyOTM5
NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9h
YnMtcG9zLW5vbi1yZXBsYWNlZC12cmwtMDc2LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQord2Vi
a2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
d3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12cmwtMDg4LnhodCBbIEltYWdlT25s
eUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12cmwtMTA0
LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1y
ZXBsYWNlZC12cmwtMTA4LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIy
OTM5NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rl
cy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12cmwtMTEyLnhodCBbIEltYWdlT25seUZhaWx1cmUgXQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>461793</attachid>
            <date>2022-08-22 03:20:50 -0700</date>
            <delta_ts>2022-09-07 06:43:12 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232012-20220822112049.patch</filename>
            <type>text/plain</type>
            <size>10968</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">RnJvbSAzZDEzY2EzYmU0NmE1MzQ0M2JmZGNjZWQyOWE4NjhlMDRmZDZkYTJhIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBSb2IgQnVpcyA8cmJ1aXNAaWdhbGlhLmNvbT4KRGF0ZTogTW9u
LCAyMiBBdWcgMjAyMiAxMToxOTozOCArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIEFkZCBvdmVyLWNv
bnN0cmFpbmVkIGRpcmVjdGlvbiBjaGVjayB0bwogY29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVp
Z2h0VXNpbmcKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIwMTIK
ClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKSW4gY29tcHV0ZVBvc2l0aW9uZWRMb2dpY2Fs
SGVpZ2h0VXNpbmcgdGhlIG92ZXItY29uc3RyYWluZWQgY2FzZSBuZXZlciB0b29rIGludG8KYWNj
b3VudCBSVEwgZGlyZWN0aW9uLCBidXQgdGhpcyBzaG91bGQgYmUgZG9uZSBpZiB3ZSBhcmUgYWN0
dWFsbHkgZGVhbGluZyB3aXRoIGxlZnQvcmlnaHQgcHJvcGVydGllcy4gWzFdCkZpbmFsbHksIGNv
bXB1dGVMb2dpY2FsVG9wUG9zaXRpb25lZE9mZnNldCBzaG91bGQgbm90IGRvIHRoZSBmbGlwcGlu
ZyBsb2dpYyBpbiB0aGUgb3Zlci1jb25zdHJhaW5lZCBjYXNlLgoKWzFdIGh0dHA6Ly93d3cudzMu
b3JnL1RSL2Nzcy13cml0aW5nLW1vZGVzLTMvI3ZlcnRpY2FsLWxheW91dAoKKiBMYXlvdXRUZXN0
cy9UZXN0RXhwZWN0YXRpb25zOgoqIExheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9UZXN0RXhwZWN0
YXRpb25zOgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwOgooV2ViQ29y
ZTo6Y29tcHV0ZUxvZ2ljYWxUb3BQb3NpdGlvbmVkT2Zmc2V0KToKKFdlYkNvcmU6OlJlbmRlckJv
eDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0VXNpbmcgY29uc3QpOgooV2ViQ29yZTo6
UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRSZXBsYWNlZCBjb25zdCk6
Ci0tLQogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgICAgfCAyNyArKysr
KysrKysrKysrKysrKy0tLS0tLQogTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyAgICAgICAg
ICAgICAgfCAgNSAtLS0tLQogTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zL1Rlc3RFeHBlY3RhdGlv
bnMgfCAgMiArKwogMyBmaWxlcyBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlv
bnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNw
cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IGNlNjI3NmMx
OTRhNy4uY2JmM2UxZTkzM2MwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv
UmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNw
cApAQCAtNDQ1NywxNyArNDQ1NywyMCBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9u
ZWRMb2dpY2FsSGVpZ2h0KExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyYgY29tcAogLy8gVGhl
IHxjb250YWluZXJMb2dpY2FsSGVpZ2h0Rm9yUG9zaXRpb25lZHwgaXMgYWxyZWFkeSBhd2FyZSBv
ZiBvcnRob2dvbmFsIGZsb3dzLgogLy8gVGhlIGxvZ2ljYWxUb3AgY29uY2VwdCBpcyBjb25mdXNp
bmcgaGVyZS4gSXQncyB0aGUgbG9naWNhbCB0b3AgZnJvbSB0aGUgY2hpbGQncyBQT1YuIFRoaXMg
bWVhbnMgdGhhdCBpcyB0aGUgcGh5c2ljYWwKIC8vIHkgaWYgdGhlIGNoaWxkIGlzIHZlcnRpY2Fs
IG9yIHRoZSBwaHlzaWNhbCB4IGlmIHRoZSBjaGlsZCBpcyBob3Jpem9udGFsLgotc3RhdGljIHZv
aWQgY29tcHV0ZUxvZ2ljYWxUb3BQb3NpdGlvbmVkT2Zmc2V0KExheW91dFVuaXQmIGxvZ2ljYWxU
b3BQb3MsIGNvbnN0IFJlbmRlckJveCogY2hpbGQsIExheW91dFVuaXQgbG9naWNhbEhlaWdodFZh
bHVlLCBjb25zdCBSZW5kZXJCb3hNb2RlbE9iamVjdCYgY29udGFpbmVyQmxvY2ssIExheW91dFVu
aXQgY29udGFpbmVyTG9naWNhbEhlaWdodEZvclBvc2l0aW9uZWQpCitzdGF0aWMgdm9pZCBjb21w
dXRlTG9naWNhbFRvcFBvc2l0aW9uZWRPZmZzZXQoTGF5b3V0VW5pdCYgbG9naWNhbFRvcFBvcywg
Y29uc3QgUmVuZGVyQm94KiBjaGlsZCwgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0VmFsdWUsIGNv
bnN0IFJlbmRlckJveE1vZGVsT2JqZWN0JiBjb250YWluZXJCbG9jaywgTGF5b3V0VW5pdCBjb250
YWluZXJMb2dpY2FsSGVpZ2h0Rm9yUG9zaXRpb25lZCwgYm9vbCBsb2dpY2FsVG9wSXNBdXRvLCBi
b29sIGxvZ2ljYWxCb3R0b21Jc0F1dG8pCiB7Ci0gICAgYXV0byBsb2dpY2FsVG9wQW5kQm90dG9t
QXJlQXV0byA9IGNoaWxkLT5zdHlsZSgpLmxvZ2ljYWxUb3AoKS5pc0F1dG8oKSAmJiBjaGlsZC0+
c3R5bGUoKS5sb2dpY2FsQm90dG9tKCkuaXNBdXRvKCk7CisgICAgYXV0byBsb2dpY2FsVG9wQW5k
Qm90dG9tQXJlQXV0byA9IGxvZ2ljYWxUb3BJc0F1dG8gJiYgbG9naWNhbEJvdHRvbUlzQXV0bzsK
ICAgICBhdXRvIGhhdmVPcnRob2dvbmFsV3JpdGluZ01vZGVzID0gaXNPcnRob2dvbmFsKCpjaGls
ZCwgY29udGFpbmVyQmxvY2spOwogICAgIGF1dG8gaGF2ZUZsaXBwZWRCbG9ja0F4aXMgPSBjaGls
ZC0+c3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9kZSgpICE9IGNvbnRhaW5lckJsb2Nr
LnN0eWxlKCkuaXNGbGlwcGVkQmxvY2tzV3JpdGluZ01vZGUoKTsKKyAgICBib29sIGlzT3ZlcmNv
bnN0cmFpbmVkID0gIWxvZ2ljYWxUb3BJc0F1dG8gJiYgIWxvZ2ljYWxCb3R0b21Jc0F1dG8gJiYg
IWNoaWxkLT5zdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKS5pc0F1dG8oKTsKIAogICAgIC8vIERlYWwg
d2l0aCBkaWZmZXJpbmcgd3JpdGluZyBtb2RlcyBoZXJlLiAgT3VyIG9mZnNldCBuZWVkcyB0byBi
ZSBpbiB0aGUgY29udGFpbmluZyBibG9jaydzIGNvb3JkaW5hdGUgc3BhY2UuIElmIHRoZSBjb250
YWluaW5nIGJsb2NrIGlzIGZsaXBwZWQKICAgICAvLyBhbG9uZyB0aGlzIGF4aXMsIHRoZW4gd2Ug
bmVlZCB0byBmbGlwIHRoZSBjb29yZGluYXRlLiAgVGhpcyBjYW4gb25seSBoYXBwZW4gaWYgdGhl
IGNvbnRhaW5pbmcgYmxvY2sgaXMgYm90aCBhIGZsaXBwZWQgbW9kZSBhbmQgcGVycGVuZGljdWxh
ciB0byB1cy4KLSAgICBpZiAoKGhhdmVPcnRob2dvbmFsV3JpdGluZ01vZGVzICYmICFsb2dpY2Fs
VG9wQW5kQm90dG9tQXJlQXV0byAmJiBjaGlsZC0+c3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0
aW5nTW9kZSgpKQotICAgICAgICB8fCAoaGF2ZUZsaXBwZWRCbG9ja0F4aXMgJiYgIWhhdmVPcnRo
b2dvbmFsV3JpdGluZ01vZGVzKSkKLSAgICAgICAgbG9naWNhbFRvcFBvcyA9IGNvbnRhaW5lckxv
Z2ljYWxIZWlnaHRGb3JQb3NpdGlvbmVkIC0gbG9naWNhbEhlaWdodFZhbHVlIC0gbG9naWNhbFRv
cFBvczsKKyAgICBpZiAoIWlzT3ZlcmNvbnN0cmFpbmVkKSB7CisgICAgICAgIGlmICgoaGF2ZU9y
dGhvZ29uYWxXcml0aW5nTW9kZXMgJiYgIWxvZ2ljYWxUb3BBbmRCb3R0b21BcmVBdXRvICYmIGNo
aWxkLT5zdHlsZSgpLmlzRmxpcHBlZEJsb2Nrc1dyaXRpbmdNb2RlKCkpCisgICAgICAgICAgICB8
fCAoaGF2ZUZsaXBwZWRCbG9ja0F4aXMgJiYgIWhhdmVPcnRob2dvbmFsV3JpdGluZ01vZGVzKSkK
KyAgICAgICAgICAgIGxvZ2ljYWxUb3BQb3MgPSBjb250YWluZXJMb2dpY2FsSGVpZ2h0Rm9yUG9z
aXRpb25lZCAtIGxvZ2ljYWxIZWlnaHRWYWx1ZSAtIGxvZ2ljYWxUb3BQb3M7CisgICAgfQogCiAg
ICAgLy8gT3VyIG9mZnNldCBpcyBmcm9tIHRoZSBsb2dpY2FsIGJvdHRvbSBlZGdlIGluIGEgZmxp
cHBlZCBlbnZpcm9ubWVudCwgZS5nLiwgcmlnaHQgZm9yIHZlcnRpY2FsLXJsIGFuZCBib3R0b20g
Zm9yIGhvcml6b250YWwtYnQuCiAgICAgaWYgKGNvbnRhaW5lckJsb2NrLnN0eWxlKCkuaXNGbGlw
cGVkQmxvY2tzV3JpdGluZ01vZGUoKSAmJiAhaGF2ZU9ydGhvZ29uYWxXcml0aW5nTW9kZXMpIHsK
QEAgLTQ1NjIsNiArNDU2NSwxNiBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRM
b2dpY2FsSGVpZ2h0VXNpbmcoU2l6ZVR5cGUgaGVpZ2h0VHlwZSwgTGVuZ3RoCiAgICAgICAgICAg
ICAvLyBPdmVyLWNvbnN0cmFpbmVkLCAobm8gbmVlZCBzb2x2ZSBmb3IgYm90dG9tKQogICAgICAg
ICAgICAgY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fYmVmb3JlID0gdmFsdWVGb3JMZW5ndGgo
bWFyZ2luQmVmb3JlLCBjb250YWluZXJSZWxhdGl2ZUxvZ2ljYWxXaWR0aCk7CiAgICAgICAgICAg
ICBjb21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9hZnRlciA9IHZhbHVlRm9yTGVuZ3RoKG1hcmdp
bkFmdGVyLCBjb250YWluZXJSZWxhdGl2ZUxvZ2ljYWxXaWR0aCk7CisKKyAgICAgICAgICAgIGlm
IChpc09ydGhvZ29uYWwoKnRoaXMsIGNvbnRhaW5lckJsb2NrKSkgeworICAgICAgICAgICAgICAg
IC8vIFdoZW4gb3J0aG9nb25hbCB3ZSB3YW50IHRvIGV4cGxpY2l0bHkgZGVhbCB3aXRoIGxlZnQv
cmlnaHQgaW5zdGVhZCBvZiB0b3AvYm90dG9tLCBzbyBjb21wdXRlIHBoeXNpY2FsIGxlZnQgbmV4
dC4KKyAgICAgICAgICAgICAgICBsb2dpY2FsVG9wVmFsdWUgPSB2YWx1ZUZvckxlbmd0aChzdHls
ZSgpLmxlZnQoKSwgY29udGFpbmVyTG9naWNhbEhlaWdodCk7CisgICAgICAgICAgICAgICAgaWYg
KGNvbnRhaW5lckJsb2NrLnN0eWxlKCkuZGlyZWN0aW9uKCkgPT0gVGV4dERpcmVjdGlvbjo6UlRM
KSB7CisgICAgICAgICAgICAgICAgICAgIC8vIFJlY29tcHV0ZSBhdmFpbGFibGVTcGFjZSB3aXRo
IHBoeXNpY2FsIGxlZnQuCisgICAgICAgICAgICAgICAgICAgIExheW91dFVuaXQgYXZhaWxhYmxl
U3BhY2UgPSBjb250YWluZXJMb2dpY2FsSGVpZ2h0IC0gKGxvZ2ljYWxUb3BWYWx1ZSArIGxvZ2lj
YWxIZWlnaHRWYWx1ZSArIHZhbHVlRm9yTGVuZ3RoKHN0eWxlKCkucmlnaHQoKSwgY29udGFpbmVy
TG9naWNhbEhlaWdodCkgKyBib3JkZXJzUGx1c1BhZGRpbmcpOworICAgICAgICAgICAgICAgICAg
ICBsb2dpY2FsVG9wVmFsdWUgPSAoYXZhaWxhYmxlU3BhY2UgKyBsb2dpY2FsVG9wVmFsdWUpIC0g
Y29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fYmVmb3JlIC0gY29tcHV0ZWRWYWx1ZXMubV9tYXJn
aW5zLm1fYWZ0ZXI7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQogICAgICAgICB9
CiAgICAgfSBlbHNlIHsKICAgICAgICAgLyotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSpcCkBAIC00NjIyLDcgKzQ2MzUs
NyBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0VXNpbmco
U2l6ZVR5cGUgaGVpZ2h0VHlwZSwgTGVuZ3RoCiAKICAgICAvLyBVc2UgY29tcHV0ZWQgdmFsdWVz
IHRvIGNhbGN1bGF0ZSB0aGUgdmVydGljYWwgcG9zaXRpb24uCiAgICAgY29tcHV0ZWRWYWx1ZXMu
bV9wb3NpdGlvbiA9IGxvZ2ljYWxUb3BWYWx1ZSArIGNvbXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5t
X2JlZm9yZTsKLSAgICBjb21wdXRlTG9naWNhbFRvcFBvc2l0aW9uZWRPZmZzZXQoY29tcHV0ZWRW
YWx1ZXMubV9wb3NpdGlvbiwgdGhpcywgbG9naWNhbEhlaWdodFZhbHVlICsgYm9yZGVyc1BsdXNQ
YWRkaW5nLCBjb250YWluZXJCbG9jaywgY29udGFpbmVyTG9naWNhbEhlaWdodCk7CisgICAgY29t
cHV0ZUxvZ2ljYWxUb3BQb3NpdGlvbmVkT2Zmc2V0KGNvbXB1dGVkVmFsdWVzLm1fcG9zaXRpb24s
IHRoaXMsIGxvZ2ljYWxIZWlnaHRWYWx1ZSArIGJvcmRlcnNQbHVzUGFkZGluZywgY29udGFpbmVy
QmxvY2ssIGNvbnRhaW5lckxvZ2ljYWxIZWlnaHQsIHN0eWxlKCkubG9naWNhbFRvcCgpLmlzQXV0
bygpLCBzdHlsZSgpLmxvZ2ljYWxCb3R0b20oKS5pc0F1dG8oKSk7CiB9CiAKIHZvaWQgUmVuZGVy
Qm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxXaWR0aFJlcGxhY2VkKExvZ2ljYWxFeHRlbnRD
b21wdXRlZFZhbHVlcyYgY29tcHV0ZWRWYWx1ZXMpIGNvbnN0CkBAIC00OTIxLDcgKzQ5MzQsNyBA
QCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0UmVwbGFjZWQo
TG9naWNhbEV4dGVudENvbXB1dGVkVmFsdQogICAgIC8vIFVzZSBjb21wdXRlZCB2YWx1ZXMgdG8g
Y2FsY3VsYXRlIHRoZSB2ZXJ0aWNhbCBwb3NpdGlvbi4KICAgICBMYXlvdXRVbml0IGxvZ2ljYWxU
b3BQb3MgPSBsb2dpY2FsVG9wVmFsdWUgKyBtYXJnaW5CZWZvcmVBbGlhczsKICAgICAvLyBCb3Jk
ZXIgYW5kIHBhZGRpbmcgaGF2ZSBhbHJlYWR5IGJlZW4gaW5jbHVkZWQgaW4gY29tcHV0ZWRWYWx1
ZXMubV9leHRlbnQuCi0gICAgY29tcHV0ZUxvZ2ljYWxUb3BQb3NpdGlvbmVkT2Zmc2V0KGxvZ2lj
YWxUb3BQb3MsIHRoaXMsIGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50LCBjb250YWluZXJCbG9jaywg
Y29udGFpbmVyTG9naWNhbEhlaWdodCk7CisgICAgY29tcHV0ZUxvZ2ljYWxUb3BQb3NpdGlvbmVk
T2Zmc2V0KGxvZ2ljYWxUb3BQb3MsIHRoaXMsIGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50LCBjb250
YWluZXJCbG9jaywgY29udGFpbmVyTG9naWNhbEhlaWdodCwgc3R5bGUoKS5sb2dpY2FsVG9wKCku
aXNBdXRvKCksIHN0eWxlKCkubG9naWNhbEJvdHRvbSgpLmlzQXV0bygpKTsKICAgICBjb21wdXRl
ZFZhbHVlcy5tX3Bvc2l0aW9uID0gbG9naWNhbFRvcFBvczsKIH0KIApkaWZmIC0tZ2l0IGEvTGF5
b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMK
aW5kZXggNzRmZDFjN2QwZDQ5Li43ZGQ0YzdkMTA2ZjEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz
L1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAt
NDIyNCwxMCArNDIyNCw2IEBAIHdlYmtpdC5vcmcvYi8xNjY5NDEgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvbG9naWNhCiAKIHdlYmtpdC5vcmcv
Yi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmct
bW9kZXMvY2VudHJhbC1iYXNlbGluZS1hbGlnbm1lbnQtMDAzLnhodCBbIEltYWdlT25seUZhaWx1
cmUgUGFzcyBdCiB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2NsZWFyYW5jZS1jYWxjdWxhdGlvbnMtdnJsLTAw
Mi54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIFBhc3MgXQotd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9z
LW5vbi1yZXBsYWNlZC1pY2ItdmxyLTAzMy54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtp
dC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdy
aXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtaWNiLXZybC0wMzAueGh0IFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZsci0w
OTUueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9u
LXJlcGxhY2VkLXZybC0wODgueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2Iv
MjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1v
ZGVzL2F2YWlsYWJsZS1zaXplLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQu
b3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0
aW5nLW1vZGVzL2F2YWlsYWJsZS1zaXplLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3
ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy13cml0aW5nLW1vZGVzL2F2YWlsYWJsZS1zaXplLTAwMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCkBAIC00NzE5LDcgKzQ3MTUsNiBAQCB3ZWJraXQub3JnL2IvMjE0NDYyIGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zY29waW5nL3Nsb3R0ZWQtcGxhYwogCiAjIGFz
cGVjdC1yYXRpbyAoc29tZSBvZiB0aGVzZSByZWx5IG9uIGNvbnRhaW4taW50cmluc2ljLXNpemUp
CiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMTQuaHRtbCBbIEltYWdlT25seUZhaWx1
cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDIwLmh0bWwgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDAyLmh0
bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3Bl
Y3QtcmF0aW8tMDA0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0
NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt
cmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KZGlm
ZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5
b3V0VGVzdHMvcGxhdGZvcm0vaW9zL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggMTIwMGY1N2QzZmFl
Li5hZTY5YWMyMTk4MTUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9UZXN0
RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9UZXN0RXhwZWN0YXRp
b25zCkBAIC0zMzc3LDYgKzMzNzcsNyBAQCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2h0bWwvY2FudmFzL2VsZW1lbnQvd2lkZS1nYW11dC1jYW52YXMvMmQuY29sb3Iucwogc3RvcmFn
ZS9pbmRleGVkZGIvc3RydWN0dXJlZC1jbG9uZS1pbWFnZS1kYXRhLWRpc3BsYXktcDMuaHRtbCBb
IFBhc3MgXQogCiAjIFNob3cgMXB4IGRpZmYgaW4gdGhlIHJlc3VsdC4gTWF5YmUgaGl0dGluZyB0
aGUgYmFja2dyb3VuZCBibGVlZCBhdm9pZGFuY2UgY29kZSBwYXRoLgord2Via2l0Lm9yZy9iLzIy
OTM5NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rl
cy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12bHItMDk1LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQog
d2Via2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12bHItMTA5LnhodCBbIEltYWdl
T25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC12bHIt
MTI1LnhodCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG9zLW5v
bi1yZXBsYWNlZC12bHItMTQxLnhodCBbIEltYWdlT25seUZhaWx1cmUgXQpAQCAtMzM5NCw2ICsz
Mzk1LDcgQEAgd2Via2l0Lm9yZy9iLzIyOTM5NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9hYnMtcG8KIHdlYmtpdC5vcmcvYi8yMjkzOTcgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBv
cy1ub24tcmVwbGFjZWQtdnJsLTA1Mi54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5v
cmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRp
bmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdnJsLTA2NC54aHQgWyBJbWFnZU9ubHlGYWls
dXJlIF0KIHdlYmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdnJsLTA3Ni54aHQg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KK3dlYmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFj
ZWQtdnJsLTA4OC54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMjkzOTcg
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJz
LXBvcy1ub24tcmVwbGFjZWQtdnJsLTEwNC54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtp
dC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdy
aXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdnJsLTEwOC54aHQgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdnJsLTExMi54
aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>462183</attachid>
            <date>2022-09-07 06:43:16 -0700</date>
            <delta_ts>2022-09-09 13:53:55 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232012-20220907144315.patch</filename>
            <type>text/plain</type>
            <size>10969</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">RnJvbSBmOTMzZjVjM2YzOWZlMTNhZWY2NWViMzcwODY1MjQ3Y2QwOGJkZGQ3IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBSb2IgQnVpcyA8cmJ1aXNAaWdhbGlhLmNvbT4KRGF0ZTogV2Vk
LCA3IFNlcCAyMDIyIDE0OjM0OjA3ICswMTAwClN1YmplY3Q6IFtQQVRDSF0gQWRkIG92ZXItY29u
c3RyYWluZWQgZGlyZWN0aW9uIGNoZWNrIHRvCiBjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWln
aHRVc2luZwogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjAxMgoK
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpJbiBjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxI
ZWlnaHRVc2luZyB0aGUgb3Zlci1jb25zdHJhaW5lZCBjYXNlIG5ldmVyIHRvb2sgaW50bwphY2Nv
dW50IFJUTCBkaXJlY3Rpb24sIGJ1dCB0aGlzIHNob3VsZCBiZSBkb25lIGlmIHdlIGFyZSBhY3R1
YWxseSBkZWFsaW5nIHdpdGggbGVmdC9yaWdodCBwcm9wZXJ0aWVzLiBbMV0KRmluYWxseSwgY29t
cHV0ZUxvZ2ljYWxUb3BQb3NpdGlvbmVkT2Zmc2V0IHNob3VsZCBub3QgZG8gdGhlIGZsaXBwaW5n
IGxvZ2ljIGluIHRoZSBvdmVyLWNvbnN0cmFpbmVkIGNhc2UuCgpbMV0gaHR0cDovL3d3dy53My5v
cmcvVFIvY3NzLXdyaXRpbmctbW9kZXMtMy8jdmVydGljYWwtbGF5b3V0CgoqIExheW91dFRlc3Rz
L1Rlc3RFeHBlY3RhdGlvbnM6CiogTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zL1Rlc3RFeHBlY3Rh
dGlvbnM6CiogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CihXZWJDb3Jl
Ojpjb21wdXRlTG9naWNhbFRvcFBvc2l0aW9uZWRPZmZzZXQpOgooV2ViQ29yZTo6UmVuZGVyQm94
Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyBjb25zdCk6CihXZWJDb3JlOjpS
ZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFJlcGxhY2VkIGNvbnN0KToK
LS0tCiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCAgICB8IDI3ICsrKysr
KysrKysrKysrKysrLS0tLS0tCiBMYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zICAgICAgICAg
ICAgICB8ICA1IC0tLS0tCiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvVGVzdEV4cGVjdGF0aW9u
cyB8ICAyICsrCiAzIGZpbGVzIGNoYW5nZWQsIDIyIGluc2VydGlvbnMoKyksIDEyIGRlbGV0aW9u
cygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3Bw
IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggZWNiZWRlZGVi
M2M1Li5jYWZjZmFkZDcxZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S
ZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3Bw
CkBAIC00NDYwLDE3ICs0NDYwLDIwIEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25l
ZExvZ2ljYWxIZWlnaHQoTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzJiBjb21wCiAvLyBUaGUg
fGNvbnRhaW5lckxvZ2ljYWxIZWlnaHRGb3JQb3NpdGlvbmVkfCBpcyBhbHJlYWR5IGF3YXJlIG9m
IG9ydGhvZ29uYWwgZmxvd3MuCiAvLyBUaGUgbG9naWNhbFRvcCBjb25jZXB0IGlzIGNvbmZ1c2lu
ZyBoZXJlLiBJdCdzIHRoZSBsb2dpY2FsIHRvcCBmcm9tIHRoZSBjaGlsZCdzIFBPVi4gVGhpcyBt
ZWFucyB0aGF0IGlzIHRoZSBwaHlzaWNhbAogLy8geSBpZiB0aGUgY2hpbGQgaXMgdmVydGljYWwg
b3IgdGhlIHBoeXNpY2FsIHggaWYgdGhlIGNoaWxkIGlzIGhvcml6b250YWwuCi1zdGF0aWMgdm9p
ZCBjb21wdXRlTG9naWNhbFRvcFBvc2l0aW9uZWRPZmZzZXQoTGF5b3V0VW5pdCYgbG9naWNhbFRv
cFBvcywgY29uc3QgUmVuZGVyQm94KiBjaGlsZCwgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0VmFs
dWUsIGNvbnN0IFJlbmRlckJveE1vZGVsT2JqZWN0JiBjb250YWluZXJCbG9jaywgTGF5b3V0VW5p
dCBjb250YWluZXJMb2dpY2FsSGVpZ2h0Rm9yUG9zaXRpb25lZCkKK3N0YXRpYyB2b2lkIGNvbXB1
dGVMb2dpY2FsVG9wUG9zaXRpb25lZE9mZnNldChMYXlvdXRVbml0JiBsb2dpY2FsVG9wUG9zLCBj
b25zdCBSZW5kZXJCb3gqIGNoaWxkLCBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHRWYWx1ZSwgY29u
c3QgUmVuZGVyQm94TW9kZWxPYmplY3QmIGNvbnRhaW5lckJsb2NrLCBMYXlvdXRVbml0IGNvbnRh
aW5lckxvZ2ljYWxIZWlnaHRGb3JQb3NpdGlvbmVkLCBib29sIGxvZ2ljYWxUb3BJc0F1dG8sIGJv
b2wgbG9naWNhbEJvdHRvbUlzQXV0bykKIHsKLSAgICBhdXRvIGxvZ2ljYWxUb3BBbmRCb3R0b21B
cmVBdXRvID0gY2hpbGQtPnN0eWxlKCkubG9naWNhbFRvcCgpLmlzQXV0bygpICYmIGNoaWxkLT5z
dHlsZSgpLmxvZ2ljYWxCb3R0b20oKS5pc0F1dG8oKTsKKyAgICBhdXRvIGxvZ2ljYWxUb3BBbmRC
b3R0b21BcmVBdXRvID0gbG9naWNhbFRvcElzQXV0byAmJiBsb2dpY2FsQm90dG9tSXNBdXRvOwog
ICAgIGF1dG8gaGF2ZU9ydGhvZ29uYWxXcml0aW5nTW9kZXMgPSBpc09ydGhvZ29uYWwoKmNoaWxk
LCBjb250YWluZXJCbG9jayk7CiAgICAgYXV0byBoYXZlRmxpcHBlZEJsb2NrQXhpcyA9IGNoaWxk
LT5zdHlsZSgpLmlzRmxpcHBlZEJsb2Nrc1dyaXRpbmdNb2RlKCkgIT0gY29udGFpbmVyQmxvY2su
c3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9kZSgpOworICAgIGJvb2wgaXNPdmVyY29u
c3RyYWluZWQgPSAhbG9naWNhbFRvcElzQXV0byAmJiAhbG9naWNhbEJvdHRvbUlzQXV0byAmJiAh
Y2hpbGQtPnN0eWxlKCkubG9naWNhbEhlaWdodCgpLmlzQXV0bygpOwogCiAgICAgLy8gRGVhbCB3
aXRoIGRpZmZlcmluZyB3cml0aW5nIG1vZGVzIGhlcmUuICBPdXIgb2Zmc2V0IG5lZWRzIHRvIGJl
IGluIHRoZSBjb250YWluaW5nIGJsb2NrJ3MgY29vcmRpbmF0ZSBzcGFjZS4gSWYgdGhlIGNvbnRh
aW5pbmcgYmxvY2sgaXMgZmxpcHBlZAogICAgIC8vIGFsb25nIHRoaXMgYXhpcywgdGhlbiB3ZSBu
ZWVkIHRvIGZsaXAgdGhlIGNvb3JkaW5hdGUuICBUaGlzIGNhbiBvbmx5IGhhcHBlbiBpZiB0aGUg
Y29udGFpbmluZyBibG9jayBpcyBib3RoIGEgZmxpcHBlZCBtb2RlIGFuZCBwZXJwZW5kaWN1bGFy
IHRvIHVzLgotICAgIGlmICgoaGF2ZU9ydGhvZ29uYWxXcml0aW5nTW9kZXMgJiYgIWxvZ2ljYWxU
b3BBbmRCb3R0b21BcmVBdXRvICYmIGNoaWxkLT5zdHlsZSgpLmlzRmxpcHBlZEJsb2Nrc1dyaXRp
bmdNb2RlKCkpCi0gICAgICAgIHx8IChoYXZlRmxpcHBlZEJsb2NrQXhpcyAmJiAhaGF2ZU9ydGhv
Z29uYWxXcml0aW5nTW9kZXMpKQotICAgICAgICBsb2dpY2FsVG9wUG9zID0gY29udGFpbmVyTG9n
aWNhbEhlaWdodEZvclBvc2l0aW9uZWQgLSBsb2dpY2FsSGVpZ2h0VmFsdWUgLSBsb2dpY2FsVG9w
UG9zOworICAgIGlmICghaXNPdmVyY29uc3RyYWluZWQpIHsKKyAgICAgICAgaWYgKChoYXZlT3J0
aG9nb25hbFdyaXRpbmdNb2RlcyAmJiAhbG9naWNhbFRvcEFuZEJvdHRvbUFyZUF1dG8gJiYgY2hp
bGQtPnN0eWxlKCkuaXNGbGlwcGVkQmxvY2tzV3JpdGluZ01vZGUoKSkKKyAgICAgICAgICAgIHx8
IChoYXZlRmxpcHBlZEJsb2NrQXhpcyAmJiAhaGF2ZU9ydGhvZ29uYWxXcml0aW5nTW9kZXMpKQor
ICAgICAgICAgICAgbG9naWNhbFRvcFBvcyA9IGNvbnRhaW5lckxvZ2ljYWxIZWlnaHRGb3JQb3Np
dGlvbmVkIC0gbG9naWNhbEhlaWdodFZhbHVlIC0gbG9naWNhbFRvcFBvczsKKyAgICB9CiAKICAg
ICAvLyBPdXIgb2Zmc2V0IGlzIGZyb20gdGhlIGxvZ2ljYWwgYm90dG9tIGVkZ2UgaW4gYSBmbGlw
cGVkIGVudmlyb25tZW50LCBlLmcuLCByaWdodCBmb3IgdmVydGljYWwtcmwgYW5kIGJvdHRvbSBm
b3IgaG9yaXpvbnRhbC1idC4KICAgICBpZiAoY29udGFpbmVyQmxvY2suc3R5bGUoKS5pc0ZsaXBw
ZWRCbG9ja3NXcml0aW5nTW9kZSgpICYmICFoYXZlT3J0aG9nb25hbFdyaXRpbmdNb2RlcykgewpA
QCAtNDU2NSw2ICs0NTY4LDE2IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExv
Z2ljYWxIZWlnaHRVc2luZyhTaXplVHlwZSBoZWlnaHRUeXBlLCBMZW5ndGgKICAgICAgICAgICAg
IC8vIE92ZXItY29uc3RyYWluZWQsIChubyBuZWVkIHNvbHZlIGZvciBib3R0b20pCiAgICAgICAg
ICAgICBjb21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9iZWZvcmUgPSB2YWx1ZUZvckxlbmd0aCht
YXJnaW5CZWZvcmUsIGNvbnRhaW5lclJlbGF0aXZlTG9naWNhbFdpZHRoKTsKICAgICAgICAgICAg
IGNvbXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5tX2FmdGVyID0gdmFsdWVGb3JMZW5ndGgobWFyZ2lu
QWZ0ZXIsIGNvbnRhaW5lclJlbGF0aXZlTG9naWNhbFdpZHRoKTsKKworICAgICAgICAgICAgaWYg
KGlzT3J0aG9nb25hbCgqdGhpcywgY29udGFpbmVyQmxvY2spKSB7CisgICAgICAgICAgICAgICAg
Ly8gV2hlbiBvcnRob2dvbmFsIHdlIHdhbnQgdG8gZXhwbGljaXRseSBkZWFsIHdpdGggbGVmdC9y
aWdodCBpbnN0ZWFkIG9mIHRvcC9ib3R0b20sIHNvIGNvbXB1dGUgcGh5c2ljYWwgbGVmdCBuZXh0
LgorICAgICAgICAgICAgICAgIGxvZ2ljYWxUb3BWYWx1ZSA9IHZhbHVlRm9yTGVuZ3RoKHN0eWxl
KCkubGVmdCgpLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0KTsKKyAgICAgICAgICAgICAgICBpZiAo
Y29udGFpbmVyQmxvY2suc3R5bGUoKS5kaXJlY3Rpb24oKSA9PSBUZXh0RGlyZWN0aW9uOjpSVEwp
IHsKKyAgICAgICAgICAgICAgICAgICAgLy8gUmVjb21wdXRlIGF2YWlsYWJsZVNwYWNlIHdpdGgg
cGh5c2ljYWwgbGVmdC4KKyAgICAgICAgICAgICAgICAgICAgTGF5b3V0VW5pdCBhdmFpbGFibGVT
cGFjZSA9IGNvbnRhaW5lckxvZ2ljYWxIZWlnaHQgLSAobG9naWNhbFRvcFZhbHVlICsgbG9naWNh
bEhlaWdodFZhbHVlICsgdmFsdWVGb3JMZW5ndGgoc3R5bGUoKS5yaWdodCgpLCBjb250YWluZXJM
b2dpY2FsSGVpZ2h0KSArIGJvcmRlcnNQbHVzUGFkZGluZyk7CisgICAgICAgICAgICAgICAgICAg
IGxvZ2ljYWxUb3BWYWx1ZSA9IChhdmFpbGFibGVTcGFjZSArIGxvZ2ljYWxUb3BWYWx1ZSkgLSBj
b21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9iZWZvcmUgLSBjb21wdXRlZFZhbHVlcy5tX21hcmdp
bnMubV9hZnRlcjsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9CiAgICAgICAgIH0K
ICAgICB9IGVsc2UgewogICAgICAgICAvKi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tKlwKQEAgLTQ2MjUsNyArNDYzOCw3
IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyhT
aXplVHlwZSBoZWlnaHRUeXBlLCBMZW5ndGgKIAogICAgIC8vIFVzZSBjb21wdXRlZCB2YWx1ZXMg
dG8gY2FsY3VsYXRlIHRoZSB2ZXJ0aWNhbCBwb3NpdGlvbi4KICAgICBjb21wdXRlZFZhbHVlcy5t
X3Bvc2l0aW9uID0gbG9naWNhbFRvcFZhbHVlICsgY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1f
YmVmb3JlOwotICAgIGNvbXB1dGVMb2dpY2FsVG9wUG9zaXRpb25lZE9mZnNldChjb21wdXRlZFZh
bHVlcy5tX3Bvc2l0aW9uLCB0aGlzLCBsb2dpY2FsSGVpZ2h0VmFsdWUgKyBib3JkZXJzUGx1c1Bh
ZGRpbmcsIGNvbnRhaW5lckJsb2NrLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0KTsKKyAgICBjb21w
dXRlTG9naWNhbFRvcFBvc2l0aW9uZWRPZmZzZXQoY29tcHV0ZWRWYWx1ZXMubV9wb3NpdGlvbiwg
dGhpcywgbG9naWNhbEhlaWdodFZhbHVlICsgYm9yZGVyc1BsdXNQYWRkaW5nLCBjb250YWluZXJC
bG9jaywgY29udGFpbmVyTG9naWNhbEhlaWdodCwgc3R5bGUoKS5sb2dpY2FsVG9wKCkuaXNBdXRv
KCksIHN0eWxlKCkubG9naWNhbEJvdHRvbSgpLmlzQXV0bygpKTsKIH0KIAogdm9pZCBSZW5kZXJC
b3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoUmVwbGFjZWQoTG9naWNhbEV4dGVudENv
bXB1dGVkVmFsdWVzJiBjb21wdXRlZFZhbHVlcykgY29uc3QKQEAgLTQ5MjQsNyArNDkzNyw3IEBA
IHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRSZXBsYWNlZChM
b2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1CiAgICAgLy8gVXNlIGNvbXB1dGVkIHZhbHVlcyB0byBj
YWxjdWxhdGUgdGhlIHZlcnRpY2FsIHBvc2l0aW9uLgogICAgIExheW91dFVuaXQgbG9naWNhbFRv
cFBvcyA9IGxvZ2ljYWxUb3BWYWx1ZSArIG1hcmdpbkJlZm9yZUFsaWFzOwogICAgIC8vIEJvcmRl
ciBhbmQgcGFkZGluZyBoYXZlIGFscmVhZHkgYmVlbiBpbmNsdWRlZCBpbiBjb21wdXRlZFZhbHVl
cy5tX2V4dGVudC4KLSAgICBjb21wdXRlTG9naWNhbFRvcFBvc2l0aW9uZWRPZmZzZXQobG9naWNh
bFRvcFBvcywgdGhpcywgY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQsIGNvbnRhaW5lckJsb2NrLCBj
b250YWluZXJMb2dpY2FsSGVpZ2h0KTsKKyAgICBjb21wdXRlTG9naWNhbFRvcFBvc2l0aW9uZWRP
ZmZzZXQobG9naWNhbFRvcFBvcywgdGhpcywgY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQsIGNvbnRh
aW5lckJsb2NrLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0LCBzdHlsZSgpLmxvZ2ljYWxUb3AoKS5p
c0F1dG8oKSwgc3R5bGUoKS5sb2dpY2FsQm90dG9tKCkuaXNBdXRvKCkpOwogICAgIGNvbXB1dGVk
VmFsdWVzLm1fcG9zaXRpb24gPSBsb2dpY2FsVG9wUG9zOwogfQogCmRpZmYgLS1naXQgYS9MYXlv
dXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpp
bmRleCA3NjllOTBmZmQ0MzcuLmUxMzg3NjE4YjNkOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv
VGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00
MjA5LDEwICs0MjA5LDYgQEAgd2Via2l0Lm9yZy9iLzE2Njk0MSBpbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9sb2dpY2EKIAogd2Via2l0Lm9yZy9i
LzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1t
b2Rlcy9jZW50cmFsLWJhc2VsaW5lLWFsaWdubWVudC0wMDMueGh0IFsgSW1hZ2VPbmx5RmFpbHVy
ZSBQYXNzIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvY2xlYXJhbmNlLWNhbGN1bGF0aW9ucy12cmwtMDAy
LnhodCBbIEltYWdlT25seUZhaWx1cmUgUGFzcyBdCi13ZWJraXQub3JnL2IvMjA5MDgwIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mt
bm9uLXJlcGxhY2VkLWljYi12bHItMDMzLnhodCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0
Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3Jp
dGluZy1tb2Rlcy9hYnMtcG9zLW5vbi1yZXBsYWNlZC1pY2ItdnJsLTAzMC54aHQgWyBJbWFnZU9u
bHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdmxyLTA5
NS54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24t
cmVwbGFjZWQtdnJsLTA4OC54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8y
MDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9k
ZXMvYXZhaWxhYmxlLXNpemUtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5v
cmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRp
bmctbW9kZXMvYXZhaWxhYmxlLXNpemUtMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdl
YmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXdyaXRpbmctbW9kZXMvYXZhaWxhYmxlLXNpemUtMDAzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KQEAgLTQ3MDIsNyArNDY5OCw2IEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2xvdHRlZC1wbGFjCiAKICMgYXNw
ZWN0LXJhdGlvIChzb21lIG9mIHRoZXNlIHJlbHkgb24gY29udGFpbi1pbnRyaW5zaWMtc2l6ZSkK
IHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMjAuaHRtbCBbIEltYWdlT25seUZh
aWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDQuaHRt
bCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVj
dC1yYXRpby0wMzguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2
MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y
YXRpby9mbG9hdHMtYXNwZWN0LXJhdGlvLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCmRp
ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvVGVzdEV4cGVjdGF0aW9ucyBiL0xh
eW91dFRlc3RzL3BsYXRmb3JtL2lvcy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGIwMDA3MDQ4YTQw
My4uOGUxYmE5OGFmNWNjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvVGVz
dEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvVGVzdEV4cGVjdGF0
aW9ucwpAQCAtMzM3OCw2ICszMzc4LDcgQEAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9odG1sL2NhbnZhcy9lbGVtZW50L3dpZGUtZ2FtdXQtY2FudmFzLzJkLmNvbG9yLnMKIHN0b3Jh
Z2UvaW5kZXhlZGRiL3N0cnVjdHVyZWQtY2xvbmUtaW1hZ2UtZGF0YS1kaXNwbGF5LXAzLmh0bWwg
WyBQYXNzIF0KIAogIyBTaG93IDFweCBkaWZmIGluIHRoZSByZXN1bHQuIE1heWJlIGhpdHRpbmcg
dGhlIGJhY2tncm91bmQgYmxlZWQgYXZvaWRhbmNlIGNvZGUgcGF0aC4KK3dlYmtpdC5vcmcvYi8y
MjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9k
ZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdmxyLTA5NS54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
IHdlYmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdmxyLTEwOS54aHQgWyBJbWFn
ZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1ub24tcmVwbGFjZWQtdmxy
LTEyNS54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvcy1u
b24tcmVwbGFjZWQtdmxyLTE0MS54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KQEAgLTMzOTUsNiAr
MzM5Niw3IEBAIHdlYmtpdC5vcmcvYi8yMjkzOTcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvYWJzLXBvCiB3ZWJraXQub3JnL2IvMjI5Mzk3IGlt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1w
b3Mtbm9uLXJlcGxhY2VkLXZybC0wNTIueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQu
b3JnL2IvMjI5Mzk3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0
aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZybC0wNjQueGh0IFsgSW1hZ2VPbmx5RmFp
bHVyZSBdCiB3ZWJraXQub3JnL2IvMjI5Mzk3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZybC0wNzYueGh0
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCit3ZWJraXQub3JnL2IvMjI5Mzk3IGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxh
Y2VkLXZybC0wODgueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjI5Mzk3
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Fi
cy1wb3Mtbm9uLXJlcGxhY2VkLXZybC0xMDQueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJr
aXQub3JnL2IvMjI5Mzk3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13
cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZybC0xMDgueGh0IFsgSW1hZ2VPbmx5
RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjI5Mzk3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL2Ficy1wb3Mtbm9uLXJlcGxhY2VkLXZybC0xMTIu
eGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>