<?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>221671</bug_id>
          
          <creation_ts>2021-02-10 05:53:33 -0800</creation_ts>
          <short_desc>Take box-sizing into account in replaced element intrinsic sizing</short_desc>
          <delta_ts>2021-03-02 12:23:59 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>CSS</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>All</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          <blocked>47738</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Rob Buis">rbuis</reporter>
          <assigned_to name="Rob Buis">rbuis</assigned_to>
          <cc>changseok</cc>
    
    <cc>clopez</cc>
    
    <cc>darin</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>glenn</cc>
    
    <cc>kondapallykalyan</cc>
    
    <cc>pdr</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>youennf</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1727510</commentid>
    <comment_count>0</comment_count>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-10 05:53:33 -0800</bug_when>
    <thetext>Take into account box-sizing in replaced element intrinsic sizing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1727511</commentid>
    <comment_count>1</comment_count>
      <attachid>419838</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-10 05:55:42 -0800</bug_when>
    <thetext>Created attachment 419838
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1727564</commentid>
    <comment_count>2</comment_count>
      <attachid>419854</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-10 09:11:24 -0800</bug_when>
    <thetext>Created attachment 419854
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1729062</commentid>
    <comment_count>3</comment_count>
      <attachid>420278</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-15 01:16:56 -0800</bug_when>
    <thetext>Created attachment 420278
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1729063</commentid>
    <comment_count>4</comment_count>
    <who name="EWS Watchlist">ews-watchlist</who>
    <bug_when>2021-02-15 01:17:48 -0800</bug_when>
    <thetext>This patch modifies the imported WPT tests. Please ensure that any changes on the tests (not coming from a WPT import) are exported to WPT. Please see https://trac.webkit.org/wiki/WPTExportProcess</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1729598</commentid>
    <comment_count>5</comment_count>
      <attachid>420441</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-16 02:16:52 -0800</bug_when>
    <thetext>Created attachment 420441
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1730236</commentid>
    <comment_count>6</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-02-17 05:54:13 -0800</bug_when>
    <thetext>&lt;rdar://problem/74431153&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1730265</commentid>
    <comment_count>7</comment_count>
      <attachid>420643</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-17 07:34:09 -0800</bug_when>
    <thetext>Created attachment 420643
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1732185</commentid>
    <comment_count>8</comment_count>
      <attachid>420643</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2021-02-22 10:13:39 -0800</bug_when>
    <thetext>Comment on attachment 420643
Patch

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

&gt; Source/WebCore/rendering/RenderReplaced.cpp:579
&gt; +                BoxSizing boxSizing = BoxSizing::ContentBox;
&gt; +                if (style().hasAspectRatio())
&gt; +                    boxSizing = style().boxSizingForAspectRatio();

Maybe this should be a function on RenderStyle, call boxSizingForAspectRatio()?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1732201</commentid>
    <comment_count>9</comment_count>
      <attachid>421212</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-22 10:54:37 -0800</bug_when>
    <thetext>Created attachment 421212
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1732482</commentid>
    <comment_count>10</comment_count>
      <attachid>421298</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-23 03:34:01 -0800</bug_when>
    <thetext>Created attachment 421298
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1732623</commentid>
    <comment_count>11</comment_count>
      <attachid>420643</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-23 11:17:40 -0800</bug_when>
    <thetext>Comment on attachment 420643
Patch

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

&gt;&gt; Source/WebCore/rendering/RenderReplaced.cpp:579
&gt;&gt; +                    boxSizing = style().boxSizingForAspectRatio();
&gt; 
&gt; Maybe this should be a function on RenderStyle, call boxSizingForAspectRatio()?

We already have boxSizingForAspectRatio on RenderStyle. The code may be a bit misleading, the idea is for non CSS aspect-ratio to keep doing what we did before, i.e. ignore box-sizing here, but when CSS aspect-ratio is applied, pass the box-sizing in use to resolveWidthForRatio/resolveHeightForRatio since the passed intrinsicRatio is relative to either the border-box or content-box, depeding on boxSizingForAspectRatio.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1733528</commentid>
    <comment_count>12</comment_count>
      <attachid>421298</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2021-02-25 14:44:53 -0800</bug_when>
    <thetext>Comment on attachment 421298
Patch

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

&gt; Source/WebCore/rendering/RenderReplaced.cpp:539
&gt; +    if (boxSizing == BoxSizing::BorderBox)
&gt; +        return roundToInt(round((logicalHeight + borderAndPaddingLogicalHeight) * aspectRatio)) - borderAndPaddingLogicalWidth;
&gt; +    return roundToInt(round(logicalHeight * aspectRatio));

Do we know why this code does roundToInt()?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1733541</commentid>
    <comment_count>13</comment_count>
      <attachid>421298</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2021-02-25 15:19:09 -0800</bug_when>
    <thetext>Comment on attachment 421298
Patch

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

&gt;&gt; Source/WebCore/rendering/RenderReplaced.cpp:539
&gt;&gt; +    return roundToInt(round(logicalHeight * aspectRatio));
&gt; 
&gt; Do we know why this code does roundToInt()?

Both roundToInt and round are suspect. Neither of those snaps to a device pixel, so what is the goal?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1733545</commentid>
    <comment_count>14</comment_count>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2021-02-25 15:25:21 -0800</bug_when>
    <thetext>(In reply to Darin Adler from comment #13)
&gt; Comment on attachment 421298 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=421298&amp;action=review
&gt; 
&gt; &gt;&gt; Source/WebCore/rendering/RenderReplaced.cpp:539
&gt; &gt;&gt; +    return roundToInt(round(logicalHeight * aspectRatio));
&gt; &gt; 
&gt; &gt; Do we know why this code does roundToInt()?
&gt; 
&gt; Both roundToInt and round are suspect. Neither of those snaps to a device
&gt; pixel, so what is the goal?

This is layout code, so we shouldn&apos;t be snapping to device pixels at this point.

I think historically line layout has rounded to integral values, and this is part of that.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1733672</commentid>
    <comment_count>15</comment_count>
      <attachid>421298</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-25 22:49:24 -0800</bug_when>
    <thetext>Comment on attachment 421298
Patch

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

&gt;&gt;&gt;&gt; Source/WebCore/rendering/RenderReplaced.cpp:539
&gt;&gt;&gt;&gt; +    return roundToInt(round(logicalHeight * aspectRatio));
&gt;&gt;&gt; 
&gt;&gt;&gt; Do we know why this code does roundToInt()?
&gt;&gt; 
&gt;&gt; Both roundToInt and round are suspect. Neither of those snaps to a device pixel, so what is the goal?
&gt; 
&gt; This is layout code, so we shouldn&apos;t be snapping to device pixels at this point.
&gt; 
&gt; I think historically line layout has rounded to integral values, and this is part of that.

Possibly it can go, r112229 added this:
// FIXME: Remove unnecessary round/roundToInt calls from this method when layout is off ints: webkit.org/b/63656</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1733673</commentid>
    <comment_count>16</comment_count>
      <attachid>421613</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-25 22:53:05 -0800</bug_when>
    <thetext>Created attachment 421613
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1733692</commentid>
    <comment_count>17</comment_count>
      <attachid>421613</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-26 01:04:10 -0800</bug_when>
    <thetext>Comment on attachment 421613
Patch

Looks like we do not need roundToInt.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1734645</commentid>
    <comment_count>18</comment_count>
      <attachid>421613</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2021-03-01 15:20:36 -0800</bug_when>
    <thetext>Comment on attachment 421613
Patch

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

&gt; Source/WebCore/rendering/RenderReplaced.cpp:540
&gt; +    if (boxSizing == BoxSizing::BorderBox)
&gt; +        return LayoutUnit(round((logicalHeight + borderAndPaddingLogicalHeight) * aspectRatio)) - borderAndPaddingLogicalWidth;
&gt; +    return LayoutUnit(round(logicalHeight * aspectRatio));
&gt; +}

fromFloatRound()?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1734756</commentid>
    <comment_count>19</comment_count>
      <attachid>421906</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-01 22:41:28 -0800</bug_when>
    <thetext>Created attachment 421906
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1734765</commentid>
    <comment_count>20</comment_count>
      <attachid>421613</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-01 22:56:23 -0800</bug_when>
    <thetext>Comment on attachment 421613
Patch

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

&gt;&gt; Source/WebCore/rendering/RenderReplaced.cpp:540
&gt;&gt; +}
&gt; 
&gt; fromFloatRound()?

Sure, done.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1734836</commentid>
    <comment_count>21</comment_count>
      <attachid>421932</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-02 07:27:32 -0800</bug_when>
    <thetext>Created attachment 421932
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1734857</commentid>
    <comment_count>22</comment_count>
      <attachid>421613</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-02 08:18:54 -0800</bug_when>
    <thetext>Comment on attachment 421613
Patch

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

&gt;&gt;&gt; Source/WebCore/rendering/RenderReplaced.cpp:540
&gt;&gt;&gt; +}
&gt;&gt; 
&gt;&gt; fromFloatRound()?
&gt; 
&gt; Sure, done.

Using fromFloatRound caused (even visual) regressions, so I suggest we stick to using round as before, my goal here is to add CSS aspect-ratio logic and not regress the replaced aspect-ratio handling.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1734970</commentid>
    <comment_count>23</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-03-02 12:23:55 -0800</bug_when>
    <thetext>Committed r273753: &lt;https://commits.webkit.org/r273753&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 421932.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>419838</attachid>
            <date>2021-02-10 05:55:42 -0800</date>
            <delta_ts>2021-02-10 09:59:29 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-221671-20210210145540.patch</filename>
            <type>text/plain</type>
            <size>6443</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNjQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmJjZTkwZTk4MTRlZGU0
ZDc1YTNjNzIxYWNiMmRjZjdiNTNmNmRiYS4uMjQ4NTQ3NzNjN2RjYjA5NjQ0MWZjMDYwOGNmNDAz
ZDU3NDAwZmM2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTAyLTEwICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgVGFrZSBpbnRvIGFjY291bnQgYm94
LXNpemluZyBpbiByZXBsYWNlZCBlbGVtZW50IGludHJpbnNpYyBzaXppbmcKKyAgICAgICAgaHR0
cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTY3MQorCisgICAgICAgIFJl
dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdJUC4KKworICAgICAgICAqIHJl
bmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpyZXNvbHZlV2lk
dGhGb3JSYXRpbyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVJl
cGxhY2VkTG9naWNhbFdpZHRoIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OnJlc29sdmVIZWln
aHRGb3JSYXRpbyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVJl
cGxhY2VkTG9naWNhbEhlaWdodCBjb25zdCk6CisKIDIwMjEtMDItMTAgIENhcmxvcyBHYXJjaWEg
Q2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtTT1VQXSBTaW1wbGlmeSBS
ZXNvdXJjZVJlcXVlc3QgYW5kIFJlc291cmNlUmVzcG9uc2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCmluZGV4IDQzYmQ1MzcwOGU4MjAyMjM3MDIwOWEzYTEx
OTEwZWY3OTQ3ODU1YzcuLjFmNGE4YzkwMDJjYmRhN2Y1YTRiOTE2MmI3MzNkZDJjZWJkYzQ3Njkg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAK
KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcApAQCAtNTMy
LDYgKzUzMiwxMyBAQCBMYXlvdXRVbml0IFJlbmRlclJlcGxhY2VkOjpjb21wdXRlQ29uc3RyYWlu
ZWRMb2dpY2FsV2lkdGgoU2hvdWxkQ29tcHV0ZVByZWZlcnJlZAogICAgIHJldHVybiBjb21wdXRl
UmVwbGFjZWRMb2dpY2FsV2lkdGhSZXNwZWN0aW5nTWluTWF4V2lkdGgobG9naWNhbFdpZHRoLCBz
aG91bGRDb21wdXRlUHJlZmVycmVkKTsKIH0KIAorc3RhdGljIGlubGluZSBMYXlvdXRVbml0IHJl
c29sdmVXaWR0aEZvclJhdGlvKExheW91dFVuaXQgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWln
aHQsIExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgZG91YmxlIGFzcGVjdFJhdGlvLCBCb3hTaXpp
bmcgYm94U2l6aW5nKQoreworICAgIGlmIChib3hTaXppbmcgPT0gQm94U2l6aW5nOjpCb3JkZXJC
b3gpCisgICAgICAgIHJldHVybiByb3VuZFRvSW50KHJvdW5kKChsb2dpY2FsSGVpZ2h0ICsgYm9y
ZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQpICogYXNwZWN0UmF0aW8pKTsKKyAgICByZXR1cm4g
cm91bmRUb0ludChyb3VuZChsb2dpY2FsSGVpZ2h0ICogYXNwZWN0UmF0aW8pKTsKK30KKwogTGF5
b3V0VW5pdCBSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbFdpZHRoKFNob3Vs
ZENvbXB1dGVQcmVmZXJyZWQgc2hvdWxkQ29tcHV0ZVByZWZlcnJlZCkgY29uc3QKIHsKICAgICBp
ZiAoc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc1NwZWNpZmllZCgpIHx8IHN0eWxlKCkubG9naWNh
bFdpZHRoKCkuaXNJbnRyaW5zaWMoKSkKQEAgLTU2Nyw3ICs1NzQsNyBAQCBMYXlvdXRVbml0IFJl
bmRlclJlcGxhY2VkOjpjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGgoU2hvdWxkQ29tcHV0ZVBy
ZWZlcnJlZCBzaAogICAgICAgICAgICAgaWYgKGludHJpbnNpY1JhdGlvICYmICgoY29tcHV0ZWRI
ZWlnaHRJc0F1dG8gJiYgIWhhc0ludHJpbnNpY1dpZHRoICYmIGhhc0ludHJpbnNpY0hlaWdodCkg
fHwgIWNvbXB1dGVkSGVpZ2h0SXNBdXRvKSkgewogICAgICAgICAgICAgICAgIExheW91dFVuaXQg
ZXN0aW1hdGVkVXNlZFdpZHRoID0gaGFzSW50cmluc2ljV2lkdGggPyBMYXlvdXRVbml0KGNvbnN0
cmFpbmVkU2l6ZS53aWR0aCgpKSA6IGNvbXB1dGVDb25zdHJhaW5lZExvZ2ljYWxXaWR0aChzaG91
bGRDb21wdXRlUHJlZmVycmVkKTsKICAgICAgICAgICAgICAgICBMYXlvdXRVbml0IGxvZ2ljYWxI
ZWlnaHQgPSBjb21wdXRlUmVwbGFjZWRMb2dpY2FsSGVpZ2h0KE9wdGlvbmFsPExheW91dFVuaXQ+
KGVzdGltYXRlZFVzZWRXaWR0aCkpOwotICAgICAgICAgICAgICAgIHJldHVybiBjb21wdXRlUmVw
bGFjZWRMb2dpY2FsV2lkdGhSZXNwZWN0aW5nTWluTWF4V2lkdGgocm91bmRUb0ludChyb3VuZChs
b2dpY2FsSGVpZ2h0ICogaW50cmluc2ljUmF0aW8pKSwgc2hvdWxkQ29tcHV0ZVByZWZlcnJlZCk7
CisgICAgICAgICAgICAgICAgcmV0dXJuIGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxXaWR0aFJlc3Bl
Y3RpbmdNaW5NYXhXaWR0aChyZXNvbHZlV2lkdGhGb3JSYXRpbyhib3JkZXJBbmRQYWRkaW5nTG9n
aWNhbEhlaWdodCgpLCBsb2dpY2FsSGVpZ2h0LCBpbnRyaW5zaWNSYXRpbywgc3R5bGUoKS5ib3hT
aXppbmdGb3JBc3BlY3RSYXRpbygpKSwgc2hvdWxkQ29tcHV0ZVByZWZlcnJlZCk7CiAgICAgICAg
ICAgICB9CiAKICAgICAgICAgICAgIApAQCAtNTk2LDYgKzYwMywxMyBAQCBMYXlvdXRVbml0IFJl
bmRlclJlcGxhY2VkOjpjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGgoU2hvdWxkQ29tcHV0ZVBy
ZWZlcnJlZCBzaAogICAgIHJldHVybiBjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGhSZXNwZWN0
aW5nTWluTWF4V2lkdGgoaW50cmluc2ljTG9naWNhbFdpZHRoKCksIHNob3VsZENvbXB1dGVQcmVm
ZXJyZWQpOwogfQogCitzdGF0aWMgaW5saW5lIExheW91dFVuaXQgcmVzb2x2ZUhlaWdodEZvclJh
dGlvKExheW91dFVuaXQgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCBs
b2dpY2FsV2lkdGgsIGRvdWJsZSBhc3BlY3RSYXRpbywgQm94U2l6aW5nIGJveFNpemluZykKK3sK
KyAgICBpZiAoYm94U2l6aW5nID09IEJveFNpemluZzo6Qm9yZGVyQm94KQorICAgICAgICByZXR1
cm4gcm91bmRUb0ludChyb3VuZCgobG9naWNhbFdpZHRoICsgYm9yZGVyQW5kUGFkZGluZ0xvZ2lj
YWxXaWR0aCkgLyBhc3BlY3RSYXRpbykpOworICAgIHJldHVybiByb3VuZFRvSW50KHJvdW5kKGxv
Z2ljYWxXaWR0aCAvIGFzcGVjdFJhdGlvKSk7Cit9CisKIExheW91dFVuaXQgUmVuZGVyUmVwbGFj
ZWQ6OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxIZWlnaHQoT3B0aW9uYWw8TGF5b3V0VW5pdD4gZXN0
aW1hdGVkVXNlZFdpZHRoKSBjb25zdAogewogICAgIC8vIDEwLjUgQ29udGVudCBoZWlnaHQ6IHRo
ZSAnaGVpZ2h0JyBwcm9wZXJ0eTogaHR0cDovL3d3dy53My5vcmcvVFIvQ1NTMjEvdmlzdWRldC5o
dG1sI3Byb3BkZWYtaGVpZ2h0CkBAIC02MjUsNyArNjM5LDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJS
ZXBsYWNlZDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbEhlaWdodChPcHRpb25hbDxMYXlvdXRVbml0
PiBlc3QKICAgICAvLyAodXNlZCB3aWR0aCkgLyAoaW50cmluc2ljIHJhdGlvKQogICAgIGlmIChp
bnRyaW5zaWNSYXRpbykgewogICAgICAgICBMYXlvdXRVbml0IHVzZWRXaWR0aCA9IGVzdGltYXRl
ZFVzZWRXaWR0aCA/IGVzdGltYXRlZFVzZWRXaWR0aC52YWx1ZSgpIDogYXZhaWxhYmxlTG9naWNh
bFdpZHRoKCk7Ci0gICAgICAgIHJldHVybiBjb21wdXRlUmVwbGFjZWRMb2dpY2FsSGVpZ2h0UmVz
cGVjdGluZ01pbk1heEhlaWdodChyb3VuZFRvSW50KHJvdW5kKHVzZWRXaWR0aCAvIGludHJpbnNp
Y1JhdGlvKSkpOworICAgICAgICByZXR1cm4gY29tcHV0ZVJlcGxhY2VkTG9naWNhbEhlaWdodFJl
c3BlY3RpbmdNaW5NYXhIZWlnaHQocmVzb2x2ZUhlaWdodEZvclJhdGlvKGJvcmRlckFuZFBhZGRp
bmdMb2dpY2FsV2lkdGgoKSwgdXNlZFdpZHRoLCBpbnRyaW5zaWNSYXRpbywgc3R5bGUoKS5ib3hT
aXppbmdGb3JBc3BlY3RSYXRpbygpKSk7CiAgICAgfQogCiAgICAgLy8gT3RoZXJ3aXNlLCBpZiAn
aGVpZ2h0JyBoYXMgYSBjb21wdXRlZCB2YWx1ZSBvZiAnYXV0bycsIGFuZCB0aGUgZWxlbWVudCBo
YXMgYW4gaW50cmluc2ljIGhlaWdodCwgdGhlbiB0aGF0IGludHJpbnNpYyBoZWlnaHQgaXMgdGhl
IHVzZWQgdmFsdWUgb2YgJ2hlaWdodCcuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VM
b2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYzI4OTY5ZTM4MGI1MTc5ODBjMDU5NTY2
MzdiZThiNjE0MjZmZjVhMC4uNzQwYmQ4ZTRlNjUzNjZiNTkyMGNhM2VjYjRkZjZiZGEyMDBiZjhl
NyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0No
YW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIxLTAyLTEwICBSb2IgQnVpcyAgPHJidWlzQGln
YWxpYS5jb20+CisKKyAgICAgICAgVGFrZSBpbnRvIGFjY291bnQgYm94LXNpemluZyBpbiByZXBs
YWNlZCBlbGVtZW50IGludHJpbnNpYyBzaXppbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTY3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E
WSAoT09QUyEpLgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0wMi0xMCAg
S2ltbW8gS2lubnVuZW4gIDxra2lubnVuZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW90ZUdy
YXBoaWNzQ29udGV4dEdMUHJveHkgc2hvdWxkIHN1cHBvcnQgbG9zaW5nIHRoZSBjb250ZXh0IGFu
ZCBzaG91bGQgbG9zZSB0aGUgY29udGV4dCBvbiB0aW1lb3V0cwpkaWZmIC0tZ2l0IGEvTGF5b3V0
VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5k
ZXggZThkMTdiMDc3NTJkMWU3ZjEyODc0NjMwZDc5YzFlMmFlYTRlZDIzNi4uZTlmMzg0NGM5Njk5
YzE1ODIzNDdjMGJlN2FhZDUzMTkyOTEzNWE4NCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVz
dEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NTkx
LDggKzQ1OTEsNiBAQCB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvLwogd2Via2l0Lm9yZy9iLzIxNDQ2
MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y
YXRpby9pbnRyaW5zaWMtc2l6ZS0wMDguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0
Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6
aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMTAuaHRtbCBbIEltYWdlT25seUZhaWx1
cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMTEuaHRtbCBbIElt
YWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50
LTAzMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3Jl
cGxhY2VkLWVsZW1lbnQtMDMyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcv
Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h
c3BlY3QtcmF0aW8vdGFibGUtZWxlbWVudC0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQog
d2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtc2l6aW5nL2NvbnRhaW4taW50cmluc2ljLXNpemUvY29udGFpbi1pbnRyaW5zaWMtc2l6ZS0w
MDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2NvbnRhaW4taW50cmluc2lj
LXNpemUvY29udGFpbi1pbnRyaW5zaWMtc2l6ZS0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg
XQo=
</data>
<flag name="commit-queue"
          id="438215"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>419854</attachid>
            <date>2021-02-10 09:11:24 -0800</date>
            <delta_ts>2021-02-15 01:16:50 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-221671-20210210181123.patch</filename>
            <type>text/plain</type>
            <size>6727</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNjQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmJjZTkwZTk4MTRlZGU0
ZDc1YTNjNzIxYWNiMmRjZjdiNTNmNmRiYS4uMjQ4NTQ3NzNjN2RjYjA5NjQ0MWZjMDYwOGNmNDAz
ZDU3NDAwZmM2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTAyLTEwICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgVGFrZSBpbnRvIGFjY291bnQgYm94
LXNpemluZyBpbiByZXBsYWNlZCBlbGVtZW50IGludHJpbnNpYyBzaXppbmcKKyAgICAgICAgaHR0
cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTY3MQorCisgICAgICAgIFJl
dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdJUC4KKworICAgICAgICAqIHJl
bmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpyZXNvbHZlV2lk
dGhGb3JSYXRpbyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVJl
cGxhY2VkTG9naWNhbFdpZHRoIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OnJlc29sdmVIZWln
aHRGb3JSYXRpbyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVJl
cGxhY2VkTG9naWNhbEhlaWdodCBjb25zdCk6CisKIDIwMjEtMDItMTAgIENhcmxvcyBHYXJjaWEg
Q2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtTT1VQXSBTaW1wbGlmeSBS
ZXNvdXJjZVJlcXVlc3QgYW5kIFJlc291cmNlUmVzcG9uc2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCmluZGV4IDQzYmQ1MzcwOGU4MjAyMjM3MDIwOWEzYTEx
OTEwZWY3OTQ3ODU1YzcuLjgwNGNlODdlNzBkZjk0NGM5NTg4YTcxZWNlMGE0MmFmZWIxYTNiZTgg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAK
KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcApAQCAtNTMy
LDYgKzUzMiwxMyBAQCBMYXlvdXRVbml0IFJlbmRlclJlcGxhY2VkOjpjb21wdXRlQ29uc3RyYWlu
ZWRMb2dpY2FsV2lkdGgoU2hvdWxkQ29tcHV0ZVByZWZlcnJlZAogICAgIHJldHVybiBjb21wdXRl
UmVwbGFjZWRMb2dpY2FsV2lkdGhSZXNwZWN0aW5nTWluTWF4V2lkdGgobG9naWNhbFdpZHRoLCBz
aG91bGRDb21wdXRlUHJlZmVycmVkKTsKIH0KIAorc3RhdGljIGlubGluZSBMYXlvdXRVbml0IHJl
c29sdmVXaWR0aEZvclJhdGlvKExheW91dFVuaXQgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWln
aHQsIExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgZG91YmxlIGFzcGVjdFJhdGlvLCBCb3hTaXpp
bmcgYm94U2l6aW5nKQoreworICAgIGlmIChib3hTaXppbmcgPT0gQm94U2l6aW5nOjpCb3JkZXJC
b3gpCisgICAgICAgIHJldHVybiByb3VuZFRvSW50KHJvdW5kKChsb2dpY2FsSGVpZ2h0ICsgYm9y
ZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQpICogYXNwZWN0UmF0aW8pKTsKKyAgICByZXR1cm4g
cm91bmRUb0ludChyb3VuZChsb2dpY2FsSGVpZ2h0ICogYXNwZWN0UmF0aW8pKTsKK30KKwogTGF5
b3V0VW5pdCBSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbFdpZHRoKFNob3Vs
ZENvbXB1dGVQcmVmZXJyZWQgc2hvdWxkQ29tcHV0ZVByZWZlcnJlZCkgY29uc3QKIHsKICAgICBp
ZiAoc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc1NwZWNpZmllZCgpIHx8IHN0eWxlKCkubG9naWNh
bFdpZHRoKCkuaXNJbnRyaW5zaWMoKSkKQEAgLTU2Nyw3ICs1NzQsMTAgQEAgTGF5b3V0VW5pdCBS
ZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbFdpZHRoKFNob3VsZENvbXB1dGVQ
cmVmZXJyZWQgc2gKICAgICAgICAgICAgIGlmIChpbnRyaW5zaWNSYXRpbyAmJiAoKGNvbXB1dGVk
SGVpZ2h0SXNBdXRvICYmICFoYXNJbnRyaW5zaWNXaWR0aCAmJiBoYXNJbnRyaW5zaWNIZWlnaHQp
IHx8ICFjb21wdXRlZEhlaWdodElzQXV0bykpIHsKICAgICAgICAgICAgICAgICBMYXlvdXRVbml0
IGVzdGltYXRlZFVzZWRXaWR0aCA9IGhhc0ludHJpbnNpY1dpZHRoID8gTGF5b3V0VW5pdChjb25z
dHJhaW5lZFNpemUud2lkdGgoKSkgOiBjb21wdXRlQ29uc3RyYWluZWRMb2dpY2FsV2lkdGgoc2hv
dWxkQ29tcHV0ZVByZWZlcnJlZCk7CiAgICAgICAgICAgICAgICAgTGF5b3V0VW5pdCBsb2dpY2Fs
SGVpZ2h0ID0gY29tcHV0ZVJlcGxhY2VkTG9naWNhbEhlaWdodChPcHRpb25hbDxMYXlvdXRVbml0
Pihlc3RpbWF0ZWRVc2VkV2lkdGgpKTsKLSAgICAgICAgICAgICAgICByZXR1cm4gY29tcHV0ZVJl
cGxhY2VkTG9naWNhbFdpZHRoUmVzcGVjdGluZ01pbk1heFdpZHRoKHJvdW5kVG9JbnQocm91bmQo
bG9naWNhbEhlaWdodCAqIGludHJpbnNpY1JhdGlvKSksIHNob3VsZENvbXB1dGVQcmVmZXJyZWQp
OworICAgICAgICAgICAgICAgIEJveFNpemluZyBib3hTaXppbmcgPSBCb3hTaXppbmc6OkNvbnRl
bnRCb3g7CisgICAgICAgICAgICAgICAgaWYgKHN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSkKKyAg
ICAgICAgICAgICAgICAgICAgYm94U2l6aW5nID0gc3R5bGUoKS5ib3hTaXppbmdGb3JBc3BlY3RS
YXRpbygpOworICAgICAgICAgICAgICAgIHJldHVybiBjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lk
dGhSZXNwZWN0aW5nTWluTWF4V2lkdGgocmVzb2x2ZVdpZHRoRm9yUmF0aW8oYm9yZGVyQW5kUGFk
ZGluZ0xvZ2ljYWxIZWlnaHQoKSwgbG9naWNhbEhlaWdodCwgaW50cmluc2ljUmF0aW8sIGJveFNp
emluZyksIHNob3VsZENvbXB1dGVQcmVmZXJyZWQpOwogICAgICAgICAgICAgfQogCiAgICAgICAg
ICAgICAKQEAgLTU5Niw2ICs2MDYsMTMgQEAgTGF5b3V0VW5pdCBSZW5kZXJSZXBsYWNlZDo6Y29t
cHV0ZVJlcGxhY2VkTG9naWNhbFdpZHRoKFNob3VsZENvbXB1dGVQcmVmZXJyZWQgc2gKICAgICBy
ZXR1cm4gY29tcHV0ZVJlcGxhY2VkTG9naWNhbFdpZHRoUmVzcGVjdGluZ01pbk1heFdpZHRoKGlu
dHJpbnNpY0xvZ2ljYWxXaWR0aCgpLCBzaG91bGRDb21wdXRlUHJlZmVycmVkKTsKIH0KIAorc3Rh
dGljIGlubGluZSBMYXlvdXRVbml0IHJlc29sdmVIZWlnaHRGb3JSYXRpbyhMYXlvdXRVbml0IGJv
cmRlckFuZFBhZGRpbmdMb2dpY2FsV2lkdGgsIExheW91dFVuaXQgbG9naWNhbFdpZHRoLCBkb3Vi
bGUgYXNwZWN0UmF0aW8sIEJveFNpemluZyBib3hTaXppbmcpCit7CisgICAgaWYgKGJveFNpemlu
ZyA9PSBCb3hTaXppbmc6OkJvcmRlckJveCkKKyAgICAgICAgcmV0dXJuIHJvdW5kVG9JbnQocm91
bmQoKGxvZ2ljYWxXaWR0aCArIGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsV2lkdGgpIC8gYXNwZWN0
UmF0aW8pKTsKKyAgICByZXR1cm4gcm91bmRUb0ludChyb3VuZChsb2dpY2FsV2lkdGggLyBhc3Bl
Y3RSYXRpbykpOworfQorCiBMYXlvdXRVbml0IFJlbmRlclJlcGxhY2VkOjpjb21wdXRlUmVwbGFj
ZWRMb2dpY2FsSGVpZ2h0KE9wdGlvbmFsPExheW91dFVuaXQ+IGVzdGltYXRlZFVzZWRXaWR0aCkg
Y29uc3QKIHsKICAgICAvLyAxMC41IENvbnRlbnQgaGVpZ2h0OiB0aGUgJ2hlaWdodCcgcHJvcGVy
dHk6IGh0dHA6Ly93d3cudzMub3JnL1RSL0NTUzIxL3Zpc3VkZXQuaHRtbCNwcm9wZGVmLWhlaWdo
dApAQCAtNjI1LDcgKzY0MiwxMCBAQCBMYXlvdXRVbml0IFJlbmRlclJlcGxhY2VkOjpjb21wdXRl
UmVwbGFjZWRMb2dpY2FsSGVpZ2h0KE9wdGlvbmFsPExheW91dFVuaXQ+IGVzdAogICAgIC8vICh1
c2VkIHdpZHRoKSAvIChpbnRyaW5zaWMgcmF0aW8pCiAgICAgaWYgKGludHJpbnNpY1JhdGlvKSB7
CiAgICAgICAgIExheW91dFVuaXQgdXNlZFdpZHRoID0gZXN0aW1hdGVkVXNlZFdpZHRoID8gZXN0
aW1hdGVkVXNlZFdpZHRoLnZhbHVlKCkgOiBhdmFpbGFibGVMb2dpY2FsV2lkdGgoKTsKLSAgICAg
ICAgcmV0dXJuIGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxIZWlnaHRSZXNwZWN0aW5nTWluTWF4SGVp
Z2h0KHJvdW5kVG9JbnQocm91bmQodXNlZFdpZHRoIC8gaW50cmluc2ljUmF0aW8pKSk7CisgICAg
ICAgIEJveFNpemluZyBib3hTaXppbmcgPSBCb3hTaXppbmc6OkNvbnRlbnRCb3g7CisgICAgICAg
IGlmIChzdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpCisgICAgICAgICAgICBib3hTaXppbmcgPSBz
dHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJhdGlvKCk7CisgICAgICAgIHJldHVybiBjb21wdXRl
UmVwbGFjZWRMb2dpY2FsSGVpZ2h0UmVzcGVjdGluZ01pbk1heEhlaWdodChyZXNvbHZlSGVpZ2h0
Rm9yUmF0aW8oYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxXaWR0aCgpLCB1c2VkV2lkdGgsIGludHJp
bnNpY1JhdGlvLCBib3hTaXppbmcpKTsKICAgICB9CiAKICAgICAvLyBPdGhlcndpc2UsIGlmICdo
ZWlnaHQnIGhhcyBhIGNvbXB1dGVkIHZhbHVlIG9mICdhdXRvJywgYW5kIHRoZSBlbGVtZW50IGhh
cyBhbiBpbnRyaW5zaWMgaGVpZ2h0LCB0aGVuIHRoYXQgaW50cmluc2ljIGhlaWdodCBpcyB0aGUg
dXNlZCB2YWx1ZSBvZiAnaGVpZ2h0Jy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv
ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBjMjg5NjllMzgwYjUxNzk4MGMwNTk1NjYz
N2JlOGI2MTQyNmZmNWEwLi43NDBiZDhlNGU2NTM2NmI1OTIwY2EzZWNiNGRmNmJkYTIwMGJmOGU3
IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjEtMDItMTAgIFJvYiBCdWlzICA8cmJ1aXNAaWdh
bGlhLmNvbT4KKworICAgICAgICBUYWtlIGludG8gYWNjb3VudCBib3gtc2l6aW5nIGluIHJlcGxh
Y2VkIGVsZW1lbnQgaW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxNjcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTAyLTEwICBL
aW1tbyBLaW5udW5lbiAgPGtraW5udW5lbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3RlR3Jh
cGhpY3NDb250ZXh0R0xQcm94eSBzaG91bGQgc3VwcG9ydCBsb3NpbmcgdGhlIGNvbnRleHQgYW5k
IHNob3VsZCBsb3NlIHRoZSBjb250ZXh0IG9uIHRpbWVvdXRzCmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRl
eCBlOGQxN2IwNzc1MmQxZTdmMTI4NzQ2MzBkNzljMWUyYWVhNGVkMjM2Li5lOWYzODQ0Yzk2OTlj
MTU4MjM0N2MwYmU3YWFkNTMxOTI5MTM1YTg0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0
RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTQ1OTEs
OCArNDU5MSw2IEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vCiB3ZWJraXQub3JnL2IvMjE0NDYz
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh
dGlvL2ludHJpbnNpYy1zaXplLTAwOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQu
b3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp
bmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAxMC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAxMS5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3JlcGxhY2VkLWVsZW1lbnQt
MDMxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vcmVw
bGFjZWQtZWxlbWVudC0wMzIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9i
LzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz
cGVjdC1yYXRpby90YWJsZS1lbGVtZW50LTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3
ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1zaXppbmcvY29udGFpbi1pbnRyaW5zaWMtc2l6ZS9jb250YWluLWludHJpbnNpYy1zaXplLTAw
MS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvY29udGFpbi1pbnRyaW5zaWMt
c2l6ZS9jb250YWluLWludHJpbnNpYy1zaXplLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd
Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>420278</attachid>
            <date>2021-02-15 01:16:56 -0800</date>
            <delta_ts>2021-02-16 02:16:45 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-221671-20210215101654.patch</filename>
            <type>text/plain</type>
            <size>10809</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyODQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2NiNTRiNzVmZmFmNzdj
N2QyM2FjNGQxM2E4YjQxZTk2MmNkNmIyYy4uYzQ1OTJkYjU0YzUwMWJiMWQ3MGVkMTY1OWE1YWNj
Y2FlY2U4YTAyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTAyLTE1ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgVGFrZSBpbnRvIGFjY291bnQgYm94
LXNpemluZyBpbiByZXBsYWNlZCBlbGVtZW50IGludHJpbnNpYyBzaXppbmcKKyAgICAgICAgaHR0
cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTY3MQorCisgICAgICAgIFJl
dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3JlcGxhY2VkLWVs
ZW1lbnQtMDMzLmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHA6
CisgICAgICAgIChXZWJDb3JlOjpyZXNvbHZlV2lkdGhGb3JSYXRpbyk6CisgICAgICAgIChXZWJD
b3JlOjpSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbFdpZHRoIGNvbnN0KToK
KyAgICAgICAgKFdlYkNvcmU6OnJlc29sdmVIZWlnaHRGb3JSYXRpbyk6CisgICAgICAgIChXZWJD
b3JlOjpSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbEhlaWdodCBjb25zdCk6
CisKIDIwMjEtMDItMTIgIFNlcmdpbyBWaWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+
CiAKICAgICAgICAgRG9uJ3QgdXBkYXRlIGZvcm0gY29udHJvbCBlbGVtZW50cyB2YWxpZGl0eSBz
dGF0dXMgaWYgdGhleSBhcmUgZGV0YWNoZWQgZnJvbSB0aGUgZG9jdW1lbnQuCmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwIGIvU291cmNlL1dl
YkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcAppbmRleCAwY2Y5NjcyNTVhYWJlMzUw
ZDQ0M2E0NjkzOGY5NTNjMmZhNzUwN2RjLi5iNDE3NzFkMTdjZmY5ZGJjMzRjMzA0YzdjYjFmZWFh
NTRhMWY3MDBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVw
bGFjZWQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5j
cHAKQEAgLTUzMiw2ICs1MzIsMTMgQEAgTGF5b3V0VW5pdCBSZW5kZXJSZXBsYWNlZDo6Y29tcHV0
ZUNvbnN0cmFpbmVkTG9naWNhbFdpZHRoKFNob3VsZENvbXB1dGVQcmVmZXJyZWQKICAgICByZXR1
cm4gY29tcHV0ZVJlcGxhY2VkTG9naWNhbFdpZHRoUmVzcGVjdGluZ01pbk1heFdpZHRoKGxvZ2lj
YWxXaWR0aCwgc2hvdWxkQ29tcHV0ZVByZWZlcnJlZCk7CiB9CiAKK3N0YXRpYyBpbmxpbmUgTGF5
b3V0VW5pdCByZXNvbHZlV2lkdGhGb3JSYXRpbyhMYXlvdXRVbml0IGJvcmRlckFuZFBhZGRpbmdM
b2dpY2FsSGVpZ2h0LCBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQsIGRvdWJsZSBhc3BlY3RSYXRp
bywgQm94U2l6aW5nIGJveFNpemluZykKK3sKKyAgICBpZiAoYm94U2l6aW5nID09IEJveFNpemlu
Zzo6Qm9yZGVyQm94KQorICAgICAgICByZXR1cm4gcm91bmRUb0ludChyb3VuZCgobG9naWNhbEhl
aWdodCArIGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsSGVpZ2h0KSAqIGFzcGVjdFJhdGlvKSk7Cisg
ICAgcmV0dXJuIHJvdW5kVG9JbnQocm91bmQobG9naWNhbEhlaWdodCAqIGFzcGVjdFJhdGlvKSk7
Cit9CisKIExheW91dFVuaXQgUmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxX
aWR0aChTaG91bGRDb21wdXRlUHJlZmVycmVkIHNob3VsZENvbXB1dGVQcmVmZXJyZWQpIGNvbnN0
CiB7CiAgICAgaWYgKHN0eWxlKCkubG9naWNhbFdpZHRoKCkuaXNTcGVjaWZpZWQoKSB8fCBzdHls
ZSgpLmxvZ2ljYWxXaWR0aCgpLmlzSW50cmluc2ljKCkpCkBAIC01NjcsNyArNTc0LDEwIEBAIExh
eW91dFVuaXQgUmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxXaWR0aChTaG91
bGRDb21wdXRlUHJlZmVycmVkIHNoCiAgICAgICAgICAgICBpZiAoaW50cmluc2ljUmF0aW8gJiYg
KChjb21wdXRlZEhlaWdodElzQXV0byAmJiAhaGFzSW50cmluc2ljV2lkdGggJiYgaGFzSW50cmlu
c2ljSGVpZ2h0KSB8fCAhY29tcHV0ZWRIZWlnaHRJc0F1dG8pKSB7CiAgICAgICAgICAgICAgICAg
TGF5b3V0VW5pdCBlc3RpbWF0ZWRVc2VkV2lkdGggPSBoYXNJbnRyaW5zaWNXaWR0aCA/IExheW91
dFVuaXQoY29uc3RyYWluZWRTaXplLndpZHRoKCkpIDogY29tcHV0ZUNvbnN0cmFpbmVkTG9naWNh
bFdpZHRoKHNob3VsZENvbXB1dGVQcmVmZXJyZWQpOwogICAgICAgICAgICAgICAgIExheW91dFVu
aXQgbG9naWNhbEhlaWdodCA9IGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxIZWlnaHQoT3B0aW9uYWw8
TGF5b3V0VW5pdD4oZXN0aW1hdGVkVXNlZFdpZHRoKSk7Ci0gICAgICAgICAgICAgICAgcmV0dXJu
IGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxXaWR0aFJlc3BlY3RpbmdNaW5NYXhXaWR0aChyb3VuZFRv
SW50KHJvdW5kKGxvZ2ljYWxIZWlnaHQgKiBpbnRyaW5zaWNSYXRpbykpLCBzaG91bGRDb21wdXRl
UHJlZmVycmVkKTsKKyAgICAgICAgICAgICAgICBCb3hTaXppbmcgYm94U2l6aW5nID0gQm94U2l6
aW5nOjpDb250ZW50Qm94OworICAgICAgICAgICAgICAgIGlmIChzdHlsZSgpLmhhc0FzcGVjdFJh
dGlvKCkpCisgICAgICAgICAgICAgICAgICAgIGJveFNpemluZyA9IHN0eWxlKCkuYm94U2l6aW5n
Rm9yQXNwZWN0UmF0aW8oKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gY29tcHV0ZVJlcGxhY2Vk
TG9naWNhbFdpZHRoUmVzcGVjdGluZ01pbk1heFdpZHRoKHJlc29sdmVXaWR0aEZvclJhdGlvKGJv
cmRlckFuZFBhZGRpbmdMb2dpY2FsSGVpZ2h0KCksIGxvZ2ljYWxIZWlnaHQsIGludHJpbnNpY1Jh
dGlvLCBib3hTaXppbmcpLCBzaG91bGRDb21wdXRlUHJlZmVycmVkKTsKICAgICAgICAgICAgIH0K
IAogICAgICAgICAgICAgCkBAIC01OTYsNiArNjA2LDEzIEBAIExheW91dFVuaXQgUmVuZGVyUmVw
bGFjZWQ6OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxXaWR0aChTaG91bGRDb21wdXRlUHJlZmVycmVk
IHNoCiAgICAgcmV0dXJuIGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxXaWR0aFJlc3BlY3RpbmdNaW5N
YXhXaWR0aChpbnRyaW5zaWNMb2dpY2FsV2lkdGgoKSwgc2hvdWxkQ29tcHV0ZVByZWZlcnJlZCk7
CiB9CiAKK3N0YXRpYyBpbmxpbmUgTGF5b3V0VW5pdCByZXNvbHZlSGVpZ2h0Rm9yUmF0aW8oTGF5
b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoLCBMYXlvdXRVbml0IGxvZ2ljYWxX
aWR0aCwgZG91YmxlIGFzcGVjdFJhdGlvLCBCb3hTaXppbmcgYm94U2l6aW5nKQoreworICAgIGlm
IChib3hTaXppbmcgPT0gQm94U2l6aW5nOjpCb3JkZXJCb3gpCisgICAgICAgIHJldHVybiByb3Vu
ZFRvSW50KHJvdW5kKChsb2dpY2FsV2lkdGggKyBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRo
KSAvIGFzcGVjdFJhdGlvKSk7CisgICAgcmV0dXJuIHJvdW5kVG9JbnQocm91bmQobG9naWNhbFdp
ZHRoIC8gYXNwZWN0UmF0aW8pKTsKK30KKwogTGF5b3V0VW5pdCBSZW5kZXJSZXBsYWNlZDo6Y29t
cHV0ZVJlcGxhY2VkTG9naWNhbEhlaWdodChPcHRpb25hbDxMYXlvdXRVbml0PiBlc3RpbWF0ZWRV
c2VkV2lkdGgpIGNvbnN0CiB7CiAgICAgLy8gMTAuNSBDb250ZW50IGhlaWdodDogdGhlICdoZWln
aHQnIHByb3BlcnR5OiBodHRwOi8vd3d3LnczLm9yZy9UUi9DU1MyMS92aXN1ZGV0Lmh0bWwjcHJv
cGRlZi1oZWlnaHQKQEAgLTYyNSw3ICs2NDIsMTAgQEAgTGF5b3V0VW5pdCBSZW5kZXJSZXBsYWNl
ZDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbEhlaWdodChPcHRpb25hbDxMYXlvdXRVbml0PiBlc3QK
ICAgICAvLyAodXNlZCB3aWR0aCkgLyAoaW50cmluc2ljIHJhdGlvKQogICAgIGlmIChpbnRyaW5z
aWNSYXRpbykgewogICAgICAgICBMYXlvdXRVbml0IHVzZWRXaWR0aCA9IGVzdGltYXRlZFVzZWRX
aWR0aCA/IGVzdGltYXRlZFVzZWRXaWR0aC52YWx1ZSgpIDogYXZhaWxhYmxlTG9naWNhbFdpZHRo
KCk7Ci0gICAgICAgIHJldHVybiBjb21wdXRlUmVwbGFjZWRMb2dpY2FsSGVpZ2h0UmVzcGVjdGlu
Z01pbk1heEhlaWdodChyb3VuZFRvSW50KHJvdW5kKHVzZWRXaWR0aCAvIGludHJpbnNpY1JhdGlv
KSkpOworICAgICAgICBCb3hTaXppbmcgYm94U2l6aW5nID0gQm94U2l6aW5nOjpDb250ZW50Qm94
OworICAgICAgICBpZiAoc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKQorICAgICAgICAgICAgYm94
U2l6aW5nID0gc3R5bGUoKS5ib3hTaXppbmdGb3JBc3BlY3RSYXRpbygpOworICAgICAgICByZXR1
cm4gY29tcHV0ZVJlcGxhY2VkTG9naWNhbEhlaWdodFJlc3BlY3RpbmdNaW5NYXhIZWlnaHQocmVz
b2x2ZUhlaWdodEZvclJhdGlvKGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsV2lkdGgoKSwgdXNlZFdp
ZHRoLCBpbnRyaW5zaWNSYXRpbywgYm94U2l6aW5nKSk7CiAgICAgfQogCiAgICAgLy8gT3RoZXJ3
aXNlLCBpZiAnaGVpZ2h0JyBoYXMgYSBjb21wdXRlZCB2YWx1ZSBvZiAnYXV0bycsIGFuZCB0aGUg
ZWxlbWVudCBoYXMgYW4gaW50cmluc2ljIGhlaWdodCwgdGhlbiB0aGF0IGludHJpbnNpYyBoZWln
aHQgaXMgdGhlIHVzZWQgdmFsdWUgb2YgJ2hlaWdodCcuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0
cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNjNlZjUyMGFlMzkxZTcw
YjYyMTg5MDgyZWU2NzQyODQ4ZDRhYTNjMC4uNTg0OGFjOTAyMjk2NWM0YWNlNjQxNmIyYjI4MWQz
ZGJjMDlhZGZjMSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91
dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIxLTAyLTE1ICBSb2IgQnVpcyAg
PHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgVGFrZSBpbnRvIGFjY291bnQgYm94LXNpemlu
ZyBpbiByZXBsYWNlZCBlbGVtZW50IGludHJpbnNpYyBzaXppbmcKKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTY3MQorCisgICAgICAgIFJldmlld2Vk
IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAy
MS0wMi0xNCAgUGVuZyBMaXUgIDxwZW5nLmxpdTZAYXBwbGUuY29tPgogCiAgICAgICAgIFtHUFVQ
XSBNb3ZlIFVzZUdQVVByb2Nlc3NGb3JNZWRpYUVuYWJsZWQgZnJvbSBXZWJQcmVmZXJlbmNlc0lu
dGVybmFsIHRvIFdlYlByZWZlcmVuY2VzRXhwZXJpbWVudGFsCmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0No
YW5nZUxvZwppbmRleCAwYTYwZmYxNDVkZjFkZmU4Mjg3ZjBiMzA5ZGQ1NGIxODUzNzAxYTliLi5j
YWYzZjRlZWVhMmI2YzFlOTQ0ZjcyODQzZDZmYjU3ZTA4YzlmOWQ1IDEwMDY0NAotLS0gYS9MYXlv
dXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVk
L3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMS0wMi0xNSAgUm9iIEJ1aXMgIDxy
YnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIFRha2UgaW50byBhY2NvdW50IGJveC1zaXppbmcg
aW4gcmVwbGFjZWQgZWxlbWVudCBpbnRyaW5zaWMgc2l6aW5nCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjE2NzEKKworICAgICAgICBSZXZpZXdlZCBi
eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXNpemluZy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVudC0wMzMtZXhwZWN0ZWQueGh0OiBB
ZGRlZC4KKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0
LXJhdGlvL3JlcGxhY2VkLWVsZW1lbnQtMDMzLmh0bWw6IEFkZGVkLgorCiAyMDIxLTAyLTEyICBT
ZXJnaW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtjc3Mt
ZmxleGJveF0gQW5vdGhlciBXUFQgdGVzdCBpbXBvcnQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz
L1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDMz
ZDM4MDQ2YTU1YjczNDE3MzBjZWZiNjBjN2ZiOTg5MjYxZjMyZTEuLmRlOWY2NjkzOTc4MGVmZTQ3
NzNiZDdjYTIzMzc3MmNhNWJkNDc5ZDEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBl
Y3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDU4Nyw4ICs0
NTg3LDYgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby8KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v
aW50cmluc2ljLXNpemUtMDA4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcv
Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h
c3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDEwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
IHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDExLmh0bWwgWyBJbWFnZU9u
bHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVudC0wMzEu
aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNl
ZC1lbGVtZW50LTAzMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0
NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0
LXJhdGlvL3RhYmxlLWVsZW1lbnQtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtp
dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp
emluZy9jb250YWluLWludHJpbnNpYy1zaXplL2NvbnRhaW4taW50cmluc2ljLXNpemUtMDAxLmh0
bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9jb250YWluLWludHJpbnNpYy1zaXpl
L2NvbnRhaW4taW50cmluc2ljLXNpemUtMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KZGlm
ZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3JlcGxhY2VkLWVsZW1lbnQtMDMzLWV4cGVjdGVkLnho
dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z
aXppbmcvYXNwZWN0LXJhdGlvL3JlcGxhY2VkLWVsZW1lbnQtMDMzLWV4cGVjdGVkLnhodApuZXcg
ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwLi4wNWExMzc5NDQ4MmE5NGY2YzEwYmQ5ZDRjOTg3MDRlNjNlZjYwMzMxCi0tLSAvZGV2
L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVudC0wMzMtZXhwZWN0ZWQu
eGh0CkBAIC0wLDAgKzEsMTkgQEAKKzwhRE9DVFlQRSBodG1sIFBVQkxJQyAiLS8vVzNDLy9EVEQg
WEhUTUwgMS4wIFN0cmljdC8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9UUi94aHRtbDEvRFREL3ho
dG1sMS1zdHJpY3QuZHRkIj4KKzxodG1sIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3ho
dG1sIj4KKyA8aGVhZD4KKyAgPHRpdGxlPkNTUyBSZWZ0ZXN0IFJlZmVyZW5jZTwvdGl0bGU+Cisg
IDxsaW5rIHJlbD0iYXV0aG9yIiB0aXRsZT0iR8OpcmFyZCBUYWxib3QiIGhyZWY9Imh0dHA6Ly93
d3cuZ3RhbGJvdC5vcmcvQnJvd3NlckJ1Z3NTZWN0aW9uL2NzczIxdGVzdHN1aXRlLyIgLz4KKyAg
PHN0eWxlIHR5cGU9InRleHQvY3NzIj48IVtDREFUQVsKKyAgZGl2CisgIHsKKyAgYmFja2dyb3Vu
ZC1jb2xvcjogZ3JlZW47CisgIGhlaWdodDogMTAwcHg7CisgIHdpZHRoOiAxMDBweDsKKyAgfQor
ICBdXT48L3N0eWxlPgorIDwvaGVhZD4KKyA8Ym9keT4KKyAgPHA+VGVzdCBwYXNzZXMgaWYgdGhl
cmUgaXMgYSBmaWxsZWQgZ3JlZW4gc3F1YXJlIGFuZCA8c3Ryb25nPm5vIHJlZDwvc3Ryb25nPi48
L3A+CisgIDxkaXY+PC9kaXY+CisgPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0
VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl
Y3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVudC0wMzMuaHRtbCBiL0xheW91dFRlc3RzL2ltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3JlcGxh
Y2VkLWVsZW1lbnQtMDMzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uY2E5ZjZiY2I3OTE2ZjQ3ZjEwNDM3Mjdk
ZTM2N2I4MjllMDA5ZDViOQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3JlcGxh
Y2VkLWVsZW1lbnQtMDMzLmh0bWwKQEAgLTAsMCArMSwzNiBAQAorPCFET0NUWVBFIGh0bWw+Cis8
dGl0bGU+Q1NTIGFzcGVjdC1yYXRpbzogaW1nIGlubGluZSBzaXplIHdpdGggYm94LXNpemluZyAo
dmVydGljYWwgd3JpdGluZyBtb2RlKTwvdGl0bGU+Cis8bGluayByZWw9ImF1dGhvciIgdGl0bGU9
Ik1vemlsbGEiIGhyZWY9Imh0dHBzOi8vd3d3Lm1vemlsbGEub3JnLyI+Cis8bGluayByZWw9Imhl
bHAiIGhyZWY9Imh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3Mtc2l6aW5nLTQvI2FzcGVjdC1y
YXRpbyI+Cis8bGluayByZWw9Im1hdGNoIiBocmVmPSIuLi8uLi9yZWZlcmVuY2UvcmVmLWZpbGxl
ZC1ncmVlbi0xMDBweC1zcXVhcmUueGh0IiAvPgorPHN0eWxlPgoraW1nIHsKKyAgd3JpdGluZy1t
b2RlOiB2ZXJ0aWNhbC1scjsKKyAgYm9yZGVyLXRvcDogNDBweCBzb2xpZCBncmVlbjsKK30KKzwv
c3R5bGU+CisKKzxwPlRlc3QgcGFzc2VzIGlmIHRoZXJlIGlzIGEgZmlsbGVkIGdyZWVuIHNxdWFy
ZSBhbmQgPHN0cm9uZz5ubyByZWQ8L3N0cm9uZz4uPC9wPgorCis8IS0tCisgIDFzdDogQSBncmVl
biByZWN0IDYweDEwMC4KKyAgICAgICBib3JkZXItdG9wIGlzIDYweDQwIGFuZCB0aGUgY29udGVu
dCBib3ggaXMgNjB4NjAuCisgICAgICAgV2UgdXNlICdhc3BlY3QtcmF0aW86IGF1dG8gJiYgPHJh
dGlvPicsIHNvIHRoZSBhc3BlY3QtcmF0aW8gd29ya3Mgd2l0aAorICAgICAgIGNvbnRlbnQtYm94
IGRpbWVuc2lvbnMgYWx3YXlzLiBUaGUgYmxvY2sgc2l6ZSBvZiB0aGUgY29udGVudCBib3ggaXMK
KyAgICAgICAoMTAwcHggLSA0MHB4KSA9IDYwcHgsIHNvIHRoZSBpbmxpbmUgc2l6ZSBpcyA2MHB4
ICogMS8xID0gNjBweC4KKyAgICAgICAobm90ZTogaGVpZ2h0IGhlcmUgaXMgdGhlIGlubGluZSBz
aXplIG9mIGJvcmRlci1ib3guKQorCisgIDJuZDogQSBncmVlbiByZWN0IDIweDEwMC4KKyAgICAg
ICBib3JkZXItdG9wIGlzIDIweDQwIGFuZCB0aGUgY29udGVudCBib3ggaXMgMjB4NjAuCisgICAg
ICAgKG5vdGU6IGhlaWdodCBoZXJlIGlzIHRoZSBpbmxpbmUgc2l6ZSBvZiBjb250ZW50LWJveC4p
CisKKyAgM3JkOiBBIGdyZWVuIHJlY3QgMjB4MTAwLgorICAgICAgIGJvcmRlci10b3AgaXMgMjB4
NDAgYW5kIHRoZSBjb250ZW50IGJveCBpcyAyMHg2MCBiZWNhdXNlIHdlIGNvbXB1dGUKKyAgICAg
ICB0aGUgaW5saW5lIHNpemUgYnkgYXNwZWN0LXJhdGlvIHdoaWNoIHdvcmtzIHdpdGggYm9yZGVy
LWJveCBhbmQgc28gdGhlCisgICAgICAgaW5saW5lIHNpemUgaXMgMTAwcHggLyA1ID0gMjBweC4K
KyAgICAgICAobm90ZTogaGVpZ2h0IGhlcmUgaXMgdGhlIGlubGluZSBzaXplIG9mIGJvcmRlci1i
b3guKQorLS0+Cis8aW1nIHNyYz0ic3VwcG9ydC8xeDEtZ3JlZW4ucG5nIiBzdHlsZT0iaGVpZ2h0
OiAxMDBweDsgYXNwZWN0LXJhdGlvOiBhdXRvIDEvMTA7IGJveC1zaXppbmc6IGJvcmRlci1ib3g7
IgorPjxpbWcgc3JjPSJzdXBwb3J0LzF4MS1ncmVlbi5wbmciIHN0eWxlPSJoZWlnaHQ6IDYwcHg7
IGFzcGVjdC1yYXRpbzogMy8xOyBib3gtc2l6aW5nOiBjb250ZW50LWJveDsiCis+PGltZyBzcmM9
InN1cHBvcnQvMXgxLWdyZWVuLnBuZyIgc3R5bGU9ImhlaWdodDogMTAwcHg7IGFzcGVjdC1yYXRp
bzogNS8xOyBib3gtc2l6aW5nOiBib3JkZXItYm94OyI+CisK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>420441</attachid>
            <date>2021-02-16 02:16:52 -0800</date>
            <delta_ts>2021-02-17 07:34:04 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-221671-20210216111650.patch</filename>
            <type>text/plain</type>
            <size>10715</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyODQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWFkMjE2YjNiMzYzN2Qw
ZGU3Mjk5MGMyNzBhM2EwMjExNmFlZWQ2NC4uZTEwMjY1MjZkMzZiOTlhOWM2ODAxYTkxZTdiM2Vj
YmFkMDZkNTBhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTAyLTE2ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgVGFrZSBpbnRvIGFjY291bnQgYm94
LXNpemluZyBpbiByZXBsYWNlZCBlbGVtZW50IGludHJpbnNpYyBzaXppbmcKKyAgICAgICAgaHR0
cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTY3MQorCisgICAgICAgIFJl
dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3JlcGxhY2VkLWVs
ZW1lbnQtMDMzLmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHA6
CisgICAgICAgIChXZWJDb3JlOjpyZXNvbHZlV2lkdGhGb3JSYXRpbyk6CisgICAgICAgIChXZWJD
b3JlOjpSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbFdpZHRoIGNvbnN0KToK
KyAgICAgICAgKFdlYkNvcmU6OnJlc29sdmVIZWlnaHRGb3JSYXRpbyk6CisgICAgICAgIChXZWJD
b3JlOjpSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbEhlaWdodCBjb25zdCk6
CisKIDIwMjEtMDItMTUgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBJ
bXByb3ZlIHJlYWRhYmlsaXR5IGluIFJlbmRlckZsZXhpYmxlQm94OjpjaGlsZEludHJpbnNpY0xv
Z2ljYWxXaWR0aApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJl
cGxhY2VkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAK
aW5kZXggMGNmOTY3MjU1YWFiZTM1MGQ0NDNhNDY5MzhmOTUzYzJmYTc1MDdkYy4uYjQxNzcxZDE3
Y2ZmOWRiYzM0YzMwNGM3Y2IxZmVhYTU0YTFmNzAwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv
cmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCkBAIC01MzIsNiArNTMyLDEzIEBAIExheW91dFVuaXQg
UmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVDb25zdHJhaW5lZExvZ2ljYWxXaWR0aChTaG91bGRDb21w
dXRlUHJlZmVycmVkCiAgICAgcmV0dXJuIGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxXaWR0aFJlc3Bl
Y3RpbmdNaW5NYXhXaWR0aChsb2dpY2FsV2lkdGgsIHNob3VsZENvbXB1dGVQcmVmZXJyZWQpOwog
fQogCitzdGF0aWMgaW5saW5lIExheW91dFVuaXQgcmVzb2x2ZVdpZHRoRm9yUmF0aW8oTGF5b3V0
VW5pdCBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCwgTGF5b3V0VW5pdCBsb2dpY2FsSGVp
Z2h0LCBkb3VibGUgYXNwZWN0UmF0aW8sIEJveFNpemluZyBib3hTaXppbmcpCit7CisgICAgaWYg
KGJveFNpemluZyA9PSBCb3hTaXppbmc6OkJvcmRlckJveCkKKyAgICAgICAgcmV0dXJuIHJvdW5k
VG9JbnQocm91bmQoKGxvZ2ljYWxIZWlnaHQgKyBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdo
dCkgKiBhc3BlY3RSYXRpbykpOworICAgIHJldHVybiByb3VuZFRvSW50KHJvdW5kKGxvZ2ljYWxI
ZWlnaHQgKiBhc3BlY3RSYXRpbykpOworfQorCiBMYXlvdXRVbml0IFJlbmRlclJlcGxhY2VkOjpj
b21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGgoU2hvdWxkQ29tcHV0ZVByZWZlcnJlZCBzaG91bGRD
b21wdXRlUHJlZmVycmVkKSBjb25zdAogewogICAgIGlmIChzdHlsZSgpLmxvZ2ljYWxXaWR0aCgp
LmlzU3BlY2lmaWVkKCkgfHwgc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0ludHJpbnNpYygpKQpA
QCAtNTY3LDcgKzU3NCwxMCBAQCBMYXlvdXRVbml0IFJlbmRlclJlcGxhY2VkOjpjb21wdXRlUmVw
bGFjZWRMb2dpY2FsV2lkdGgoU2hvdWxkQ29tcHV0ZVByZWZlcnJlZCBzaAogICAgICAgICAgICAg
aWYgKGludHJpbnNpY1JhdGlvICYmICgoY29tcHV0ZWRIZWlnaHRJc0F1dG8gJiYgIWhhc0ludHJp
bnNpY1dpZHRoICYmIGhhc0ludHJpbnNpY0hlaWdodCkgfHwgIWNvbXB1dGVkSGVpZ2h0SXNBdXRv
KSkgewogICAgICAgICAgICAgICAgIExheW91dFVuaXQgZXN0aW1hdGVkVXNlZFdpZHRoID0gaGFz
SW50cmluc2ljV2lkdGggPyBMYXlvdXRVbml0KGNvbnN0cmFpbmVkU2l6ZS53aWR0aCgpKSA6IGNv
bXB1dGVDb25zdHJhaW5lZExvZ2ljYWxXaWR0aChzaG91bGRDb21wdXRlUHJlZmVycmVkKTsKICAg
ICAgICAgICAgICAgICBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQgPSBjb21wdXRlUmVwbGFjZWRM
b2dpY2FsSGVpZ2h0KE9wdGlvbmFsPExheW91dFVuaXQ+KGVzdGltYXRlZFVzZWRXaWR0aCkpOwot
ICAgICAgICAgICAgICAgIHJldHVybiBjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGhSZXNwZWN0
aW5nTWluTWF4V2lkdGgocm91bmRUb0ludChyb3VuZChsb2dpY2FsSGVpZ2h0ICogaW50cmluc2lj
UmF0aW8pKSwgc2hvdWxkQ29tcHV0ZVByZWZlcnJlZCk7CisgICAgICAgICAgICAgICAgQm94U2l6
aW5nIGJveFNpemluZyA9IEJveFNpemluZzo6Q29udGVudEJveDsKKyAgICAgICAgICAgICAgICBp
ZiAoc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKQorICAgICAgICAgICAgICAgICAgICBib3hTaXpp
bmcgPSBzdHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJhdGlvKCk7CisgICAgICAgICAgICAgICAg
cmV0dXJuIGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxXaWR0aFJlc3BlY3RpbmdNaW5NYXhXaWR0aChy
ZXNvbHZlV2lkdGhGb3JSYXRpbyhib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCgpLCBsb2dp
Y2FsSGVpZ2h0LCBpbnRyaW5zaWNSYXRpbywgYm94U2l6aW5nKSwgc2hvdWxkQ29tcHV0ZVByZWZl
cnJlZCk7CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIApAQCAtNTk2LDYgKzYwNiwxMyBA
QCBMYXlvdXRVbml0IFJlbmRlclJlcGxhY2VkOjpjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGgo
U2hvdWxkQ29tcHV0ZVByZWZlcnJlZCBzaAogICAgIHJldHVybiBjb21wdXRlUmVwbGFjZWRMb2dp
Y2FsV2lkdGhSZXNwZWN0aW5nTWluTWF4V2lkdGgoaW50cmluc2ljTG9naWNhbFdpZHRoKCksIHNo
b3VsZENvbXB1dGVQcmVmZXJyZWQpOwogfQogCitzdGF0aWMgaW5saW5lIExheW91dFVuaXQgcmVz
b2x2ZUhlaWdodEZvclJhdGlvKExheW91dFVuaXQgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxXaWR0
aCwgTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgsIGRvdWJsZSBhc3BlY3RSYXRpbywgQm94U2l6aW5n
IGJveFNpemluZykKK3sKKyAgICBpZiAoYm94U2l6aW5nID09IEJveFNpemluZzo6Qm9yZGVyQm94
KQorICAgICAgICByZXR1cm4gcm91bmRUb0ludChyb3VuZCgobG9naWNhbFdpZHRoICsgYm9yZGVy
QW5kUGFkZGluZ0xvZ2ljYWxXaWR0aCkgLyBhc3BlY3RSYXRpbykpOworICAgIHJldHVybiByb3Vu
ZFRvSW50KHJvdW5kKGxvZ2ljYWxXaWR0aCAvIGFzcGVjdFJhdGlvKSk7Cit9CisKIExheW91dFVu
aXQgUmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxIZWlnaHQoT3B0aW9uYWw8
TGF5b3V0VW5pdD4gZXN0aW1hdGVkVXNlZFdpZHRoKSBjb25zdAogewogICAgIC8vIDEwLjUgQ29u
dGVudCBoZWlnaHQ6IHRoZSAnaGVpZ2h0JyBwcm9wZXJ0eTogaHR0cDovL3d3dy53My5vcmcvVFIv
Q1NTMjEvdmlzdWRldC5odG1sI3Byb3BkZWYtaGVpZ2h0CkBAIC02MjUsNyArNjQyLDEwIEBAIExh
eW91dFVuaXQgUmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxIZWlnaHQoT3B0
aW9uYWw8TGF5b3V0VW5pdD4gZXN0CiAgICAgLy8gKHVzZWQgd2lkdGgpIC8gKGludHJpbnNpYyBy
YXRpbykKICAgICBpZiAoaW50cmluc2ljUmF0aW8pIHsKICAgICAgICAgTGF5b3V0VW5pdCB1c2Vk
V2lkdGggPSBlc3RpbWF0ZWRVc2VkV2lkdGggPyBlc3RpbWF0ZWRVc2VkV2lkdGgudmFsdWUoKSA6
IGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCgpOwotICAgICAgICByZXR1cm4gY29tcHV0ZVJlcGxhY2Vk
TG9naWNhbEhlaWdodFJlc3BlY3RpbmdNaW5NYXhIZWlnaHQocm91bmRUb0ludChyb3VuZCh1c2Vk
V2lkdGggLyBpbnRyaW5zaWNSYXRpbykpKTsKKyAgICAgICAgQm94U2l6aW5nIGJveFNpemluZyA9
IEJveFNpemluZzo6Q29udGVudEJveDsKKyAgICAgICAgaWYgKHN0eWxlKCkuaGFzQXNwZWN0UmF0
aW8oKSkKKyAgICAgICAgICAgIGJveFNpemluZyA9IHN0eWxlKCkuYm94U2l6aW5nRm9yQXNwZWN0
UmF0aW8oKTsKKyAgICAgICAgcmV0dXJuIGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxIZWlnaHRSZXNw
ZWN0aW5nTWluTWF4SGVpZ2h0KHJlc29sdmVIZWlnaHRGb3JSYXRpbyhib3JkZXJBbmRQYWRkaW5n
TG9naWNhbFdpZHRoKCksIHVzZWRXaWR0aCwgaW50cmluc2ljUmF0aW8sIGJveFNpemluZykpOwog
ICAgIH0KIAogICAgIC8vIE90aGVyd2lzZSwgaWYgJ2hlaWdodCcgaGFzIGEgY29tcHV0ZWQgdmFs
dWUgb2YgJ2F1dG8nLCBhbmQgdGhlIGVsZW1lbnQgaGFzIGFuIGludHJpbnNpYyBoZWlnaHQsIHRo
ZW4gdGhhdCBpbnRyaW5zaWMgaGVpZ2h0IGlzIHRoZSB1c2VkIHZhbHVlIG9mICdoZWlnaHQnLgpk
aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n
CmluZGV4IGYwMTI1ZmRiMzc4N2FlNDhlY2VhMzMzZmJiMTRiMTk5ZjhjMTJiMGEuLjY1YzQyZDM3
NjdhYjk3NDEzZmU5YzQ1OWQ3MjFkZmZlYzllNjNmYjggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz
L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAor
MjAyMS0wMi0xNiAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIFRha2Ug
aW50byBhY2NvdW50IGJveC1zaXppbmcgaW4gcmVwbGFjZWQgZWxlbWVudCBpbnRyaW5zaWMgc2l6
aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjE2
NzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRl
c3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDItMTUgIE1hbnVlbCBSZWdvIENhc2Fzbm92YXMgIDxy
ZWdvQGlnYWxpYS5jb20+CiAKICAgICAgICAgW3NlbGVjdG9yc10gVXBkYXRlIFdQVCB0ZXN0IHN1
aXRlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5
b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwppbmRleCA3ZGFlYmYzNTUwZjYyOGRjZWVk
ZDZmOWYyODMyMjY0ZDdjMTdhZjYwLi5kNjkwZDMyYWFjYzA3NzQ1NDg4YmNjMGFhNWU4NGI4YjVk
YzJhOGE5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisr
KyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAor
MjAyMS0wMi0xNiAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIFRha2Ug
aW50byBhY2NvdW50IGJveC1zaXppbmcgaW4gcmVwbGFjZWQgZWxlbWVudCBpbnRyaW5zaWMgc2l6
aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjE2
NzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHdl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxl
bWVudC0wMzMtZXhwZWN0ZWQueGh0OiBBZGRlZC4KKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3JlcGxhY2VkLWVsZW1lbnQtMDMzLmh0bWw6
IEFkZGVkLgorCiAyMDIxLTAyLTE1ICBNYW51ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2Fs
aWEuY29tPgogCiAgICAgICAgIFtzZWxlY3RvcnNdIFVwZGF0ZSBXUFQgdGVzdCBzdWl0ZQpkaWZm
IC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RF
eHBlY3RhdGlvbnMKaW5kZXggZTAxNTE1NDUwNjU5NWI0NmQzNmJjMjQxMjJmZWYxMDY0NjZkOGQ5
Zi4uMDFkMzY0YTQxNTk0ZWM0MmNkMTJlM2I0NGQ2MzZkMDU5MjlkNjE5ZiAxMDA2NDQKLS0tIGEv
TGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0
YXRpb25zCkBAIC00NTg4LDggKzQ1ODgsNiBAQCB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvLwogd2Vi
a2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
c2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMDguaHRtbCBbIEltYWdlT25seUZh
aWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMTAuaHRtbCBb
IEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6
ZS0wMTEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9y
ZXBsYWNlZC1lbGVtZW50LTAzMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3Jn
L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv
YXNwZWN0LXJhdGlvL3JlcGxhY2VkLWVsZW1lbnQtMDMyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vdGFibGUtZWxlbWVudC0wMDEuaHRtbCBbIEltYWdl
T25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2NvbnRhaW4taW50cmluc2ljLXNpemUvY29udGFpbi1p
bnRyaW5zaWMtc2l6ZS0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9i
LzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Nv
bnRhaW4taW50cmluc2ljLXNpemUvY29udGFpbi1pbnRyaW5zaWMtc2l6ZS0wMDIuaHRtbCBbIElt
YWdlT25seUZhaWx1cmUgXQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxl
bWVudC0wMzMtZXhwZWN0ZWQueGh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVudC0w
MzMtZXhwZWN0ZWQueGh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjA1YTEzNzk0NDgyYTk0ZjZjMTBiZDlkNGM5ODcw
NGU2M2VmNjAzMzEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNlZC1l
bGVtZW50LTAzMy1leHBlY3RlZC54aHQKQEAgLTAsMCArMSwxOSBAQAorPCFET0NUWVBFIGh0bWwg
UFVCTElDICItLy9XM0MvL0RURCBYSFRNTCAxLjAgU3RyaWN0Ly9FTiIgImh0dHA6Ly93d3cudzMu
b3JnL1RSL3hodG1sMS9EVEQveGh0bWwxLXN0cmljdC5kdGQiPgorPGh0bWwgeG1sbnM9Imh0dHA6
Ly93d3cudzMub3JnLzE5OTkveGh0bWwiPgorIDxoZWFkPgorICA8dGl0bGU+Q1NTIFJlZnRlc3Qg
UmVmZXJlbmNlPC90aXRsZT4KKyAgPGxpbmsgcmVsPSJhdXRob3IiIHRpdGxlPSJHw6lyYXJkIFRh
bGJvdCIgaHJlZj0iaHR0cDovL3d3dy5ndGFsYm90Lm9yZy9Ccm93c2VyQnVnc1NlY3Rpb24vY3Nz
MjF0ZXN0c3VpdGUvIiAvPgorICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPjwhW0NEQVRBWworICBk
aXYKKyAgeworICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgaGVpZ2h0OiAxMDBweDsKKyAg
d2lkdGg6IDEwMHB4OworICB9CisgIF1dPjwvc3R5bGU+CisgPC9oZWFkPgorIDxib2R5PgorICA8
cD5UZXN0IHBhc3NlcyBpZiB0aGVyZSBpcyBhIGZpbGxlZCBncmVlbiBzcXVhcmUgYW5kIDxzdHJv
bmc+bm8gcmVkPC9zdHJvbmc+LjwvcD4KKyAgPGRpdj48L2Rpdj4KKyA8L2JvZHk+Cis8L2h0bWw+
CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50LTAzMy5odG1sIGIv
TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu
Zy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVudC0wMzMuaHRtbApuZXcgZmlsZSBtb2RlIDEw
MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5jNDFl
MmJmYjA4OGQxNzg1NTBjYzE2ZDFkMmY0Y2JiMTFlODBhMjViCi0tLSAvZGV2L251bGwKKysrIGIv
TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu
Zy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVudC0wMzMuaHRtbApAQCAtMCwwICsxLDM2IEBA
Cis8IURPQ1RZUEUgaHRtbD4KKzx0aXRsZT5DU1MgYXNwZWN0LXJhdGlvOiBpbWcgaW5saW5lIHNp
emUgd2l0aCBib3gtc2l6aW5nICh2ZXJ0aWNhbCB3cml0aW5nIG1vZGUpPC90aXRsZT4KKzxsaW5r
IHJlbD0iYXV0aG9yIiB0aXRsZT0iTW96aWxsYSIgaHJlZj0iaHR0cHM6Ly93d3cubW96aWxsYS5v
cmcvIj4KKzxsaW5rIHJlbD0iaGVscCIgaHJlZj0iaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nz
cy1zaXppbmctNC8jYXNwZWN0LXJhdGlvIj4KKzxsaW5rIHJlbD0ibWF0Y2giIGhyZWY9Ii4uLy4u
L3JlZmVyZW5jZS9yZWYtZmlsbGVkLWdyZWVuLTEwMHB4LXNxdWFyZS54aHQiIC8+Cis8c3R5bGU+
CitpbWcgeworICB3cml0aW5nLW1vZGU6IHZlcnRpY2FsLWxyOworICBib3JkZXItdG9wOiA0MHB4
IHNvbGlkIGdyZWVuOworfQorPC9zdHlsZT4KKworPHA+VGVzdCBwYXNzZXMgaWYgdGhlcmUgaXMg
YSBmaWxsZWQgZ3JlZW4gc3F1YXJlIGFuZCA8c3Ryb25nPm5vIHJlZDwvc3Ryb25nPi48L3A+CisK
KzwhLS0KKyAgMXN0OiBBIGdyZWVuIHJlY3QgNjB4MTAwLgorICAgICAgIGJvcmRlci10b3AgaXMg
NjB4NDAgYW5kIHRoZSBjb250ZW50IGJveCBpcyA2MHg2MC4KKyAgICAgICBXZSB1c2UgJ2FzcGVj
dC1yYXRpbzogYXV0byAmJiA8cmF0aW8+Jywgc28gdGhlIGFzcGVjdC1yYXRpbyB3b3JrcyB3aXRo
CisgICAgICAgY29udGVudC1ib3ggZGltZW5zaW9ucyBhbHdheXMuIFRoZSBibG9jayBzaXplIG9m
IHRoZSBjb250ZW50IGJveCBpcworICAgICAgICgxMDBweCAtIDQwcHgpID0gNjBweCwgc28gdGhl
IGlubGluZSBzaXplIGlzIDYwcHggKiAxLzEgPSA2MHB4LgorICAgICAgIChub3RlOiBoZWlnaHQg
aGVyZSBpcyB0aGUgaW5saW5lIHNpemUgb2YgYm9yZGVyLWJveC4pCisKKyAgMm5kOiBBIGdyZWVu
IHJlY3QgMjB4MTAwLgorICAgICAgIGJvcmRlci10b3AgaXMgMjB4NDAgYW5kIHRoZSBjb250ZW50
IGJveCBpcyAyMHg2MC4KKyAgICAgICAobm90ZTogaGVpZ2h0IGhlcmUgaXMgdGhlIGlubGluZSBz
aXplIG9mIGNvbnRlbnQtYm94LikKKworICAzcmQ6IEEgZ3JlZW4gcmVjdCAyMHgxMDAuCisgICAg
ICAgYm9yZGVyLXRvcCBpcyAyMHg0MCBhbmQgdGhlIGNvbnRlbnQgYm94IGlzIDIweDYwIGJlY2F1
c2Ugd2UgY29tcHV0ZQorICAgICAgIHRoZSBpbmxpbmUgc2l6ZSBieSBhc3BlY3QtcmF0aW8gd2hp
Y2ggd29ya3Mgd2l0aCBib3JkZXItYm94IGFuZCBzbyB0aGUKKyAgICAgICBpbmxpbmUgc2l6ZSBp
cyAxMDBweCAvIDUgPSAyMHB4LgorICAgICAgIChub3RlOiBoZWlnaHQgaGVyZSBpcyB0aGUgaW5s
aW5lIHNpemUgb2YgYm9yZGVyLWJveC4pCistLT4KKzxpbWcgc3JjPSJzdXBwb3J0LzF4MS1ncmVl
bi5wbmciIHN0eWxlPSJoZWlnaHQ6IDEwMHB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMS8xMDsgYm94
LXNpemluZzogYm9yZGVyLWJveDsiCis+PGltZyBzcmM9InN1cHBvcnQvMXgxLWdyZWVuLnBuZyIg
c3R5bGU9ImhlaWdodDogNjBweDsgYXNwZWN0LXJhdGlvOiAxLzM7IGJveC1zaXppbmc6IGNvbnRl
bnQtYm94OyIKKz48aW1nIHNyYz0ic3VwcG9ydC8xeDEtZ3JlZW4ucG5nIiBzdHlsZT0iaGVpZ2h0
OiAxMDBweDsgYXNwZWN0LXJhdGlvOiAxLzU7IGJveC1zaXppbmc6IGJvcmRlci1ib3g7Ij4KKwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>420643</attachid>
            <date>2021-02-17 07:34:09 -0800</date>
            <delta_ts>2021-02-22 10:54:32 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-221671-20210217163408.patch</filename>
            <type>text/plain</type>
            <size>11022</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyOTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjE5OWE3YjA5NWFkZmE1
MmYwNDE0OGQ1OTY1OWE0MjE3MzM0ZjBlZC4uN2VhNWViN2Q3YmE3ZWI1NDdlOWUyM2Q3NDI5MzQ3
MWJmZmFmYWM0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAyLTE3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgVGFrZSBib3gtc2l6aW5nIGludG8g
YWNjb3VudCBpbiByZXBsYWNlZCBlbGVtZW50IGludHJpbnNpYyBzaXppbmcKKyAgICAgICAgaHR0
cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTY3MQorCisgICAgICAgIFJl
dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRha2UgYm94LXNpemluZyBpbnRv
IGFjY291bnQgaW4gcmVwbGFjZWQgZWxlbWVudCBpbnRyaW5zaWMgc2l6aW5nIHdoZW4KKyAgICAg
ICAgdXNpbmcgYXNwZWN0LXJhdGlvLCBidXQga2VlcCB1c2luZyBjb250ZW50LWJveCB3aGVuIHJl
c29sdmluZworICAgICAgICB3aWR0aC9oZWlnaHQgd2hlbiBubyBhc3BlY3QtcmF0aW8gaXMgc2V0
LgorCisgICAgICAgIFRlc3Q6IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1zaXppbmcvYXNwZWN0LXJhdGlvL3JlcGxhY2VkLWVsZW1lbnQtMDMzLmh0bWwKKworICAgICAg
ICAqIHJlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpyZXNv
bHZlV2lkdGhGb3JSYXRpbyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJSZXBsYWNlZDo6Y29t
cHV0ZVJlcGxhY2VkTG9naWNhbFdpZHRoIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OnJlc29s
dmVIZWlnaHRGb3JSYXRpbyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJSZXBsYWNlZDo6Y29t
cHV0ZVJlcGxhY2VkTG9naWNhbEhlaWdodCBjb25zdCk6CisKIDIwMjEtMDItMTcgIEFuZHJlcyBH
b256YWxleiAgPGFuZHJlc2dfMjJAYXBwbGUuY29tPgogCiAgICAgICAgIFN1cHBvcnQgYXJpYS1l
cnJvcm1lc3NhZ2Ugb24gaU9TLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n
L1JlbmRlclJlcGxhY2VkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBs
YWNlZC5jcHAKaW5kZXggMGNmOTY3MjU1YWFiZTM1MGQ0NDNhNDY5MzhmOTUzYzJmYTc1MDdkYy4u
YjQxNzcxZDE3Y2ZmOWRiYzM0YzMwNGM3Y2IxZmVhYTU0YTFmNzAwZSAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcAorKysgYi9Tb3VyY2UvV2Vi
Q29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCkBAIC01MzIsNiArNTMyLDEzIEBAIExh
eW91dFVuaXQgUmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVDb25zdHJhaW5lZExvZ2ljYWxXaWR0aChT
aG91bGRDb21wdXRlUHJlZmVycmVkCiAgICAgcmV0dXJuIGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxX
aWR0aFJlc3BlY3RpbmdNaW5NYXhXaWR0aChsb2dpY2FsV2lkdGgsIHNob3VsZENvbXB1dGVQcmVm
ZXJyZWQpOwogfQogCitzdGF0aWMgaW5saW5lIExheW91dFVuaXQgcmVzb2x2ZVdpZHRoRm9yUmF0
aW8oTGF5b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCwgTGF5b3V0VW5pdCBs
b2dpY2FsSGVpZ2h0LCBkb3VibGUgYXNwZWN0UmF0aW8sIEJveFNpemluZyBib3hTaXppbmcpCit7
CisgICAgaWYgKGJveFNpemluZyA9PSBCb3hTaXppbmc6OkJvcmRlckJveCkKKyAgICAgICAgcmV0
dXJuIHJvdW5kVG9JbnQocm91bmQoKGxvZ2ljYWxIZWlnaHQgKyBib3JkZXJBbmRQYWRkaW5nTG9n
aWNhbEhlaWdodCkgKiBhc3BlY3RSYXRpbykpOworICAgIHJldHVybiByb3VuZFRvSW50KHJvdW5k
KGxvZ2ljYWxIZWlnaHQgKiBhc3BlY3RSYXRpbykpOworfQorCiBMYXlvdXRVbml0IFJlbmRlclJl
cGxhY2VkOjpjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGgoU2hvdWxkQ29tcHV0ZVByZWZlcnJl
ZCBzaG91bGRDb21wdXRlUHJlZmVycmVkKSBjb25zdAogewogICAgIGlmIChzdHlsZSgpLmxvZ2lj
YWxXaWR0aCgpLmlzU3BlY2lmaWVkKCkgfHwgc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0ludHJp
bnNpYygpKQpAQCAtNTY3LDcgKzU3NCwxMCBAQCBMYXlvdXRVbml0IFJlbmRlclJlcGxhY2VkOjpj
b21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGgoU2hvdWxkQ29tcHV0ZVByZWZlcnJlZCBzaAogICAg
ICAgICAgICAgaWYgKGludHJpbnNpY1JhdGlvICYmICgoY29tcHV0ZWRIZWlnaHRJc0F1dG8gJiYg
IWhhc0ludHJpbnNpY1dpZHRoICYmIGhhc0ludHJpbnNpY0hlaWdodCkgfHwgIWNvbXB1dGVkSGVp
Z2h0SXNBdXRvKSkgewogICAgICAgICAgICAgICAgIExheW91dFVuaXQgZXN0aW1hdGVkVXNlZFdp
ZHRoID0gaGFzSW50cmluc2ljV2lkdGggPyBMYXlvdXRVbml0KGNvbnN0cmFpbmVkU2l6ZS53aWR0
aCgpKSA6IGNvbXB1dGVDb25zdHJhaW5lZExvZ2ljYWxXaWR0aChzaG91bGRDb21wdXRlUHJlZmVy
cmVkKTsKICAgICAgICAgICAgICAgICBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQgPSBjb21wdXRl
UmVwbGFjZWRMb2dpY2FsSGVpZ2h0KE9wdGlvbmFsPExheW91dFVuaXQ+KGVzdGltYXRlZFVzZWRX
aWR0aCkpOwotICAgICAgICAgICAgICAgIHJldHVybiBjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lk
dGhSZXNwZWN0aW5nTWluTWF4V2lkdGgocm91bmRUb0ludChyb3VuZChsb2dpY2FsSGVpZ2h0ICog
aW50cmluc2ljUmF0aW8pKSwgc2hvdWxkQ29tcHV0ZVByZWZlcnJlZCk7CisgICAgICAgICAgICAg
ICAgQm94U2l6aW5nIGJveFNpemluZyA9IEJveFNpemluZzo6Q29udGVudEJveDsKKyAgICAgICAg
ICAgICAgICBpZiAoc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKQorICAgICAgICAgICAgICAgICAg
ICBib3hTaXppbmcgPSBzdHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJhdGlvKCk7CisgICAgICAg
ICAgICAgICAgcmV0dXJuIGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxXaWR0aFJlc3BlY3RpbmdNaW5N
YXhXaWR0aChyZXNvbHZlV2lkdGhGb3JSYXRpbyhib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdo
dCgpLCBsb2dpY2FsSGVpZ2h0LCBpbnRyaW5zaWNSYXRpbywgYm94U2l6aW5nKSwgc2hvdWxkQ29t
cHV0ZVByZWZlcnJlZCk7CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIApAQCAtNTk2LDYg
KzYwNiwxMyBAQCBMYXlvdXRVbml0IFJlbmRlclJlcGxhY2VkOjpjb21wdXRlUmVwbGFjZWRMb2dp
Y2FsV2lkdGgoU2hvdWxkQ29tcHV0ZVByZWZlcnJlZCBzaAogICAgIHJldHVybiBjb21wdXRlUmVw
bGFjZWRMb2dpY2FsV2lkdGhSZXNwZWN0aW5nTWluTWF4V2lkdGgoaW50cmluc2ljTG9naWNhbFdp
ZHRoKCksIHNob3VsZENvbXB1dGVQcmVmZXJyZWQpOwogfQogCitzdGF0aWMgaW5saW5lIExheW91
dFVuaXQgcmVzb2x2ZUhlaWdodEZvclJhdGlvKExheW91dFVuaXQgYm9yZGVyQW5kUGFkZGluZ0xv
Z2ljYWxXaWR0aCwgTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgsIGRvdWJsZSBhc3BlY3RSYXRpbywg
Qm94U2l6aW5nIGJveFNpemluZykKK3sKKyAgICBpZiAoYm94U2l6aW5nID09IEJveFNpemluZzo6
Qm9yZGVyQm94KQorICAgICAgICByZXR1cm4gcm91bmRUb0ludChyb3VuZCgobG9naWNhbFdpZHRo
ICsgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxXaWR0aCkgLyBhc3BlY3RSYXRpbykpOworICAgIHJl
dHVybiByb3VuZFRvSW50KHJvdW5kKGxvZ2ljYWxXaWR0aCAvIGFzcGVjdFJhdGlvKSk7Cit9CisK
IExheW91dFVuaXQgUmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxIZWlnaHQo
T3B0aW9uYWw8TGF5b3V0VW5pdD4gZXN0aW1hdGVkVXNlZFdpZHRoKSBjb25zdAogewogICAgIC8v
IDEwLjUgQ29udGVudCBoZWlnaHQ6IHRoZSAnaGVpZ2h0JyBwcm9wZXJ0eTogaHR0cDovL3d3dy53
My5vcmcvVFIvQ1NTMjEvdmlzdWRldC5odG1sI3Byb3BkZWYtaGVpZ2h0CkBAIC02MjUsNyArNjQy
LDEwIEBAIExheW91dFVuaXQgUmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxI
ZWlnaHQoT3B0aW9uYWw8TGF5b3V0VW5pdD4gZXN0CiAgICAgLy8gKHVzZWQgd2lkdGgpIC8gKGlu
dHJpbnNpYyByYXRpbykKICAgICBpZiAoaW50cmluc2ljUmF0aW8pIHsKICAgICAgICAgTGF5b3V0
VW5pdCB1c2VkV2lkdGggPSBlc3RpbWF0ZWRVc2VkV2lkdGggPyBlc3RpbWF0ZWRVc2VkV2lkdGgu
dmFsdWUoKSA6IGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCgpOwotICAgICAgICByZXR1cm4gY29tcHV0
ZVJlcGxhY2VkTG9naWNhbEhlaWdodFJlc3BlY3RpbmdNaW5NYXhIZWlnaHQocm91bmRUb0ludChy
b3VuZCh1c2VkV2lkdGggLyBpbnRyaW5zaWNSYXRpbykpKTsKKyAgICAgICAgQm94U2l6aW5nIGJv
eFNpemluZyA9IEJveFNpemluZzo6Q29udGVudEJveDsKKyAgICAgICAgaWYgKHN0eWxlKCkuaGFz
QXNwZWN0UmF0aW8oKSkKKyAgICAgICAgICAgIGJveFNpemluZyA9IHN0eWxlKCkuYm94U2l6aW5n
Rm9yQXNwZWN0UmF0aW8oKTsKKyAgICAgICAgcmV0dXJuIGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxI
ZWlnaHRSZXNwZWN0aW5nTWluTWF4SGVpZ2h0KHJlc29sdmVIZWlnaHRGb3JSYXRpbyhib3JkZXJB
bmRQYWRkaW5nTG9naWNhbFdpZHRoKCksIHVzZWRXaWR0aCwgaW50cmluc2ljUmF0aW8sIGJveFNp
emluZykpOwogICAgIH0KIAogICAgIC8vIE90aGVyd2lzZSwgaWYgJ2hlaWdodCcgaGFzIGEgY29t
cHV0ZWQgdmFsdWUgb2YgJ2F1dG8nLCBhbmQgdGhlIGVsZW1lbnQgaGFzIGFuIGludHJpbnNpYyBo
ZWlnaHQsIHRoZW4gdGhhdCBpbnRyaW5zaWMgaGVpZ2h0IGlzIHRoZSB1c2VkIHZhbHVlIG9mICdo
ZWlnaHQnLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMv
Q2hhbmdlTG9nCmluZGV4IGY4MmQwNDFhMzAwMTUzNzk5ZDRiNjJlYzYzZDQ4OWYzOTM5MWFmMDUu
LjhhNjBjMzY2YzE2OGFmOGU4MGM5MGI2MGVjODg2YzQ2NzI2NGRhYmEgMTAwNjQ0Ci0tLSBhL0xh
eW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyAr
MSwxNCBAQAorMjAyMS0wMi0xNyAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAg
ICAgIFRha2UgYm94LXNpemluZyBpbnRvIGFjY291bnQgaW4gcmVwbGFjZWQgZWxlbWVudCBpbnRy
aW5zaWMgc2l6aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjE2NzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBFbmFibGUgc29tZSB0ZXN0cyB0aGF0IHBhc3Mgbm93LgorCisgICAgICAgICogVGVzdEV4
cGVjdGF0aW9uczoKKwogMjAyMS0wMi0xNyAgQW5kcmVzIEdvbnphbGV6ICA8YW5kcmVzZ18yMkBh
cHBsZS5jb20+CiAKICAgICAgICAgU3VwcG9ydCBhcmlhLWVycm9ybWVzc2FnZSBvbiBpT1MuCmRp
ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVz
dHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwppbmRleCAxOTI5MGZmOTFiNDJlNWRhMWRiZjk2NWM0
NzRjMWVjYmM0MmZhNGRiLi5lNDRiYjdjN2VlZWEyNzY4ZjllMDVlYjNmMzNhMzMwYWU1ZTAwZjI4
IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xh
eW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMS0w
Mi0xNyAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIFRha2UgYm94LXNp
emluZyBpbnRvIGFjY291bnQgaW4gcmVwbGFjZWQgZWxlbWVudCBpbnRyaW5zaWMgc2l6aW5nCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjE2NzEKKwor
ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgdGVzdCBm
b3IgaGFuZGxpbmcgbm9uIGhvcml6b250YWwgd3JpdGluZy1tb2RlLgorCisgICAgICAgICogd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNlZC1lbGVt
ZW50LTAzMy1leHBlY3RlZC54aHQ6IEFkZGVkLgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVudC0wMzMuaHRtbDog
QWRkZWQuCisKIDIwMjEtMDItMTYgIE1hbnVlbCBSZWdvIENhc2Fzbm92YXMgIDxyZWdvQGlnYWxp
YS5jb20+CiAKICAgICAgICAgW3NlbGVjdG9yc10gOmZvY3VzLXZpc2libGUgcGFyc2luZyBhbmQg
ZXhwZXJpbWVudGFsIGZsYWcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlv
bnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDJiNTBlZTRmNTA3ZjdjYjVk
ZDM5OTg2ZWMyNWFmZGI5Y2Y4YjM2NDcuLjRjN2Y5ZDA3Zjk4ZjA3MWU0NDljOWY5NDRjMWQ5ZmQw
OWNkMzAzMTQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIv
TGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDU4NSw4ICs0NTg1LDYgQEAgd2Via2l0
Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6
aW5nL2FzcGVjdC1yYXRpby8KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUt
MDA4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50
cmluc2ljLXNpemUtMDEwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8y
MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl
Y3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDExLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdl
YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXNpemluZy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVudC0wMzEuaHRtbCBbIEltYWdlT25s
eUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50LTAzMi5o
dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3RhYmxlLWVs
ZW1lbnQtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMg
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9jb250YWluLWlu
dHJpbnNpYy1zaXplL2NvbnRhaW4taW50cmluc2ljLXNpemUtMDAxLmh0bWwgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXNpemluZy9jb250YWluLWludHJpbnNpYy1zaXplL2NvbnRhaW4taW50cmlu
c2ljLXNpemUtMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KZGlmZiAtLWdpdCBhL0xheW91
dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw
ZWN0LXJhdGlvL3JlcGxhY2VkLWVsZW1lbnQtMDMzLWV4cGVjdGVkLnhodCBiL0xheW91dFRlc3Rz
L2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh
dGlvL3JlcGxhY2VkLWVsZW1lbnQtMDMzLWV4cGVjdGVkLnhodApuZXcgZmlsZSBtb2RlIDEwMDY0
NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wNWExMzc5
NDQ4MmE5NGY2YzEwYmQ5ZDRjOTg3MDRlNjNlZjYwMzMxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5
b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h
c3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVudC0wMzMtZXhwZWN0ZWQueGh0CkBAIC0wLDAgKzEs
MTkgQEAKKzwhRE9DVFlQRSBodG1sIFBVQkxJQyAiLS8vVzNDLy9EVEQgWEhUTUwgMS4wIFN0cmlj
dC8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9UUi94aHRtbDEvRFREL3hodG1sMS1zdHJpY3QuZHRk
Ij4KKzxodG1sIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hodG1sIj4KKyA8aGVhZD4K
KyAgPHRpdGxlPkNTUyBSZWZ0ZXN0IFJlZmVyZW5jZTwvdGl0bGU+CisgIDxsaW5rIHJlbD0iYXV0
aG9yIiB0aXRsZT0iR8OpcmFyZCBUYWxib3QiIGhyZWY9Imh0dHA6Ly93d3cuZ3RhbGJvdC5vcmcv
QnJvd3NlckJ1Z3NTZWN0aW9uL2NzczIxdGVzdHN1aXRlLyIgLz4KKyAgPHN0eWxlIHR5cGU9InRl
eHQvY3NzIj48IVtDREFUQVsKKyAgZGl2CisgIHsKKyAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47
CisgIGhlaWdodDogMTAwcHg7CisgIHdpZHRoOiAxMDBweDsKKyAgfQorICBdXT48L3N0eWxlPgor
IDwvaGVhZD4KKyA8Ym9keT4KKyAgPHA+VGVzdCBwYXNzZXMgaWYgdGhlcmUgaXMgYSBmaWxsZWQg
Z3JlZW4gc3F1YXJlIGFuZCA8c3Ryb25nPm5vIHJlZDwvc3Ryb25nPi48L3A+CisgIDxkaXY+PC9k
aXY+CisgPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vcmVwbGFj
ZWQtZWxlbWVudC0wMzMuaHRtbCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3JlcGxhY2VkLWVsZW1lbnQtMDMz
Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMC4uYzQxZTJiZmIwODhkMTc4NTUwY2MxNmQxZDJmNGNiYjExZTgwYTI1
YgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3JlcGxhY2VkLWVsZW1lbnQtMDMz
Lmh0bWwKQEAgLTAsMCArMSwzNiBAQAorPCFET0NUWVBFIGh0bWw+Cis8dGl0bGU+Q1NTIGFzcGVj
dC1yYXRpbzogaW1nIGlubGluZSBzaXplIHdpdGggYm94LXNpemluZyAodmVydGljYWwgd3JpdGlu
ZyBtb2RlKTwvdGl0bGU+Cis8bGluayByZWw9ImF1dGhvciIgdGl0bGU9Ik1vemlsbGEiIGhyZWY9
Imh0dHBzOi8vd3d3Lm1vemlsbGEub3JnLyI+Cis8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHBz
Oi8vZHJhZnRzLmNzc3dnLm9yZy9jc3Mtc2l6aW5nLTQvI2FzcGVjdC1yYXRpbyI+Cis8bGluayBy
ZWw9Im1hdGNoIiBocmVmPSIuLi8uLi9yZWZlcmVuY2UvcmVmLWZpbGxlZC1ncmVlbi0xMDBweC1z
cXVhcmUueGh0IiAvPgorPHN0eWxlPgoraW1nIHsKKyAgd3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1s
cjsKKyAgYm9yZGVyLXRvcDogNDBweCBzb2xpZCBncmVlbjsKK30KKzwvc3R5bGU+CisKKzxwPlRl
c3QgcGFzc2VzIGlmIHRoZXJlIGlzIGEgZmlsbGVkIGdyZWVuIHNxdWFyZSBhbmQgPHN0cm9uZz5u
byByZWQ8L3N0cm9uZz4uPC9wPgorCis8IS0tCisgIDFzdDogQSBncmVlbiByZWN0IDYweDEwMC4K
KyAgICAgICBib3JkZXItdG9wIGlzIDYweDQwIGFuZCB0aGUgY29udGVudCBib3ggaXMgNjB4NjAu
CisgICAgICAgV2UgdXNlICdhc3BlY3QtcmF0aW86IGF1dG8gJiYgPHJhdGlvPicsIHNvIHRoZSBh
c3BlY3QtcmF0aW8gd29ya3Mgd2l0aAorICAgICAgIGNvbnRlbnQtYm94IGRpbWVuc2lvbnMgYWx3
YXlzLiBUaGUgYmxvY2sgc2l6ZSBvZiB0aGUgY29udGVudCBib3ggaXMKKyAgICAgICAoMTAwcHgg
LSA0MHB4KSA9IDYwcHgsIHNvIHRoZSBpbmxpbmUgc2l6ZSBpcyA2MHB4ICogMS8xID0gNjBweC4K
KyAgICAgICAobm90ZTogaGVpZ2h0IGhlcmUgaXMgdGhlIGlubGluZSBzaXplIG9mIGJvcmRlci1i
b3guKQorCisgIDJuZDogQSBncmVlbiByZWN0IDIweDEwMC4KKyAgICAgICBib3JkZXItdG9wIGlz
IDIweDQwIGFuZCB0aGUgY29udGVudCBib3ggaXMgMjB4NjAuCisgICAgICAgKG5vdGU6IGhlaWdo
dCBoZXJlIGlzIHRoZSBpbmxpbmUgc2l6ZSBvZiBjb250ZW50LWJveC4pCisKKyAgM3JkOiBBIGdy
ZWVuIHJlY3QgMjB4MTAwLgorICAgICAgIGJvcmRlci10b3AgaXMgMjB4NDAgYW5kIHRoZSBjb250
ZW50IGJveCBpcyAyMHg2MCBiZWNhdXNlIHdlIGNvbXB1dGUKKyAgICAgICB0aGUgaW5saW5lIHNp
emUgYnkgYXNwZWN0LXJhdGlvIHdoaWNoIHdvcmtzIHdpdGggYm9yZGVyLWJveCBhbmQgc28gdGhl
CisgICAgICAgaW5saW5lIHNpemUgaXMgMTAwcHggLyA1ID0gMjBweC4KKyAgICAgICAobm90ZTog
aGVpZ2h0IGhlcmUgaXMgdGhlIGlubGluZSBzaXplIG9mIGJvcmRlci1ib3guKQorLS0+Cis8aW1n
IHNyYz0ic3VwcG9ydC8xeDEtZ3JlZW4ucG5nIiBzdHlsZT0iaGVpZ2h0OiAxMDBweDsgYXNwZWN0
LXJhdGlvOiBhdXRvIDEvMTA7IGJveC1zaXppbmc6IGJvcmRlci1ib3g7IgorPjxpbWcgc3JjPSJz
dXBwb3J0LzF4MS1ncmVlbi5wbmciIHN0eWxlPSJoZWlnaHQ6IDYwcHg7IGFzcGVjdC1yYXRpbzog
MS8zOyBib3gtc2l6aW5nOiBjb250ZW50LWJveDsiCis+PGltZyBzcmM9InN1cHBvcnQvMXgxLWdy
ZWVuLnBuZyIgc3R5bGU9ImhlaWdodDogMTAwcHg7IGFzcGVjdC1yYXRpbzogMS81OyBib3gtc2l6
aW5nOiBib3JkZXItYm94OyI+CisK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>421212</attachid>
            <date>2021-02-22 10:54:37 -0800</date>
            <delta_ts>2021-02-23 03:33:56 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-221671-20210222195436.patch</filename>
            <type>text/plain</type>
            <size>9283</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczMjQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTZjYTEzMjQ2OWM1Mjdl
NjBlYjJjMzZmNmEzNDc3MDg0N2Q2N2NmZi4uZGI2NjU1NjMxMGIyMzE1NDU5ZTE4YjA5MzhjOGJm
ODgwNzhmNTE2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTAyLTIyICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgVGFrZSBib3gtc2l6aW5nIGludG8g
YWNjb3VudCBpbiByZXBsYWNlZCBlbGVtZW50IGludHJpbnNpYyBzaXppbmcKKyAgICAgICAgaHR0
cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTY3MQorCisgICAgICAgIFJl
dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRha2UgYm94LXNpemluZyBpbnRv
IGFjY291bnQgaW4gcmVwbGFjZWQgZWxlbWVudCBpbnRyaW5zaWMgc2l6aW5nIHdoZW4KKyAgICAg
ICAgdXNpbmcgYXNwZWN0LXJhdGlvLCBidXQga2VlcCB1c2luZyBjb250ZW50LWJveCB3aGVuIHJl
c29sdmluZworICAgICAgICB3aWR0aC9oZWlnaHQgd2hlbiBubyBhc3BlY3QtcmF0aW8gaXMgc2V0
LgorCisgICAgICAgIFRlc3RzOiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50LTAzMS5odG1sCisgICAgICAg
ICAgICAgICBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz
cGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50LTAzMi5odG1sCisgICAgICAgICAgICAgICBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9y
ZXBsYWNlZC1lbGVtZW50LTAzMy5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyUmVw
bGFjZWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cmVzb2x2ZVdpZHRoRm9yUmF0aW8pOgorICAg
ICAgICAoV2ViQ29yZTo6UmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxXaWR0
aCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpyZXNvbHZlSGVpZ2h0Rm9yUmF0aW8pOgorICAg
ICAgICAoV2ViQ29yZTo6UmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxIZWln
aHQgY29uc3QpOgorCiAyMDIxLTAyLTIyICBTYW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4K
IAogICAgICAgICBBZGQgZXhwZXJpbWVudGFsIHN1cHBvcnQgZm9yIENTUyBDb2xvciA1IGNvbG9y
LW1peCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFj
ZWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcAppbmRl
eCAwY2Y5NjcyNTVhYWJlMzUwZDQ0M2E0NjkzOGY5NTNjMmZhNzUwN2RjLi5iNDE3NzFkMTdjZmY5
ZGJjMzRjMzA0YzdjYjFmZWFhNTRhMWY3MDBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y
ZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu
Zy9SZW5kZXJSZXBsYWNlZC5jcHAKQEAgLTUzMiw2ICs1MzIsMTMgQEAgTGF5b3V0VW5pdCBSZW5k
ZXJSZXBsYWNlZDo6Y29tcHV0ZUNvbnN0cmFpbmVkTG9naWNhbFdpZHRoKFNob3VsZENvbXB1dGVQ
cmVmZXJyZWQKICAgICByZXR1cm4gY29tcHV0ZVJlcGxhY2VkTG9naWNhbFdpZHRoUmVzcGVjdGlu
Z01pbk1heFdpZHRoKGxvZ2ljYWxXaWR0aCwgc2hvdWxkQ29tcHV0ZVByZWZlcnJlZCk7CiB9CiAK
K3N0YXRpYyBpbmxpbmUgTGF5b3V0VW5pdCByZXNvbHZlV2lkdGhGb3JSYXRpbyhMYXlvdXRVbml0
IGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsSGVpZ2h0LCBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQs
IGRvdWJsZSBhc3BlY3RSYXRpbywgQm94U2l6aW5nIGJveFNpemluZykKK3sKKyAgICBpZiAoYm94
U2l6aW5nID09IEJveFNpemluZzo6Qm9yZGVyQm94KQorICAgICAgICByZXR1cm4gcm91bmRUb0lu
dChyb3VuZCgobG9naWNhbEhlaWdodCArIGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsSGVpZ2h0KSAq
IGFzcGVjdFJhdGlvKSk7CisgICAgcmV0dXJuIHJvdW5kVG9JbnQocm91bmQobG9naWNhbEhlaWdo
dCAqIGFzcGVjdFJhdGlvKSk7Cit9CisKIExheW91dFVuaXQgUmVuZGVyUmVwbGFjZWQ6OmNvbXB1
dGVSZXBsYWNlZExvZ2ljYWxXaWR0aChTaG91bGRDb21wdXRlUHJlZmVycmVkIHNob3VsZENvbXB1
dGVQcmVmZXJyZWQpIGNvbnN0CiB7CiAgICAgaWYgKHN0eWxlKCkubG9naWNhbFdpZHRoKCkuaXNT
cGVjaWZpZWQoKSB8fCBzdHlsZSgpLmxvZ2ljYWxXaWR0aCgpLmlzSW50cmluc2ljKCkpCkBAIC01
NjcsNyArNTc0LDEwIEBAIExheW91dFVuaXQgUmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVSZXBsYWNl
ZExvZ2ljYWxXaWR0aChTaG91bGRDb21wdXRlUHJlZmVycmVkIHNoCiAgICAgICAgICAgICBpZiAo
aW50cmluc2ljUmF0aW8gJiYgKChjb21wdXRlZEhlaWdodElzQXV0byAmJiAhaGFzSW50cmluc2lj
V2lkdGggJiYgaGFzSW50cmluc2ljSGVpZ2h0KSB8fCAhY29tcHV0ZWRIZWlnaHRJc0F1dG8pKSB7
CiAgICAgICAgICAgICAgICAgTGF5b3V0VW5pdCBlc3RpbWF0ZWRVc2VkV2lkdGggPSBoYXNJbnRy
aW5zaWNXaWR0aCA/IExheW91dFVuaXQoY29uc3RyYWluZWRTaXplLndpZHRoKCkpIDogY29tcHV0
ZUNvbnN0cmFpbmVkTG9naWNhbFdpZHRoKHNob3VsZENvbXB1dGVQcmVmZXJyZWQpOwogICAgICAg
ICAgICAgICAgIExheW91dFVuaXQgbG9naWNhbEhlaWdodCA9IGNvbXB1dGVSZXBsYWNlZExvZ2lj
YWxIZWlnaHQoT3B0aW9uYWw8TGF5b3V0VW5pdD4oZXN0aW1hdGVkVXNlZFdpZHRoKSk7Ci0gICAg
ICAgICAgICAgICAgcmV0dXJuIGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxXaWR0aFJlc3BlY3RpbmdN
aW5NYXhXaWR0aChyb3VuZFRvSW50KHJvdW5kKGxvZ2ljYWxIZWlnaHQgKiBpbnRyaW5zaWNSYXRp
bykpLCBzaG91bGRDb21wdXRlUHJlZmVycmVkKTsKKyAgICAgICAgICAgICAgICBCb3hTaXppbmcg
Ym94U2l6aW5nID0gQm94U2l6aW5nOjpDb250ZW50Qm94OworICAgICAgICAgICAgICAgIGlmIChz
dHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpCisgICAgICAgICAgICAgICAgICAgIGJveFNpemluZyA9
IHN0eWxlKCkuYm94U2l6aW5nRm9yQXNwZWN0UmF0aW8oKTsKKyAgICAgICAgICAgICAgICByZXR1
cm4gY29tcHV0ZVJlcGxhY2VkTG9naWNhbFdpZHRoUmVzcGVjdGluZ01pbk1heFdpZHRoKHJlc29s
dmVXaWR0aEZvclJhdGlvKGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsSGVpZ2h0KCksIGxvZ2ljYWxI
ZWlnaHQsIGludHJpbnNpY1JhdGlvLCBib3hTaXppbmcpLCBzaG91bGRDb21wdXRlUHJlZmVycmVk
KTsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgCkBAIC01OTYsNiArNjA2LDEzIEBAIExh
eW91dFVuaXQgUmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxXaWR0aChTaG91
bGRDb21wdXRlUHJlZmVycmVkIHNoCiAgICAgcmV0dXJuIGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxX
aWR0aFJlc3BlY3RpbmdNaW5NYXhXaWR0aChpbnRyaW5zaWNMb2dpY2FsV2lkdGgoKSwgc2hvdWxk
Q29tcHV0ZVByZWZlcnJlZCk7CiB9CiAKK3N0YXRpYyBpbmxpbmUgTGF5b3V0VW5pdCByZXNvbHZl
SGVpZ2h0Rm9yUmF0aW8oTGF5b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoLCBM
YXlvdXRVbml0IGxvZ2ljYWxXaWR0aCwgZG91YmxlIGFzcGVjdFJhdGlvLCBCb3hTaXppbmcgYm94
U2l6aW5nKQoreworICAgIGlmIChib3hTaXppbmcgPT0gQm94U2l6aW5nOjpCb3JkZXJCb3gpCisg
ICAgICAgIHJldHVybiByb3VuZFRvSW50KHJvdW5kKChsb2dpY2FsV2lkdGggKyBib3JkZXJBbmRQ
YWRkaW5nTG9naWNhbFdpZHRoKSAvIGFzcGVjdFJhdGlvKSk7CisgICAgcmV0dXJuIHJvdW5kVG9J
bnQocm91bmQobG9naWNhbFdpZHRoIC8gYXNwZWN0UmF0aW8pKTsKK30KKwogTGF5b3V0VW5pdCBS
ZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbEhlaWdodChPcHRpb25hbDxMYXlv
dXRVbml0PiBlc3RpbWF0ZWRVc2VkV2lkdGgpIGNvbnN0CiB7CiAgICAgLy8gMTAuNSBDb250ZW50
IGhlaWdodDogdGhlICdoZWlnaHQnIHByb3BlcnR5OiBodHRwOi8vd3d3LnczLm9yZy9UUi9DU1My
MS92aXN1ZGV0Lmh0bWwjcHJvcGRlZi1oZWlnaHQKQEAgLTYyNSw3ICs2NDIsMTAgQEAgTGF5b3V0
VW5pdCBSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbEhlaWdodChPcHRpb25h
bDxMYXlvdXRVbml0PiBlc3QKICAgICAvLyAodXNlZCB3aWR0aCkgLyAoaW50cmluc2ljIHJhdGlv
KQogICAgIGlmIChpbnRyaW5zaWNSYXRpbykgewogICAgICAgICBMYXlvdXRVbml0IHVzZWRXaWR0
aCA9IGVzdGltYXRlZFVzZWRXaWR0aCA/IGVzdGltYXRlZFVzZWRXaWR0aC52YWx1ZSgpIDogYXZh
aWxhYmxlTG9naWNhbFdpZHRoKCk7Ci0gICAgICAgIHJldHVybiBjb21wdXRlUmVwbGFjZWRMb2dp
Y2FsSGVpZ2h0UmVzcGVjdGluZ01pbk1heEhlaWdodChyb3VuZFRvSW50KHJvdW5kKHVzZWRXaWR0
aCAvIGludHJpbnNpY1JhdGlvKSkpOworICAgICAgICBCb3hTaXppbmcgYm94U2l6aW5nID0gQm94
U2l6aW5nOjpDb250ZW50Qm94OworICAgICAgICBpZiAoc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygp
KQorICAgICAgICAgICAgYm94U2l6aW5nID0gc3R5bGUoKS5ib3hTaXppbmdGb3JBc3BlY3RSYXRp
bygpOworICAgICAgICByZXR1cm4gY29tcHV0ZVJlcGxhY2VkTG9naWNhbEhlaWdodFJlc3BlY3Rp
bmdNaW5NYXhIZWlnaHQocmVzb2x2ZUhlaWdodEZvclJhdGlvKGJvcmRlckFuZFBhZGRpbmdMb2dp
Y2FsV2lkdGgoKSwgdXNlZFdpZHRoLCBpbnRyaW5zaWNSYXRpbywgYm94U2l6aW5nKSk7CiAgICAg
fQogCiAgICAgLy8gT3RoZXJ3aXNlLCBpZiAnaGVpZ2h0JyBoYXMgYSBjb21wdXRlZCB2YWx1ZSBv
ZiAnYXV0bycsIGFuZCB0aGUgZWxlbWVudCBoYXMgYW4gaW50cmluc2ljIGhlaWdodCwgdGhlbiB0
aGF0IGludHJpbnNpYyBoZWlnaHQgaXMgdGhlIHVzZWQgdmFsdWUgb2YgJ2hlaWdodCcuCmRpZmYg
LS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5k
ZXggZDFiYmM0YmEyZmM3ZGU2NzM1MTA5NTJiY2E1ZTllNTcxMzUwNDRmNi4uODE2YzExNjJiZmY5
NjRiYmQzOTQzNjIwMzYyOWRmYjliYmNmODU5NyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hh
bmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIx
LTAyLTIyICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgVGFrZSBib3gt
c2l6aW5nIGludG8gYWNjb3VudCBpbiByZXBsYWNlZCBlbGVtZW50IGludHJpbnNpYyBzaXppbmcK
KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTY3MQor
CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuYWJsZSBz
b21lIHRlc3RzIHRoYXQgcGFzcyBub3cuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgor
CiAyMDIxLTAyLTIyICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmVz
eW5jIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8gZnJvbSB1
cHN0cmVhbQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBi
L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggMzQ1Y2QwMmNiOGFiNjQy
NDNkNzNjOWU4NGNjYzgxMDY1OTBkZDhmNi4uY2QyMTUzNzg4YzQ2N2NmNzRiYmI2YmVjMDEwMzhj
NTlmYzc4Mzg3NCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxv
ZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg
QEAKKzIwMjEtMDItMjIgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBU
YWtlIGJveC1zaXppbmcgaW50byBhY2NvdW50IGluIHJlcGxhY2VkIGVsZW1lbnQgaW50cmluc2lj
IHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
MjIxNjcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg
U3luYyB0ZXN0LgorCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n
L2FzcGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50LTAzMi5odG1sOgorCiAyMDIxLTAyLTIyICBS
b2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmVzeW5jIHdlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8gZnJvbSB1cHN0cmVhbQpkaWZmIC0t
Z2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBl
Y3RhdGlvbnMKaW5kZXggOWFiMTZiMjg0Mjc3NTY3MzliNzk5NWVkYzZhZWNkODU1MjJjMWZkYi4u
OGVlOTVjNGVmMTM4NzMyNDY5NTg5YTkwZjA4Yzc3MzBhZmJhMmI0NiAxMDA2NDQKLS0tIGEvTGF5
b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRp
b25zCkBAIC00NTcwLDkgKzQ1NzAsNiBAQCB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvLwogd2Via2l0
Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6
aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMTMuaHRtbCBbIEltYWdlT25seUZhaWx1
cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMTQuaHRtbCBbIElt
YWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0w
MTUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9yZXBs
YWNlZC1lbGVtZW50LTAzMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2Iv
MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw
ZWN0LXJhdGlvL3JlcGxhY2VkLWVsZW1lbnQtMDMyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
LXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVudC0wMzMuaHRtbCBbIEltYWdl
T25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby90YWJsZS1lbGVtZW50LTAwMS5o
dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvY29udGFpbi1pbnRyaW5zaWMtc2l6
ZS9jb250YWluLWludHJpbnNpYy1zaXplLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3
ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1zaXppbmcvY29udGFpbi1pbnRyaW5zaWMtc2l6ZS9jb250YWluLWludHJpbnNpYy1zaXplLTAw
Mi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9y
ZXBsYWNlZC1lbGVtZW50LTAzMi5odG1sIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVu
dC0wMzIuaHRtbAppbmRleCBhZmE0ODNkZDMxNTg5MTAxMzYzOTJlNDA1ZTM2MzI5NDAzM2UwMmQ2
Li5iYTBkZGRkZjEwMTFmZDlkMzAyZTc1YTU0MWQxNWUyMjJiMjYwN2E4IDEwMDY0NAotLS0gYS9M
YXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n
L2FzcGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50LTAzMi5odG1sCisrKyBiL0xheW91dFRlc3Rz
L2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh
dGlvL3JlcGxhY2VkLWVsZW1lbnQtMDMyLmh0bWwKQEAgLTMwLDUgKzMwLDYgQEAgaW1nIHsKICAg
ICAgICAobm90ZTogaGVpZ2h0IGhlcmUgaXMgdGhlIGJsb2NrIHNpemUgb2YgYm9yZGVyLWJveC4p
CiAtLT4KIDxpbWcgc3JjPSJzdXBwb3J0LzF4MS1ncmVlbi5wbmciIHN0eWxlPSJoZWlnaHQ6IDEw
MHB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMS8xMDsgYm94LXNpemluZzogYm9yZGVyLWJveDsiCi0+
PGltZyBzcmM9InN1cHBvcnQvMXgxLWdyZWVuLnBuZyIgc3R5bGU9ImhlaWdodDogNjBweDsgYXNw
ZWN0LXJhdGlvOiAxLzM7IGJveC1zaXppbmc6IGNvbnRlbnQtYm94OyIKLT48aW1nIHNyYz0ic3Vw
cG9ydC8xeDEtZ3JlZW4ucG5nIiBzdHlsZT0iaGVpZ2h0OiAxMDBweDsgYXNwZWN0LXJhdGlvOiAx
LzU7IGJveC1zaXppbmc6IGJvcmRlci1ib3g7Ij4KKz48aW1nIHNyYz0ic3VwcG9ydC8xeDEtZ3Jl
ZW4ucG5nIiBzdHlsZT0iaGVpZ2h0OiA2MHB4OyBhc3BlY3QtcmF0aW86IDEvNTsgYm94LXNpemlu
ZzogY29udGVudC1ib3g7IgorPjxpbWcgc3JjPSJzdXBwb3J0LzF4MS1ncmVlbi5wbmciIHN0eWxl
PSJoZWlnaHQ6IDEwMHB4OyBhc3BlY3QtcmF0aW86IDEvMTA7IGJveC1zaXppbmc6IGJvcmRlci1i
b3g7IgorPjxpbWcgc3JjPSJzdXBwb3J0LzF4MS1ncmVlbi5wbmciIHN0eWxlPSJ3aWR0aDogMTBw
eDsgYXNwZWN0LXJhdGlvOiAxLzY7IGJveC1zaXppbmc6IGNvbnRlbnQtYm94OyI+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>421298</attachid>
            <date>2021-02-23 03:34:01 -0800</date>
            <delta_ts>2021-02-25 22:52:58 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-221671-20210223123400.patch</filename>
            <type>text/plain</type>
            <size>10990</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczMjQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTZjYTEzMjQ2OWM1Mjdl
NjBlYjJjMzZmNmEzNDc3MDg0N2Q2N2NmZi4uZGI2NjU1NjMxMGIyMzE1NDU5ZTE4YjA5MzhjOGJm
ODgwNzhmNTE2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTAyLTIyICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgVGFrZSBib3gtc2l6aW5nIGludG8g
YWNjb3VudCBpbiByZXBsYWNlZCBlbGVtZW50IGludHJpbnNpYyBzaXppbmcKKyAgICAgICAgaHR0
cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTY3MQorCisgICAgICAgIFJl
dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRha2UgYm94LXNpemluZyBpbnRv
IGFjY291bnQgaW4gcmVwbGFjZWQgZWxlbWVudCBpbnRyaW5zaWMgc2l6aW5nIHdoZW4KKyAgICAg
ICAgdXNpbmcgYXNwZWN0LXJhdGlvLCBidXQga2VlcCB1c2luZyBjb250ZW50LWJveCB3aGVuIHJl
c29sdmluZworICAgICAgICB3aWR0aC9oZWlnaHQgd2hlbiBubyBhc3BlY3QtcmF0aW8gaXMgc2V0
LgorCisgICAgICAgIFRlc3RzOiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50LTAzMS5odG1sCisgICAgICAg
ICAgICAgICBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz
cGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50LTAzMi5odG1sCisgICAgICAgICAgICAgICBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9y
ZXBsYWNlZC1lbGVtZW50LTAzMy5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyUmVw
bGFjZWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cmVzb2x2ZVdpZHRoRm9yUmF0aW8pOgorICAg
ICAgICAoV2ViQ29yZTo6UmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxXaWR0
aCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpyZXNvbHZlSGVpZ2h0Rm9yUmF0aW8pOgorICAg
ICAgICAoV2ViQ29yZTo6UmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxIZWln
aHQgY29uc3QpOgorCiAyMDIxLTAyLTIyICBTYW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4K
IAogICAgICAgICBBZGQgZXhwZXJpbWVudGFsIHN1cHBvcnQgZm9yIENTUyBDb2xvciA1IGNvbG9y
LW1peCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNw
cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IDUzZmQwZjBm
MzhjYTVhZmQxMDc5ZmRjMzQwNzQ4YjE0YzljMjkwMDAuLjY2YWUzNTY0MjYyNmJiOTJhMWMzNDRi
YWIxZjY4ZGEzMjMyNGIzM2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S
ZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3Bw
CkBAIC0yNDg5LDkgKzI0ODksOSBAQCB2b2lkIFJlbmRlckJveDo6dXBkYXRlTG9naWNhbFdpZHRo
KCkKIHN0YXRpYyBMYXlvdXRVbml0IGlubGluZVNpemVGcm9tQXNwZWN0UmF0aW8oTGF5b3V0VW5p
dCBib3JkZXJQYWRkaW5nSW5saW5lU3VtLCBMYXlvdXRVbml0IGJvcmRlclBhZGRpbmdCbG9ja1N1
bSwgTGF5b3V0VW5pdCBhc3BlY3RSYXRpbywgQm94U2l6aW5nIGJveFNpemluZywgTGF5b3V0VW5p
dCBibG9ja1NpemUpCiB7CiAgICAgaWYgKGJveFNpemluZyA9PSBCb3hTaXppbmc6OkJvcmRlckJv
eCkKLSAgICAgICAgcmV0dXJuIGJsb2NrU2l6ZSAqIExheW91dFVuaXQoYXNwZWN0UmF0aW8pOwor
ICAgICAgICByZXR1cm4gYmxvY2tTaXplICogYXNwZWN0UmF0aW87CiAKLSAgICByZXR1cm4gKChi
bG9ja1NpemUgLSBib3JkZXJQYWRkaW5nQmxvY2tTdW0pICogTGF5b3V0VW5pdChhc3BlY3RSYXRp
bykpICsgYm9yZGVyUGFkZGluZ0lubGluZVN1bTsKKyAgICByZXR1cm4gKChibG9ja1NpemUgLSBi
b3JkZXJQYWRkaW5nQmxvY2tTdW0pICogYXNwZWN0UmF0aW8pICsgYm9yZGVyUGFkZGluZ0lubGlu
ZVN1bTsKIH0KIAogdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lkdGhJbkZyYWdtZW50
KExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyYgY29tcHV0ZWRWYWx1ZXMsIFJlbmRlckZyYWdt
ZW50Q29udGFpbmVyKiBmcmFnbWVudCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv
UmVuZGVyUmVwbGFjZWQuY3BwCmluZGV4IDBjZjk2NzI1NWFhYmUzNTBkNDQzYTQ2OTM4Zjk1M2My
ZmE3NTA3ZGMuLmFlZjhmNmVkYTcyZGFkMTQ5ZDFlYzA4MDgyZjIwNjI2NzRkMzliN2UgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAKKysrIGIv
U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcApAQCAtNTMyLDYgKzUz
MiwxMyBAQCBMYXlvdXRVbml0IFJlbmRlclJlcGxhY2VkOjpjb21wdXRlQ29uc3RyYWluZWRMb2dp
Y2FsV2lkdGgoU2hvdWxkQ29tcHV0ZVByZWZlcnJlZAogICAgIHJldHVybiBjb21wdXRlUmVwbGFj
ZWRMb2dpY2FsV2lkdGhSZXNwZWN0aW5nTWluTWF4V2lkdGgobG9naWNhbFdpZHRoLCBzaG91bGRD
b21wdXRlUHJlZmVycmVkKTsKIH0KIAorc3RhdGljIGlubGluZSBMYXlvdXRVbml0IHJlc29sdmVX
aWR0aEZvclJhdGlvKExheW91dFVuaXQgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQsIExh
eW91dFVuaXQgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCBsb2dpY2Fs
SGVpZ2h0LCBkb3VibGUgYXNwZWN0UmF0aW8sIEJveFNpemluZyBib3hTaXppbmcpCit7CisgICAg
aWYgKGJveFNpemluZyA9PSBCb3hTaXppbmc6OkJvcmRlckJveCkKKyAgICAgICAgcmV0dXJuIHJv
dW5kVG9JbnQocm91bmQoKGxvZ2ljYWxIZWlnaHQgKyBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhl
aWdodCkgKiBhc3BlY3RSYXRpbykpIC0gYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxXaWR0aDsKKyAg
ICByZXR1cm4gcm91bmRUb0ludChyb3VuZChsb2dpY2FsSGVpZ2h0ICogYXNwZWN0UmF0aW8pKTsK
K30KKwogTGF5b3V0VW5pdCBSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbFdp
ZHRoKFNob3VsZENvbXB1dGVQcmVmZXJyZWQgc2hvdWxkQ29tcHV0ZVByZWZlcnJlZCkgY29uc3QK
IHsKICAgICBpZiAoc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc1NwZWNpZmllZCgpIHx8IHN0eWxl
KCkubG9naWNhbFdpZHRoKCkuaXNJbnRyaW5zaWMoKSkKQEAgLTU2Nyw3ICs1NzQsMTAgQEAgTGF5
b3V0VW5pdCBSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbFdpZHRoKFNob3Vs
ZENvbXB1dGVQcmVmZXJyZWQgc2gKICAgICAgICAgICAgIGlmIChpbnRyaW5zaWNSYXRpbyAmJiAo
KGNvbXB1dGVkSGVpZ2h0SXNBdXRvICYmICFoYXNJbnRyaW5zaWNXaWR0aCAmJiBoYXNJbnRyaW5z
aWNIZWlnaHQpIHx8ICFjb21wdXRlZEhlaWdodElzQXV0bykpIHsKICAgICAgICAgICAgICAgICBM
YXlvdXRVbml0IGVzdGltYXRlZFVzZWRXaWR0aCA9IGhhc0ludHJpbnNpY1dpZHRoID8gTGF5b3V0
VW5pdChjb25zdHJhaW5lZFNpemUud2lkdGgoKSkgOiBjb21wdXRlQ29uc3RyYWluZWRMb2dpY2Fs
V2lkdGgoc2hvdWxkQ29tcHV0ZVByZWZlcnJlZCk7CiAgICAgICAgICAgICAgICAgTGF5b3V0VW5p
dCBsb2dpY2FsSGVpZ2h0ID0gY29tcHV0ZVJlcGxhY2VkTG9naWNhbEhlaWdodChPcHRpb25hbDxM
YXlvdXRVbml0Pihlc3RpbWF0ZWRVc2VkV2lkdGgpKTsKLSAgICAgICAgICAgICAgICByZXR1cm4g
Y29tcHV0ZVJlcGxhY2VkTG9naWNhbFdpZHRoUmVzcGVjdGluZ01pbk1heFdpZHRoKHJvdW5kVG9J
bnQocm91bmQobG9naWNhbEhlaWdodCAqIGludHJpbnNpY1JhdGlvKSksIHNob3VsZENvbXB1dGVQ
cmVmZXJyZWQpOworICAgICAgICAgICAgICAgIEJveFNpemluZyBib3hTaXppbmcgPSBCb3hTaXpp
bmc6OkNvbnRlbnRCb3g7CisgICAgICAgICAgICAgICAgaWYgKHN0eWxlKCkuaGFzQXNwZWN0UmF0
aW8oKSkKKyAgICAgICAgICAgICAgICAgICAgYm94U2l6aW5nID0gc3R5bGUoKS5ib3hTaXppbmdG
b3JBc3BlY3RSYXRpbygpOworICAgICAgICAgICAgICAgIHJldHVybiBjb21wdXRlUmVwbGFjZWRM
b2dpY2FsV2lkdGhSZXNwZWN0aW5nTWluTWF4V2lkdGgocmVzb2x2ZVdpZHRoRm9yUmF0aW8oYm9y
ZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQoKSwgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxXaWR0
aCgpLCBsb2dpY2FsSGVpZ2h0LCBpbnRyaW5zaWNSYXRpbywgYm94U2l6aW5nKSwgc2hvdWxkQ29t
cHV0ZVByZWZlcnJlZCk7CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIApAQCAtNTk2LDYg
KzYwNiwxMyBAQCBMYXlvdXRVbml0IFJlbmRlclJlcGxhY2VkOjpjb21wdXRlUmVwbGFjZWRMb2dp
Y2FsV2lkdGgoU2hvdWxkQ29tcHV0ZVByZWZlcnJlZCBzaAogICAgIHJldHVybiBjb21wdXRlUmVw
bGFjZWRMb2dpY2FsV2lkdGhSZXNwZWN0aW5nTWluTWF4V2lkdGgoaW50cmluc2ljTG9naWNhbFdp
ZHRoKCksIHNob3VsZENvbXB1dGVQcmVmZXJyZWQpOwogfQogCitzdGF0aWMgaW5saW5lIExheW91
dFVuaXQgcmVzb2x2ZUhlaWdodEZvclJhdGlvKExheW91dFVuaXQgYm9yZGVyQW5kUGFkZGluZ0xv
Z2ljYWxXaWR0aCwgTGF5b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCwgTGF5
b3V0VW5pdCBsb2dpY2FsV2lkdGgsIGRvdWJsZSBhc3BlY3RSYXRpbywgQm94U2l6aW5nIGJveFNp
emluZykKK3sKKyAgICBpZiAoYm94U2l6aW5nID09IEJveFNpemluZzo6Qm9yZGVyQm94KQorICAg
ICAgICByZXR1cm4gcm91bmRUb0ludChyb3VuZCgobG9naWNhbFdpZHRoICsgYm9yZGVyQW5kUGFk
ZGluZ0xvZ2ljYWxXaWR0aCkgLyBhc3BlY3RSYXRpbykpIC0gYm9yZGVyQW5kUGFkZGluZ0xvZ2lj
YWxIZWlnaHQ7CisgICAgcmV0dXJuIHJvdW5kVG9JbnQocm91bmQobG9naWNhbFdpZHRoIC8gYXNw
ZWN0UmF0aW8pKTsKK30KKwogTGF5b3V0VW5pdCBSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVJlcGxh
Y2VkTG9naWNhbEhlaWdodChPcHRpb25hbDxMYXlvdXRVbml0PiBlc3RpbWF0ZWRVc2VkV2lkdGgp
IGNvbnN0CiB7CiAgICAgLy8gMTAuNSBDb250ZW50IGhlaWdodDogdGhlICdoZWlnaHQnIHByb3Bl
cnR5OiBodHRwOi8vd3d3LnczLm9yZy9UUi9DU1MyMS92aXN1ZGV0Lmh0bWwjcHJvcGRlZi1oZWln
aHQKQEAgLTYyNSw3ICs2NDIsMTAgQEAgTGF5b3V0VW5pdCBSZW5kZXJSZXBsYWNlZDo6Y29tcHV0
ZVJlcGxhY2VkTG9naWNhbEhlaWdodChPcHRpb25hbDxMYXlvdXRVbml0PiBlc3QKICAgICAvLyAo
dXNlZCB3aWR0aCkgLyAoaW50cmluc2ljIHJhdGlvKQogICAgIGlmIChpbnRyaW5zaWNSYXRpbykg
ewogICAgICAgICBMYXlvdXRVbml0IHVzZWRXaWR0aCA9IGVzdGltYXRlZFVzZWRXaWR0aCA/IGVz
dGltYXRlZFVzZWRXaWR0aC52YWx1ZSgpIDogYXZhaWxhYmxlTG9naWNhbFdpZHRoKCk7Ci0gICAg
ICAgIHJldHVybiBjb21wdXRlUmVwbGFjZWRMb2dpY2FsSGVpZ2h0UmVzcGVjdGluZ01pbk1heEhl
aWdodChyb3VuZFRvSW50KHJvdW5kKHVzZWRXaWR0aCAvIGludHJpbnNpY1JhdGlvKSkpOworICAg
ICAgICBCb3hTaXppbmcgYm94U2l6aW5nID0gQm94U2l6aW5nOjpDb250ZW50Qm94OworICAgICAg
ICBpZiAoc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKQorICAgICAgICAgICAgYm94U2l6aW5nID0g
c3R5bGUoKS5ib3hTaXppbmdGb3JBc3BlY3RSYXRpbygpOworICAgICAgICByZXR1cm4gY29tcHV0
ZVJlcGxhY2VkTG9naWNhbEhlaWdodFJlc3BlY3RpbmdNaW5NYXhIZWlnaHQocmVzb2x2ZUhlaWdo
dEZvclJhdGlvKGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsV2lkdGgoKSwgYm9yZGVyQW5kUGFkZGlu
Z0xvZ2ljYWxIZWlnaHQoKSwgdXNlZFdpZHRoLCBpbnRyaW5zaWNSYXRpbywgYm94U2l6aW5nKSk7
CiAgICAgfQogCiAgICAgLy8gT3RoZXJ3aXNlLCBpZiAnaGVpZ2h0JyBoYXMgYSBjb21wdXRlZCB2
YWx1ZSBvZiAnYXV0bycsIGFuZCB0aGUgZWxlbWVudCBoYXMgYW4gaW50cmluc2ljIGhlaWdodCwg
dGhlbiB0aGF0IGludHJpbnNpYyBoZWlnaHQgaXMgdGhlIHVzZWQgdmFsdWUgb2YgJ2hlaWdodCcu
CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM
b2cKaW5kZXggZDFiYmM0YmEyZmM3ZGU2NzM1MTA5NTJiY2E1ZTllNTcxMzUwNDRmNi4uODE2YzEx
NjJiZmY5NjRiYmQzOTQzNjIwMzYyOWRmYjliYmNmODU5NyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz
dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBA
CisyMDIxLTAyLTIyICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgVGFr
ZSBib3gtc2l6aW5nIGludG8gYWNjb3VudCBpbiByZXBsYWNlZCBlbGVtZW50IGludHJpbnNpYyBz
aXppbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy
MTY3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVu
YWJsZSBzb21lIHRlc3RzIHRoYXQgcGFzcyBub3cuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRp
b25zOgorCiAyMDIxLTAyLTIyICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CiAKICAgICAg
ICAgUmVzeW5jIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8g
ZnJvbSB1cHN0cmVhbQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5n
ZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggMzQ1Y2QwMmNi
OGFiNjQyNDNkNzNjOWU4NGNjYzgxMDY1OTBkZDhmNi4uY2QyMTUzNzg4YzQ2N2NmNzRiYmI2YmVj
MDEwMzhjNTlmYzc4Mzg3NCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0No
YW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMg
KzEsMTQgQEAKKzIwMjEtMDItMjIgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAg
ICAgICBUYWtlIGJveC1zaXppbmcgaW50byBhY2NvdW50IGluIHJlcGxhY2VkIGVsZW1lbnQgaW50
cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MjIxNjcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgU3luYyB0ZXN0LgorCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
c2l6aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50LTAzMi5odG1sOgorCiAyMDIxLTAy
LTIyICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmVzeW5jIHdlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8gZnJvbSB1cHN0cmVhbQpk
aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rl
c3RFeHBlY3RhdGlvbnMKaW5kZXggOWFiMTZiMjg0Mjc3NTY3MzliNzk5NWVkYzZhZWNkODU1MjJj
MWZkYi4uOGVlOTVjNGVmMTM4NzMyNDY5NTg5YTkwZjA4Yzc3MzBhZmJhMmI0NiAxMDA2NDQKLS0t
IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhw
ZWN0YXRpb25zCkBAIC00NTcwLDkgKzQ1NzAsNiBAQCB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvLwog
d2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMTMuaHRtbCBbIEltYWdlT25s
eUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMTQuaHRt
bCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMt
c2l6ZS0wMTUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp
by9yZXBsYWNlZC1lbGVtZW50LTAzMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQu
b3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp
bmcvYXNwZWN0LXJhdGlvL3JlcGxhY2VkLWVsZW1lbnQtMDMyLmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVudC0wMzMuaHRtbCBb
IEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby90YWJsZS1lbGVtZW50
LTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvY29udGFpbi1pbnRyaW5z
aWMtc2l6ZS9jb250YWluLWludHJpbnNpYy1zaXplLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1zaXppbmcvY29udGFpbi1pbnRyaW5zaWMtc2l6ZS9jb250YWluLWludHJpbnNpYy1z
aXplLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0
cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y
YXRpby9yZXBsYWNlZC1lbGVtZW50LTAzMi5odG1sIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQt
ZWxlbWVudC0wMzIuaHRtbAppbmRleCBhZmE0ODNkZDMxNTg5MTAxMzYzOTJlNDA1ZTM2MzI5NDAz
M2UwMmQ2Li4wMjJhMmQ3OTdiMWJiNmFkOWNkZTZjMzgzYWQwNTRmMWJkODM1NDAwIDEwMDY0NAot
LS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
c2l6aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50LTAzMi5odG1sCisrKyBiL0xheW91
dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw
ZWN0LXJhdGlvL3JlcGxhY2VkLWVsZW1lbnQtMDMyLmh0bWwKQEAgLTIzLDEyICsyMywxNiBAQCBp
bWcgewogICAgICAgIGJvcmRlci10b3AgaXMgMjB4NDAgYW5kIHRoZSBjb250ZW50IGJveCBpcyAy
MHg2MC4KICAgICAgICAobm90ZTogaGVpZ2h0IGhlcmUgaXMgdGhlIGJsb2NrIHNpemUgb2YgY29u
dGVudC1ib3guKQogCi0gIDNyZDogQSBncmVlbiByZWN0IDIweDEwMC4KLSAgICAgICBib3JkZXIt
dG9wIGlzIDIweDQwIGFuZCB0aGUgY29udGVudCBib3ggaXMgMjB4NjAgYmVjYXVzZSB3ZSBjb21w
dXRlCisgIDNyZDogQSBncmVlbiByZWN0IDEweDEwMC4KKyAgICAgICBib3JkZXItdG9wIGlzIDEw
eDQwIGFuZCB0aGUgY29udGVudCBib3ggaXMgMTB4NjAgYmVjYXVzZSB3ZSBjb21wdXRlCiAgICAg
ICAgdGhlIGlubGluZSBzaXplIGJ5IGFzcGVjdC1yYXRpbyB3aGljaCB3b3JrcyB3aXRoIGJvcmRl
ci1ib3ggYW5kIHNvIHRoZQotICAgICAgIGlubGluZSBzaXplIGlzIDEwMHB4IC8gNSA9IDIwcHgu
CisgICAgICAgaW5saW5lIHNpemUgaXMgMTAwcHggLyAxMCA9IDEwcHguCiAgICAgICAgKG5vdGU6
IGhlaWdodCBoZXJlIGlzIHRoZSBibG9jayBzaXplIG9mIGJvcmRlci1ib3guKQorCisgIDR0aDog
QSBncmVlbiByZWN0IDEweDEwMC4KKyAgICAgICBib3JkZXItdG9wIGlzIDEweDQwIGFuZCB0aGUg
Y29udGVudCBib3ggaXMgMTB4NjAgdG8gYWRkIHVwIHRvIDEweDEwMC4KIC0tPgogPGltZyBzcmM9
InN1cHBvcnQvMXgxLWdyZWVuLnBuZyIgc3R5bGU9ImhlaWdodDogMTAwcHg7IGFzcGVjdC1yYXRp
bzogYXV0byAxLzEwOyBib3gtc2l6aW5nOiBib3JkZXItYm94OyIKID48aW1nIHNyYz0ic3VwcG9y
dC8xeDEtZ3JlZW4ucG5nIiBzdHlsZT0iaGVpZ2h0OiA2MHB4OyBhc3BlY3QtcmF0aW86IDEvMzsg
Ym94LXNpemluZzogY29udGVudC1ib3g7IgotPjxpbWcgc3JjPSJzdXBwb3J0LzF4MS1ncmVlbi5w
bmciIHN0eWxlPSJoZWlnaHQ6IDEwMHB4OyBhc3BlY3QtcmF0aW86IDEvNTsgYm94LXNpemluZzog
Ym9yZGVyLWJveDsiPgorPjxpbWcgc3JjPSJzdXBwb3J0LzF4MS1ncmVlbi5wbmciIHN0eWxlPSJo
ZWlnaHQ6IDEwMHB4OyBhc3BlY3QtcmF0aW86IDEvMTA7IGJveC1zaXppbmc6IGJvcmRlci1ib3g7
IgorPjxpbWcgc3JjPSJzdXBwb3J0LzF4MS1ncmVlbi5wbmciIHN0eWxlPSJ3aWR0aDogMTBweDsg
YXNwZWN0LXJhdGlvOiAxLzY7IGJveC1zaXppbmc6IGNvbnRlbnQtYm94OyI+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>421613</attachid>
            <date>2021-02-25 22:53:05 -0800</date>
            <delta_ts>2021-03-01 22:41:21 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-221671-20210226075303.patch</filename>
            <type>text/plain</type>
            <size>10949</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNTQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTc0MzQ3NjJlYzA5ZjU1
ZDY2OTUwMjM3ZjU3ZGFmZjljMmQ0NjkzMi4uZjViMzIxYTNhNzdiMmJkMjcyNTc4ODc1M2FlYzBl
NDE5MGE5MGIyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTAyLTI1ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgVGFrZSBib3gtc2l6aW5nIGludG8g
YWNjb3VudCBpbiByZXBsYWNlZCBlbGVtZW50IGludHJpbnNpYyBzaXppbmcKKyAgICAgICAgaHR0
cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTY3MQorCisgICAgICAgIFJl
dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRha2UgYm94LXNpemluZyBpbnRv
IGFjY291bnQgaW4gcmVwbGFjZWQgZWxlbWVudCBpbnRyaW5zaWMgc2l6aW5nIHdoZW4KKyAgICAg
ICAgdXNpbmcgYXNwZWN0LXJhdGlvLCBidXQga2VlcCB1c2luZyBjb250ZW50LWJveCB3aGVuIHJl
c29sdmluZworICAgICAgICB3aWR0aC9oZWlnaHQgd2hlbiBubyBhc3BlY3QtcmF0aW8gaXMgc2V0
LgorCisgICAgICAgIFRlc3RzOiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50LTAzMS5odG1sCisgICAgICAg
ICAgICAgICBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz
cGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50LTAzMi5odG1sCisgICAgICAgICAgICAgICBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9y
ZXBsYWNlZC1lbGVtZW50LTAzMy5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyUmVw
bGFjZWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cmVzb2x2ZVdpZHRoRm9yUmF0aW8pOgorICAg
ICAgICAoV2ViQ29yZTo6UmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxXaWR0
aCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpyZXNvbHZlSGVpZ2h0Rm9yUmF0aW8pOgorICAg
ICAgICAoV2ViQ29yZTo6UmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxIZWln
aHQgY29uc3QpOgorCiAyMDIxLTAyLTI1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+
CiAKICAgICAgICAgRml4IHRocmVhZGluZyBpc3N1ZSBpbiBTY3JpcHRQcm9jZXNzb3JOb2RlOjpw
cm9jZXNzKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu
Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggNGI3Y2Ey
MTYzYWI3N2M1ODJjZjAyNDQ5MjUwMTZmZjU0NjEzNjE0My4uYmY2ZDY0ZDFjNTdmNDIzMWRkNTcx
M2Q0MDM0NDNlMDc2YWQzYmQ2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n
L1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5j
cHAKQEAgLTI1MTMsOSArMjUxMyw5IEBAIHZvaWQgUmVuZGVyQm94Ojp1cGRhdGVMb2dpY2FsV2lk
dGgoKQogc3RhdGljIExheW91dFVuaXQgaW5saW5lU2l6ZUZyb21Bc3BlY3RSYXRpbyhMYXlvdXRV
bml0IGJvcmRlclBhZGRpbmdJbmxpbmVTdW0sIExheW91dFVuaXQgYm9yZGVyUGFkZGluZ0Jsb2Nr
U3VtLCBMYXlvdXRVbml0IGFzcGVjdFJhdGlvLCBCb3hTaXppbmcgYm94U2l6aW5nLCBMYXlvdXRV
bml0IGJsb2NrU2l6ZSkKIHsKICAgICBpZiAoYm94U2l6aW5nID09IEJveFNpemluZzo6Qm9yZGVy
Qm94KQotICAgICAgICByZXR1cm4gYmxvY2tTaXplICogTGF5b3V0VW5pdChhc3BlY3RSYXRpbyk7
CisgICAgICAgIHJldHVybiBibG9ja1NpemUgKiBhc3BlY3RSYXRpbzsKIAotICAgIHJldHVybiAo
KGJsb2NrU2l6ZSAtIGJvcmRlclBhZGRpbmdCbG9ja1N1bSkgKiBMYXlvdXRVbml0KGFzcGVjdFJh
dGlvKSkgKyBib3JkZXJQYWRkaW5nSW5saW5lU3VtOworICAgIHJldHVybiAoKGJsb2NrU2l6ZSAt
IGJvcmRlclBhZGRpbmdCbG9ja1N1bSkgKiBhc3BlY3RSYXRpbykgKyBib3JkZXJQYWRkaW5nSW5s
aW5lU3VtOwogfQogCiB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21l
bnQoTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzJiBjb21wdXRlZFZhbHVlcywgUmVuZGVyRnJh
Z21lbnRDb250YWluZXIqIGZyYWdtZW50KSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu
Zy9SZW5kZXJSZXBsYWNlZC5jcHAKaW5kZXggMGNmOTY3MjU1YWFiZTM1MGQ0NDNhNDY5MzhmOTUz
YzJmYTc1MDdkYy4uODM0ZTQ1NjY0N2Y0M2I0Nzc0Zjc1NmFlNjA0NzFlNTk0NzIwNDM2NiAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcAorKysg
Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCkBAIC01MzIsNiAr
NTMyLDEzIEBAIExheW91dFVuaXQgUmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVDb25zdHJhaW5lZExv
Z2ljYWxXaWR0aChTaG91bGRDb21wdXRlUHJlZmVycmVkCiAgICAgcmV0dXJuIGNvbXB1dGVSZXBs
YWNlZExvZ2ljYWxXaWR0aFJlc3BlY3RpbmdNaW5NYXhXaWR0aChsb2dpY2FsV2lkdGgsIHNob3Vs
ZENvbXB1dGVQcmVmZXJyZWQpOwogfQogCitzdGF0aWMgaW5saW5lIExheW91dFVuaXQgcmVzb2x2
ZVdpZHRoRm9yUmF0aW8oTGF5b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCwg
TGF5b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoLCBMYXlvdXRVbml0IGxvZ2lj
YWxIZWlnaHQsIGRvdWJsZSBhc3BlY3RSYXRpbywgQm94U2l6aW5nIGJveFNpemluZykKK3sKKyAg
ICBpZiAoYm94U2l6aW5nID09IEJveFNpemluZzo6Qm9yZGVyQm94KQorICAgICAgICByZXR1cm4g
TGF5b3V0VW5pdChyb3VuZCgobG9naWNhbEhlaWdodCArIGJvcmRlckFuZFBhZGRpbmdMb2dpY2Fs
SGVpZ2h0KSAqIGFzcGVjdFJhdGlvKSkgLSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoOwor
ICAgIHJldHVybiBMYXlvdXRVbml0KHJvdW5kKGxvZ2ljYWxIZWlnaHQgKiBhc3BlY3RSYXRpbykp
OworfQorCiBMYXlvdXRVbml0IFJlbmRlclJlcGxhY2VkOjpjb21wdXRlUmVwbGFjZWRMb2dpY2Fs
V2lkdGgoU2hvdWxkQ29tcHV0ZVByZWZlcnJlZCBzaG91bGRDb21wdXRlUHJlZmVycmVkKSBjb25z
dAogewogICAgIGlmIChzdHlsZSgpLmxvZ2ljYWxXaWR0aCgpLmlzU3BlY2lmaWVkKCkgfHwgc3R5
bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0ludHJpbnNpYygpKQpAQCAtNTY3LDcgKzU3NCwxMCBAQCBM
YXlvdXRVbml0IFJlbmRlclJlcGxhY2VkOjpjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGgoU2hv
dWxkQ29tcHV0ZVByZWZlcnJlZCBzaAogICAgICAgICAgICAgaWYgKGludHJpbnNpY1JhdGlvICYm
ICgoY29tcHV0ZWRIZWlnaHRJc0F1dG8gJiYgIWhhc0ludHJpbnNpY1dpZHRoICYmIGhhc0ludHJp
bnNpY0hlaWdodCkgfHwgIWNvbXB1dGVkSGVpZ2h0SXNBdXRvKSkgewogICAgICAgICAgICAgICAg
IExheW91dFVuaXQgZXN0aW1hdGVkVXNlZFdpZHRoID0gaGFzSW50cmluc2ljV2lkdGggPyBMYXlv
dXRVbml0KGNvbnN0cmFpbmVkU2l6ZS53aWR0aCgpKSA6IGNvbXB1dGVDb25zdHJhaW5lZExvZ2lj
YWxXaWR0aChzaG91bGRDb21wdXRlUHJlZmVycmVkKTsKICAgICAgICAgICAgICAgICBMYXlvdXRV
bml0IGxvZ2ljYWxIZWlnaHQgPSBjb21wdXRlUmVwbGFjZWRMb2dpY2FsSGVpZ2h0KE9wdGlvbmFs
PExheW91dFVuaXQ+KGVzdGltYXRlZFVzZWRXaWR0aCkpOwotICAgICAgICAgICAgICAgIHJldHVy
biBjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGhSZXNwZWN0aW5nTWluTWF4V2lkdGgocm91bmRU
b0ludChyb3VuZChsb2dpY2FsSGVpZ2h0ICogaW50cmluc2ljUmF0aW8pKSwgc2hvdWxkQ29tcHV0
ZVByZWZlcnJlZCk7CisgICAgICAgICAgICAgICAgQm94U2l6aW5nIGJveFNpemluZyA9IEJveFNp
emluZzo6Q29udGVudEJveDsKKyAgICAgICAgICAgICAgICBpZiAoc3R5bGUoKS5oYXNBc3BlY3RS
YXRpbygpKQorICAgICAgICAgICAgICAgICAgICBib3hTaXppbmcgPSBzdHlsZSgpLmJveFNpemlu
Z0ZvckFzcGVjdFJhdGlvKCk7CisgICAgICAgICAgICAgICAgcmV0dXJuIGNvbXB1dGVSZXBsYWNl
ZExvZ2ljYWxXaWR0aFJlc3BlY3RpbmdNaW5NYXhXaWR0aChyZXNvbHZlV2lkdGhGb3JSYXRpbyhi
b3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCgpLCBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdp
ZHRoKCksIGxvZ2ljYWxIZWlnaHQsIGludHJpbnNpY1JhdGlvLCBib3hTaXppbmcpLCBzaG91bGRD
b21wdXRlUHJlZmVycmVkKTsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgCkBAIC01OTYs
NiArNjA2LDEzIEBAIExheW91dFVuaXQgUmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVSZXBsYWNlZExv
Z2ljYWxXaWR0aChTaG91bGRDb21wdXRlUHJlZmVycmVkIHNoCiAgICAgcmV0dXJuIGNvbXB1dGVS
ZXBsYWNlZExvZ2ljYWxXaWR0aFJlc3BlY3RpbmdNaW5NYXhXaWR0aChpbnRyaW5zaWNMb2dpY2Fs
V2lkdGgoKSwgc2hvdWxkQ29tcHV0ZVByZWZlcnJlZCk7CiB9CiAKK3N0YXRpYyBpbmxpbmUgTGF5
b3V0VW5pdCByZXNvbHZlSGVpZ2h0Rm9yUmF0aW8oTGF5b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5n
TG9naWNhbFdpZHRoLCBMYXlvdXRVbml0IGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsSGVpZ2h0LCBM
YXlvdXRVbml0IGxvZ2ljYWxXaWR0aCwgZG91YmxlIGFzcGVjdFJhdGlvLCBCb3hTaXppbmcgYm94
U2l6aW5nKQoreworICAgIGlmIChib3hTaXppbmcgPT0gQm94U2l6aW5nOjpCb3JkZXJCb3gpCisg
ICAgICAgIHJldHVybiBMYXlvdXRVbml0KHJvdW5kKChsb2dpY2FsV2lkdGggKyBib3JkZXJBbmRQ
YWRkaW5nTG9naWNhbFdpZHRoKSAvIGFzcGVjdFJhdGlvKSkgLSBib3JkZXJBbmRQYWRkaW5nTG9n
aWNhbEhlaWdodDsKKyAgICByZXR1cm4gTGF5b3V0VW5pdChyb3VuZChsb2dpY2FsV2lkdGggLyBh
c3BlY3RSYXRpbykpOworfQorCiBMYXlvdXRVbml0IFJlbmRlclJlcGxhY2VkOjpjb21wdXRlUmVw
bGFjZWRMb2dpY2FsSGVpZ2h0KE9wdGlvbmFsPExheW91dFVuaXQ+IGVzdGltYXRlZFVzZWRXaWR0
aCkgY29uc3QKIHsKICAgICAvLyAxMC41IENvbnRlbnQgaGVpZ2h0OiB0aGUgJ2hlaWdodCcgcHJv
cGVydHk6IGh0dHA6Ly93d3cudzMub3JnL1RSL0NTUzIxL3Zpc3VkZXQuaHRtbCNwcm9wZGVmLWhl
aWdodApAQCAtNjI1LDcgKzY0MiwxMCBAQCBMYXlvdXRVbml0IFJlbmRlclJlcGxhY2VkOjpjb21w
dXRlUmVwbGFjZWRMb2dpY2FsSGVpZ2h0KE9wdGlvbmFsPExheW91dFVuaXQ+IGVzdAogICAgIC8v
ICh1c2VkIHdpZHRoKSAvIChpbnRyaW5zaWMgcmF0aW8pCiAgICAgaWYgKGludHJpbnNpY1JhdGlv
KSB7CiAgICAgICAgIExheW91dFVuaXQgdXNlZFdpZHRoID0gZXN0aW1hdGVkVXNlZFdpZHRoID8g
ZXN0aW1hdGVkVXNlZFdpZHRoLnZhbHVlKCkgOiBhdmFpbGFibGVMb2dpY2FsV2lkdGgoKTsKLSAg
ICAgICAgcmV0dXJuIGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxIZWlnaHRSZXNwZWN0aW5nTWluTWF4
SGVpZ2h0KHJvdW5kVG9JbnQocm91bmQodXNlZFdpZHRoIC8gaW50cmluc2ljUmF0aW8pKSk7Cisg
ICAgICAgIEJveFNpemluZyBib3hTaXppbmcgPSBCb3hTaXppbmc6OkNvbnRlbnRCb3g7CisgICAg
ICAgIGlmIChzdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpCisgICAgICAgICAgICBib3hTaXppbmcg
PSBzdHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJhdGlvKCk7CisgICAgICAgIHJldHVybiBjb21w
dXRlUmVwbGFjZWRMb2dpY2FsSGVpZ2h0UmVzcGVjdGluZ01pbk1heEhlaWdodChyZXNvbHZlSGVp
Z2h0Rm9yUmF0aW8oYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxXaWR0aCgpLCBib3JkZXJBbmRQYWRk
aW5nTG9naWNhbEhlaWdodCgpLCB1c2VkV2lkdGgsIGludHJpbnNpY1JhdGlvLCBib3hTaXppbmcp
KTsKICAgICB9CiAKICAgICAvLyBPdGhlcndpc2UsIGlmICdoZWlnaHQnIGhhcyBhIGNvbXB1dGVk
IHZhbHVlIG9mICdhdXRvJywgYW5kIHRoZSBlbGVtZW50IGhhcyBhbiBpbnRyaW5zaWMgaGVpZ2h0
LCB0aGVuIHRoYXQgaW50cmluc2ljIGhlaWdodCBpcyB0aGUgdXNlZCB2YWx1ZSBvZiAnaGVpZ2h0
Jy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5n
ZUxvZwppbmRleCAxYmQzOTRlYTE3ODQ1ZjAwYzE3ZDg0YTg2ZTZiZTE2NjA4MDJhNGExLi4zZmJm
OGZjOTIxYWEyYjlmYzYwOGJiZmFkZjI1NmUyNzkxYjA2MTgwIDEwMDY0NAotLS0gYS9MYXlvdXRU
ZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg
QEAKKzIwMjEtMDItMjUgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBU
YWtlIGJveC1zaXppbmcgaW50byBhY2NvdW50IGluIHJlcGxhY2VkIGVsZW1lbnQgaW50cmluc2lj
IHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
MjIxNjcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg
RW5hYmxlIHNvbWUgdGVzdHMgdGhhdCBwYXNzIG5vdy4KKworICAgICAgICAqIFRlc3RFeHBlY3Rh
dGlvbnM6CisKIDIwMjEtMDItMjUgIExhdXJvIE1vdXJhICA8bG1vdXJhQGlnYWxpYS5jb20+CiAK
ICAgICAgICAgW0dMSUJdIEdhcmRlbmluZyBhIGNvdXBsZSBjcmFzaGVzCmRpZmYgLS1naXQgYS9M
YXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv
dzNjL0NoYW5nZUxvZwppbmRleCBmMDk3ODcxY2ZmNjNhNDI3YTYxMjBlMDQxODg1ZmY3MjRlZWQy
ODFjLi5kZjUzMjQ1M2MwNzBmNTMxZGJjMzI0ZGRjY2ZhY2VhMWZmNmQwNjIzIDEwMDY0NAotLS0g
YS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL2lt
cG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wMi0yNSAgUm9iIEJ1
aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIFRha2UgYm94LXNpemluZyBpbnRvIGFj
Y291bnQgaW4gcmVwbGFjZWQgZWxlbWVudCBpbnRyaW5zaWMgc2l6aW5nCisgICAgICAgIGh0dHBz
Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjE2NzEKKworICAgICAgICBSZXZp
ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTeW5jIHRlc3QuCisKKyAgICAgICAg
KiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3JlcGxhY2Vk
LWVsZW1lbnQtMDMyLmh0bWw6CisKIDIwMjEtMDItMjUgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRz
QHdlYmtpdC5vcmc+CiAKICAgICAgICAgYm9yZGVyLWltYWdlLW91dHNldCBkb2Vzbid0IGhhbmRs
ZSBmbG9hdCB2YWx1ZXMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMg
Yi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGQ5NWQ0MGY2MTNjZjc3ODFlNDFj
ZWYwM2RmNzllN2I2MzY0Njk0ZjMuLmM5YzhkMGY4MTViMGY5YTZlMDk1MzRiMWNjMjBkNmU5NzBj
NzM1M2MgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5
b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDU3MSw5ICs0NTcxLDYgQEAgd2Via2l0Lm9y
Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n
L2FzcGVjdC1yYXRpby8KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDEz
Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmlu
c2ljLXNpemUtMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0
NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt
cmF0aW8vaW50cmluc2ljLXNpemUtMDE1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtp
dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp
emluZy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVudC0wMzEuaHRtbCBbIEltYWdlT25seUZh
aWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50LTAzMi5odG1s
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3JlcGxhY2VkLWVs
ZW1lbnQtMDMzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMg
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0
aW8vdGFibGUtZWxlbWVudC0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9y
Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n
L2NvbnRhaW4taW50cmluc2ljLXNpemUvY29udGFpbi1pbnRyaW5zaWMtc2l6ZS0wMDEuaHRtbCBb
IEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2NvbnRhaW4taW50cmluc2ljLXNpemUvY29u
dGFpbi1pbnRyaW5zaWMtc2l6ZS0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpkaWZmIC0t
Z2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXNpemluZy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVudC0wMzIuaHRtbCBiL0xheW91dFRl
c3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0
LXJhdGlvL3JlcGxhY2VkLWVsZW1lbnQtMDMyLmh0bWwKaW5kZXggYWZhNDgzZGQzMTU4OTEwMTM2
MzkyZTQwNWUzNjMyOTQwMzNlMDJkNi4uMDIyYTJkNzk3YjFiYjZhZDljZGU2YzM4M2FkMDU0ZjFi
ZDgzNTQwMCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVudC0wMzIu
aHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50LTAzMi5odG1sCkBAIC0y
MywxMiArMjMsMTYgQEAgaW1nIHsKICAgICAgICBib3JkZXItdG9wIGlzIDIweDQwIGFuZCB0aGUg
Y29udGVudCBib3ggaXMgMjB4NjAuCiAgICAgICAgKG5vdGU6IGhlaWdodCBoZXJlIGlzIHRoZSBi
bG9jayBzaXplIG9mIGNvbnRlbnQtYm94LikKIAotICAzcmQ6IEEgZ3JlZW4gcmVjdCAyMHgxMDAu
Ci0gICAgICAgYm9yZGVyLXRvcCBpcyAyMHg0MCBhbmQgdGhlIGNvbnRlbnQgYm94IGlzIDIweDYw
IGJlY2F1c2Ugd2UgY29tcHV0ZQorICAzcmQ6IEEgZ3JlZW4gcmVjdCAxMHgxMDAuCisgICAgICAg
Ym9yZGVyLXRvcCBpcyAxMHg0MCBhbmQgdGhlIGNvbnRlbnQgYm94IGlzIDEweDYwIGJlY2F1c2Ug
d2UgY29tcHV0ZQogICAgICAgIHRoZSBpbmxpbmUgc2l6ZSBieSBhc3BlY3QtcmF0aW8gd2hpY2gg
d29ya3Mgd2l0aCBib3JkZXItYm94IGFuZCBzbyB0aGUKLSAgICAgICBpbmxpbmUgc2l6ZSBpcyAx
MDBweCAvIDUgPSAyMHB4LgorICAgICAgIGlubGluZSBzaXplIGlzIDEwMHB4IC8gMTAgPSAxMHB4
LgogICAgICAgIChub3RlOiBoZWlnaHQgaGVyZSBpcyB0aGUgYmxvY2sgc2l6ZSBvZiBib3JkZXIt
Ym94LikKKworICA0dGg6IEEgZ3JlZW4gcmVjdCAxMHgxMDAuCisgICAgICAgYm9yZGVyLXRvcCBp
cyAxMHg0MCBhbmQgdGhlIGNvbnRlbnQgYm94IGlzIDEweDYwIHRvIGFkZCB1cCB0byAxMHgxMDAu
CiAtLT4KIDxpbWcgc3JjPSJzdXBwb3J0LzF4MS1ncmVlbi5wbmciIHN0eWxlPSJoZWlnaHQ6IDEw
MHB4OyBhc3BlY3QtcmF0aW86IGF1dG8gMS8xMDsgYm94LXNpemluZzogYm9yZGVyLWJveDsiCiA+
PGltZyBzcmM9InN1cHBvcnQvMXgxLWdyZWVuLnBuZyIgc3R5bGU9ImhlaWdodDogNjBweDsgYXNw
ZWN0LXJhdGlvOiAxLzM7IGJveC1zaXppbmc6IGNvbnRlbnQtYm94OyIKLT48aW1nIHNyYz0ic3Vw
cG9ydC8xeDEtZ3JlZW4ucG5nIiBzdHlsZT0iaGVpZ2h0OiAxMDBweDsgYXNwZWN0LXJhdGlvOiAx
LzU7IGJveC1zaXppbmc6IGJvcmRlci1ib3g7Ij4KKz48aW1nIHNyYz0ic3VwcG9ydC8xeDEtZ3Jl
ZW4ucG5nIiBzdHlsZT0iaGVpZ2h0OiAxMDBweDsgYXNwZWN0LXJhdGlvOiAxLzEwOyBib3gtc2l6
aW5nOiBib3JkZXItYm94OyIKKz48aW1nIHNyYz0ic3VwcG9ydC8xeDEtZ3JlZW4ucG5nIiBzdHls
ZT0id2lkdGg6IDEwcHg7IGFzcGVjdC1yYXRpbzogMS82OyBib3gtc2l6aW5nOiBjb250ZW50LWJv
eDsiPgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>421906</attachid>
            <date>2021-03-01 22:41:28 -0800</date>
            <delta_ts>2021-03-02 07:27:26 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-221671-20210302074126.patch</filename>
            <type>text/plain</type>
            <size>11046</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNzIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzBmMTllZTkyZWQ1MWZm
ZDc1NzE0N2ZkNzgyOWZhMjkxYzVlNzJiMy4uNjFkYTMxMzI4NjA1MjM0MzJlOTQ5YjI1NTExZDU0
MDA0OGFmOGMxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTAzLTAxICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgVGFrZSBib3gtc2l6aW5nIGludG8g
YWNjb3VudCBpbiByZXBsYWNlZCBlbGVtZW50IGludHJpbnNpYyBzaXppbmcKKyAgICAgICAgaHR0
cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTY3MQorCisgICAgICAgIFJl
dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRha2UgYm94LXNpemluZyBpbnRv
IGFjY291bnQgaW4gcmVwbGFjZWQgZWxlbWVudCBpbnRyaW5zaWMgc2l6aW5nIHdoZW4KKyAgICAg
ICAgdXNpbmcgYXNwZWN0LXJhdGlvLCBidXQga2VlcCB1c2luZyBjb250ZW50LWJveCB3aGVuIHJl
c29sdmluZworICAgICAgICB3aWR0aC9oZWlnaHQgd2hlbiBubyBhc3BlY3QtcmF0aW8gaXMgc2V0
LgorCisgICAgICAgIFRlc3RzOiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50LTAzMS5odG1sCisgICAgICAg
ICAgICAgICBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz
cGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50LTAzMi5odG1sCisgICAgICAgICAgICAgICBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9y
ZXBsYWNlZC1lbGVtZW50LTAzMy5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyUmVw
bGFjZWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cmVzb2x2ZVdpZHRoRm9yUmF0aW8pOgorICAg
ICAgICAoV2ViQ29yZTo6UmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxXaWR0
aCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpyZXNvbHZlSGVpZ2h0Rm9yUmF0aW8pOgorICAg
ICAgICAoV2ViQ29yZTo6UmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxIZWln
aHQgY29uc3QpOgorCiAyMDIxLTAzLTAxICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+
CiAKICAgICAgICAgW0xGQ11bSUZDXSBNb3ZlIHNpbXBsaWZpZWQgYmFzZWxpbmUgYWxpZ25tZW50
IHRvIGEgZGVkaWNhdGVkIGZ1bmN0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu
Y3BwCmluZGV4IDUzZmQwZjBmMzhjYTVhZmQxMDc5ZmRjMzQwNzQ4YjE0YzljMjkwMDAuLjY2YWUz
NTY0MjYyNmJiOTJhMWMzNDRiYWIxZjY4ZGEzMjMyNGIzM2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl
cmluZy9SZW5kZXJCb3guY3BwCkBAIC0yNDg5LDkgKzI0ODksOSBAQCB2b2lkIFJlbmRlckJveDo6
dXBkYXRlTG9naWNhbFdpZHRoKCkKIHN0YXRpYyBMYXlvdXRVbml0IGlubGluZVNpemVGcm9tQXNw
ZWN0UmF0aW8oTGF5b3V0VW5pdCBib3JkZXJQYWRkaW5nSW5saW5lU3VtLCBMYXlvdXRVbml0IGJv
cmRlclBhZGRpbmdCbG9ja1N1bSwgTGF5b3V0VW5pdCBhc3BlY3RSYXRpbywgQm94U2l6aW5nIGJv
eFNpemluZywgTGF5b3V0VW5pdCBibG9ja1NpemUpCiB7CiAgICAgaWYgKGJveFNpemluZyA9PSBC
b3hTaXppbmc6OkJvcmRlckJveCkKLSAgICAgICAgcmV0dXJuIGJsb2NrU2l6ZSAqIExheW91dFVu
aXQoYXNwZWN0UmF0aW8pOworICAgICAgICByZXR1cm4gYmxvY2tTaXplICogYXNwZWN0UmF0aW87
CiAKLSAgICByZXR1cm4gKChibG9ja1NpemUgLSBib3JkZXJQYWRkaW5nQmxvY2tTdW0pICogTGF5
b3V0VW5pdChhc3BlY3RSYXRpbykpICsgYm9yZGVyUGFkZGluZ0lubGluZVN1bTsKKyAgICByZXR1
cm4gKChibG9ja1NpemUgLSBib3JkZXJQYWRkaW5nQmxvY2tTdW0pICogYXNwZWN0UmF0aW8pICsg
Ym9yZGVyUGFkZGluZ0lubGluZVN1bTsKIH0KIAogdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVMb2dp
Y2FsV2lkdGhJbkZyYWdtZW50KExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyYgY29tcHV0ZWRW
YWx1ZXMsIFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiBmcmFnbWVudCkgY29uc3QKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAgYi9Tb3VyY2Uv
V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCmluZGV4IDBjZjk2NzI1NWFhYmUz
NTBkNDQzYTQ2OTM4Zjk1M2MyZmE3NTA3ZGMuLmJjYjNlYTg2OGNiMGFhYTA1ZmFmNjI2NWM1YjBj
MjdjZGZlNzQ4Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJS
ZXBsYWNlZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2Vk
LmNwcApAQCAtNTMyLDYgKzUzMiwxMyBAQCBMYXlvdXRVbml0IFJlbmRlclJlcGxhY2VkOjpjb21w
dXRlQ29uc3RyYWluZWRMb2dpY2FsV2lkdGgoU2hvdWxkQ29tcHV0ZVByZWZlcnJlZAogICAgIHJl
dHVybiBjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGhSZXNwZWN0aW5nTWluTWF4V2lkdGgobG9n
aWNhbFdpZHRoLCBzaG91bGRDb21wdXRlUHJlZmVycmVkKTsKIH0KIAorc3RhdGljIGlubGluZSBM
YXlvdXRVbml0IHJlc29sdmVXaWR0aEZvclJhdGlvKExheW91dFVuaXQgYm9yZGVyQW5kUGFkZGlu
Z0xvZ2ljYWxIZWlnaHQsIExheW91dFVuaXQgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxXaWR0aCwg
TGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0LCBkb3VibGUgYXNwZWN0UmF0aW8sIEJveFNpemluZyBi
b3hTaXppbmcpCit7CisgICAgaWYgKGJveFNpemluZyA9PSBCb3hTaXppbmc6OkJvcmRlckJveCkK
KyAgICAgICAgcmV0dXJuIExheW91dFVuaXQ6OmZyb21GbG9hdFJvdW5kKChsb2dpY2FsSGVpZ2h0
ICsgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQpICogYXNwZWN0UmF0aW8pIC0gYm9yZGVy
QW5kUGFkZGluZ0xvZ2ljYWxXaWR0aDsKKyAgICByZXR1cm4gTGF5b3V0VW5pdDo6ZnJvbUZsb2F0
Um91bmQobG9naWNhbEhlaWdodCAqIGFzcGVjdFJhdGlvKTsKK30KKwogTGF5b3V0VW5pdCBSZW5k
ZXJSZXBsYWNlZDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbFdpZHRoKFNob3VsZENvbXB1dGVQcmVm
ZXJyZWQgc2hvdWxkQ29tcHV0ZVByZWZlcnJlZCkgY29uc3QKIHsKICAgICBpZiAoc3R5bGUoKS5s
b2dpY2FsV2lkdGgoKS5pc1NwZWNpZmllZCgpIHx8IHN0eWxlKCkubG9naWNhbFdpZHRoKCkuaXNJ
bnRyaW5zaWMoKSkKQEAgLTU2Nyw3ICs1NzQsMTAgQEAgTGF5b3V0VW5pdCBSZW5kZXJSZXBsYWNl
ZDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbFdpZHRoKFNob3VsZENvbXB1dGVQcmVmZXJyZWQgc2gK
ICAgICAgICAgICAgIGlmIChpbnRyaW5zaWNSYXRpbyAmJiAoKGNvbXB1dGVkSGVpZ2h0SXNBdXRv
ICYmICFoYXNJbnRyaW5zaWNXaWR0aCAmJiBoYXNJbnRyaW5zaWNIZWlnaHQpIHx8ICFjb21wdXRl
ZEhlaWdodElzQXV0bykpIHsKICAgICAgICAgICAgICAgICBMYXlvdXRVbml0IGVzdGltYXRlZFVz
ZWRXaWR0aCA9IGhhc0ludHJpbnNpY1dpZHRoID8gTGF5b3V0VW5pdChjb25zdHJhaW5lZFNpemUu
d2lkdGgoKSkgOiBjb21wdXRlQ29uc3RyYWluZWRMb2dpY2FsV2lkdGgoc2hvdWxkQ29tcHV0ZVBy
ZWZlcnJlZCk7CiAgICAgICAgICAgICAgICAgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0ID0gY29t
cHV0ZVJlcGxhY2VkTG9naWNhbEhlaWdodChPcHRpb25hbDxMYXlvdXRVbml0Pihlc3RpbWF0ZWRV
c2VkV2lkdGgpKTsKLSAgICAgICAgICAgICAgICByZXR1cm4gY29tcHV0ZVJlcGxhY2VkTG9naWNh
bFdpZHRoUmVzcGVjdGluZ01pbk1heFdpZHRoKHJvdW5kVG9JbnQocm91bmQobG9naWNhbEhlaWdo
dCAqIGludHJpbnNpY1JhdGlvKSksIHNob3VsZENvbXB1dGVQcmVmZXJyZWQpOworICAgICAgICAg
ICAgICAgIEJveFNpemluZyBib3hTaXppbmcgPSBCb3hTaXppbmc6OkNvbnRlbnRCb3g7CisgICAg
ICAgICAgICAgICAgaWYgKHN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSkKKyAgICAgICAgICAgICAg
ICAgICAgYm94U2l6aW5nID0gc3R5bGUoKS5ib3hTaXppbmdGb3JBc3BlY3RSYXRpbygpOworICAg
ICAgICAgICAgICAgIHJldHVybiBjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGhSZXNwZWN0aW5n
TWluTWF4V2lkdGgocmVzb2x2ZVdpZHRoRm9yUmF0aW8oYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxI
ZWlnaHQoKSwgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxXaWR0aCgpLCBsb2dpY2FsSGVpZ2h0LCBp
bnRyaW5zaWNSYXRpbywgYm94U2l6aW5nKSwgc2hvdWxkQ29tcHV0ZVByZWZlcnJlZCk7CiAgICAg
ICAgICAgICB9CiAKICAgICAgICAgICAgIApAQCAtNTk2LDYgKzYwNiwxMyBAQCBMYXlvdXRVbml0
IFJlbmRlclJlcGxhY2VkOjpjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGgoU2hvdWxkQ29tcHV0
ZVByZWZlcnJlZCBzaAogICAgIHJldHVybiBjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGhSZXNw
ZWN0aW5nTWluTWF4V2lkdGgoaW50cmluc2ljTG9naWNhbFdpZHRoKCksIHNob3VsZENvbXB1dGVQ
cmVmZXJyZWQpOwogfQogCitzdGF0aWMgaW5saW5lIExheW91dFVuaXQgcmVzb2x2ZUhlaWdodEZv
clJhdGlvKExheW91dFVuaXQgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxXaWR0aCwgTGF5b3V0VW5p
dCBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCwgTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgs
IGRvdWJsZSBhc3BlY3RSYXRpbywgQm94U2l6aW5nIGJveFNpemluZykKK3sKKyAgICBpZiAoYm94
U2l6aW5nID09IEJveFNpemluZzo6Qm9yZGVyQm94KQorICAgICAgICByZXR1cm4gTGF5b3V0VW5p
dDo6ZnJvbUZsb2F0Um91bmQoKGxvZ2ljYWxXaWR0aCArIGJvcmRlckFuZFBhZGRpbmdMb2dpY2Fs
V2lkdGgpIC8gYXNwZWN0UmF0aW8pIC0gYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQ7Cisg
ICAgcmV0dXJuIExheW91dFVuaXQ6OmZyb21GbG9hdFJvdW5kKGxvZ2ljYWxXaWR0aCAvIGFzcGVj
dFJhdGlvKTsKK30KKwogTGF5b3V0VW5pdCBSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVJlcGxhY2Vk
TG9naWNhbEhlaWdodChPcHRpb25hbDxMYXlvdXRVbml0PiBlc3RpbWF0ZWRVc2VkV2lkdGgpIGNv
bnN0CiB7CiAgICAgLy8gMTAuNSBDb250ZW50IGhlaWdodDogdGhlICdoZWlnaHQnIHByb3BlcnR5
OiBodHRwOi8vd3d3LnczLm9yZy9UUi9DU1MyMS92aXN1ZGV0Lmh0bWwjcHJvcGRlZi1oZWlnaHQK
QEAgLTYyNSw3ICs2NDIsMTAgQEAgTGF5b3V0VW5pdCBSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVJl
cGxhY2VkTG9naWNhbEhlaWdodChPcHRpb25hbDxMYXlvdXRVbml0PiBlc3QKICAgICAvLyAodXNl
ZCB3aWR0aCkgLyAoaW50cmluc2ljIHJhdGlvKQogICAgIGlmIChpbnRyaW5zaWNSYXRpbykgewog
ICAgICAgICBMYXlvdXRVbml0IHVzZWRXaWR0aCA9IGVzdGltYXRlZFVzZWRXaWR0aCA/IGVzdGlt
YXRlZFVzZWRXaWR0aC52YWx1ZSgpIDogYXZhaWxhYmxlTG9naWNhbFdpZHRoKCk7Ci0gICAgICAg
IHJldHVybiBjb21wdXRlUmVwbGFjZWRMb2dpY2FsSGVpZ2h0UmVzcGVjdGluZ01pbk1heEhlaWdo
dChyb3VuZFRvSW50KHJvdW5kKHVzZWRXaWR0aCAvIGludHJpbnNpY1JhdGlvKSkpOworICAgICAg
ICBCb3hTaXppbmcgYm94U2l6aW5nID0gQm94U2l6aW5nOjpDb250ZW50Qm94OworICAgICAgICBp
ZiAoc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKQorICAgICAgICAgICAgYm94U2l6aW5nID0gc3R5
bGUoKS5ib3hTaXppbmdGb3JBc3BlY3RSYXRpbygpOworICAgICAgICByZXR1cm4gY29tcHV0ZVJl
cGxhY2VkTG9naWNhbEhlaWdodFJlc3BlY3RpbmdNaW5NYXhIZWlnaHQocmVzb2x2ZUhlaWdodEZv
clJhdGlvKGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsV2lkdGgoKSwgYm9yZGVyQW5kUGFkZGluZ0xv
Z2ljYWxIZWlnaHQoKSwgdXNlZFdpZHRoLCBpbnRyaW5zaWNSYXRpbywgYm94U2l6aW5nKSk7CiAg
ICAgfQogCiAgICAgLy8gT3RoZXJ3aXNlLCBpZiAnaGVpZ2h0JyBoYXMgYSBjb21wdXRlZCB2YWx1
ZSBvZiAnYXV0bycsIGFuZCB0aGUgZWxlbWVudCBoYXMgYW4gaW50cmluc2ljIGhlaWdodCwgdGhl
biB0aGF0IGludHJpbnNpYyBoZWlnaHQgaXMgdGhlIHVzZWQgdmFsdWUgb2YgJ2hlaWdodCcuCmRp
ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK
aW5kZXggNzllM2Q4MTNiNGQxNTE3OTM1MjMyOWFmNzdmNjExNmEwOTg5NmJiYy4uNDQwODEyNzNl
MDUyM2RlYjlmNTI0N2NkMTRlNmJkZTJkMjMzMjg3NyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv
Q2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisy
MDIxLTAzLTAxICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgVGFrZSBi
b3gtc2l6aW5nIGludG8gYWNjb3VudCBpbiByZXBsYWNlZCBlbGVtZW50IGludHJpbnNpYyBzaXpp
bmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTY3
MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuYWJs
ZSBzb21lIHRlc3RzIHRoYXQgcGFzcyBub3cuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25z
OgorCiAyMDIxLTAzLTAxICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29tPgogCiAgICAg
ICAgIFtHTElCXSBHYXJkZW5pbmcgdGhyZWUgY29tbW9uIHRpbWVvdXRzCmRpZmYgLS1naXQgYS9M
YXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv
dzNjL0NoYW5nZUxvZwppbmRleCAyMGU2NWMwZWJiYWNlYTkwM2U5NTUwZTY3NjI3OWVhNDc1ZWVh
MjBhLi44MTdkMTJmOGI2NjM0NTgxMGZlYTFlY2ExNmZkMzMyY2Q2YWY0N2VlIDEwMDY0NAotLS0g
YS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL2lt
cG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wMy0wMSAgUm9iIEJ1
aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIFRha2UgYm94LXNpemluZyBpbnRvIGFj
Y291bnQgaW4gcmVwbGFjZWQgZWxlbWVudCBpbnRyaW5zaWMgc2l6aW5nCisgICAgICAgIGh0dHBz
Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjE2NzEKKworICAgICAgICBSZXZp
ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTeW5jIHRlc3QuCisKKyAgICAgICAg
KiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3JlcGxhY2Vk
LWVsZW1lbnQtMDMyLmh0bWw6CisKIDIwMjEtMDItMjggIEFudG9pbmUgUXVpbnQgIDxncmFvdXRz
QHdlYmtpdC5vcmc+CiAKICAgICAgICAgQmxlbmRpbmcgb2YgYm9yZGVyLWltYWdlLXdpZHRoIHNo
b3VsZCBiZSBkaXNjcmV0ZSBiZXR3ZWVuICJhdXRvIiB2YWx1ZXMgYW5kIG90aGVyIHR5cGVzCmRp
ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVz
dEV4cGVjdGF0aW9ucwppbmRleCBkOTVkNDBmNjEzY2Y3NzgxZTQxY2VmMDNkZjc5ZTdiNjM2NDY5
NGYzLi5jOWM4ZDBmODE1YjBmOWE2ZTA5NTM0YjFjYzIwZDZlOTcwYzczNTNjIDEwMDY0NAotLS0g
YS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBl
Y3RhdGlvbnMKQEAgLTQ1NzEsOSArNDU3MSw2IEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vCiB3
ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAxMy5odG1sIFsgSW1hZ2VPbmx5
RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAxNC5odG1s
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1z
aXplLTAxNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGlt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv
L3JlcGxhY2VkLWVsZW1lbnQtMDMxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5v
cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu
Zy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVudC0wMzIuaHRtbCBbIEltYWdlT25seUZhaWx1
cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50LTAzMy5odG1sIFsg
SW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3RhYmxlLWVsZW1lbnQt
MDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9jb250YWluLWludHJpbnNp
Yy1zaXplL2NvbnRhaW4taW50cmluc2ljLXNpemUtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXNpemluZy9jb250YWluLWludHJpbnNpYy1zaXplL2NvbnRhaW4taW50cmluc2ljLXNp
emUtMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz
L2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh
dGlvL3JlcGxhY2VkLWVsZW1lbnQtMDMyLmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNlZC1l
bGVtZW50LTAzMi5odG1sCmluZGV4IGFmYTQ4M2RkMzE1ODkxMDEzNjM5MmU0MDVlMzYzMjk0MDMz
ZTAyZDYuLjAyMmEyZDc5N2IxYmI2YWQ5Y2RlNmMzODNhZDA1NGYxYmQ4MzU0MDAgMTAwNjQ0Ci0t
LSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z
aXppbmcvYXNwZWN0LXJhdGlvL3JlcGxhY2VkLWVsZW1lbnQtMDMyLmh0bWwKKysrIGIvTGF5b3V0
VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl
Y3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVudC0wMzIuaHRtbApAQCAtMjMsMTIgKzIzLDE2IEBAIGlt
ZyB7CiAgICAgICAgYm9yZGVyLXRvcCBpcyAyMHg0MCBhbmQgdGhlIGNvbnRlbnQgYm94IGlzIDIw
eDYwLgogICAgICAgIChub3RlOiBoZWlnaHQgaGVyZSBpcyB0aGUgYmxvY2sgc2l6ZSBvZiBjb250
ZW50LWJveC4pCiAKLSAgM3JkOiBBIGdyZWVuIHJlY3QgMjB4MTAwLgotICAgICAgIGJvcmRlci10
b3AgaXMgMjB4NDAgYW5kIHRoZSBjb250ZW50IGJveCBpcyAyMHg2MCBiZWNhdXNlIHdlIGNvbXB1
dGUKKyAgM3JkOiBBIGdyZWVuIHJlY3QgMTB4MTAwLgorICAgICAgIGJvcmRlci10b3AgaXMgMTB4
NDAgYW5kIHRoZSBjb250ZW50IGJveCBpcyAxMHg2MCBiZWNhdXNlIHdlIGNvbXB1dGUKICAgICAg
ICB0aGUgaW5saW5lIHNpemUgYnkgYXNwZWN0LXJhdGlvIHdoaWNoIHdvcmtzIHdpdGggYm9yZGVy
LWJveCBhbmQgc28gdGhlCi0gICAgICAgaW5saW5lIHNpemUgaXMgMTAwcHggLyA1ID0gMjBweC4K
KyAgICAgICBpbmxpbmUgc2l6ZSBpcyAxMDBweCAvIDEwID0gMTBweC4KICAgICAgICAobm90ZTog
aGVpZ2h0IGhlcmUgaXMgdGhlIGJsb2NrIHNpemUgb2YgYm9yZGVyLWJveC4pCisKKyAgNHRoOiBB
IGdyZWVuIHJlY3QgMTB4MTAwLgorICAgICAgIGJvcmRlci10b3AgaXMgMTB4NDAgYW5kIHRoZSBj
b250ZW50IGJveCBpcyAxMHg2MCB0byBhZGQgdXAgdG8gMTB4MTAwLgogLS0+CiA8aW1nIHNyYz0i
c3VwcG9ydC8xeDEtZ3JlZW4ucG5nIiBzdHlsZT0iaGVpZ2h0OiAxMDBweDsgYXNwZWN0LXJhdGlv
OiBhdXRvIDEvMTA7IGJveC1zaXppbmc6IGJvcmRlci1ib3g7IgogPjxpbWcgc3JjPSJzdXBwb3J0
LzF4MS1ncmVlbi5wbmciIHN0eWxlPSJoZWlnaHQ6IDYwcHg7IGFzcGVjdC1yYXRpbzogMS8zOyBi
b3gtc2l6aW5nOiBjb250ZW50LWJveDsiCi0+PGltZyBzcmM9InN1cHBvcnQvMXgxLWdyZWVuLnBu
ZyIgc3R5bGU9ImhlaWdodDogMTAwcHg7IGFzcGVjdC1yYXRpbzogMS81OyBib3gtc2l6aW5nOiBi
b3JkZXItYm94OyI+Cis+PGltZyBzcmM9InN1cHBvcnQvMXgxLWdyZWVuLnBuZyIgc3R5bGU9Imhl
aWdodDogMTAwcHg7IGFzcGVjdC1yYXRpbzogMS8xMDsgYm94LXNpemluZzogYm9yZGVyLWJveDsi
Cis+PGltZyBzcmM9InN1cHBvcnQvMXgxLWdyZWVuLnBuZyIgc3R5bGU9IndpZHRoOiAxMHB4OyBh
c3BlY3QtcmF0aW86IDEvNjsgYm94LXNpemluZzogY29udGVudC1ib3g7Ij4K
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>421932</attachid>
            <date>2021-03-02 07:27:32 -0800</date>
            <delta_ts>2021-03-02 12:23:57 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-221671-20210302162730.patch</filename>
            <type>text/plain</type>
            <size>11017</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNzI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjY2MDY2ZWQ4MWIyZjU3
N2Y1NzgzN2ZhZjgwOWEyYmNhZGNmMjQ0My4uZGQwNmExZDMwYzZhMjA4ZGM5MzIzYmI3YmYyZWQy
MWIyOTE3MTYxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTAzLTAyICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgVGFrZSBib3gtc2l6aW5nIGludG8g
YWNjb3VudCBpbiByZXBsYWNlZCBlbGVtZW50IGludHJpbnNpYyBzaXppbmcKKyAgICAgICAgaHR0
cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTY3MQorCisgICAgICAgIFJl
dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRha2UgYm94LXNpemluZyBpbnRv
IGFjY291bnQgaW4gcmVwbGFjZWQgZWxlbWVudCBpbnRyaW5zaWMgc2l6aW5nIHdoZW4KKyAgICAg
ICAgdXNpbmcgYXNwZWN0LXJhdGlvLCBidXQga2VlcCB1c2luZyBjb250ZW50LWJveCB3aGVuIHJl
c29sdmluZworICAgICAgICB3aWR0aC9oZWlnaHQgd2hlbiBubyBhc3BlY3QtcmF0aW8gaXMgc2V0
LgorCisgICAgICAgIFRlc3RzOiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50LTAzMS5odG1sCisgICAgICAg
ICAgICAgICBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz
cGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50LTAzMi5odG1sCisgICAgICAgICAgICAgICBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9y
ZXBsYWNlZC1lbGVtZW50LTAzMy5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyUmVw
bGFjZWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cmVzb2x2ZVdpZHRoRm9yUmF0aW8pOgorICAg
ICAgICAoV2ViQ29yZTo6UmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxXaWR0
aCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpyZXNvbHZlSGVpZ2h0Rm9yUmF0aW8pOgorICAg
ICAgICAoV2ViQ29yZTo6UmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxIZWln
aHQgY29uc3QpOgorCiAyMDIxLTAzLTAyICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+
CiAKICAgICAgICAgW0xGQ11bSUZDXSBNZXJnZSBTaW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQg
YW5kIG1fdXNlU2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50CmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu
Zy9SZW5kZXJCb3guY3BwCmluZGV4IDUzZmQwZjBmMzhjYTVhZmQxMDc5ZmRjMzQwNzQ4YjE0Yzlj
MjkwMDAuLjY2YWUzNTY0MjYyNmJiOTJhMWMzNDRiYWIxZjY4ZGEzMjMyNGIzM2EgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9X
ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC0yNDg5LDkgKzI0ODksOSBAQCB2b2lk
IFJlbmRlckJveDo6dXBkYXRlTG9naWNhbFdpZHRoKCkKIHN0YXRpYyBMYXlvdXRVbml0IGlubGlu
ZVNpemVGcm9tQXNwZWN0UmF0aW8oTGF5b3V0VW5pdCBib3JkZXJQYWRkaW5nSW5saW5lU3VtLCBM
YXlvdXRVbml0IGJvcmRlclBhZGRpbmdCbG9ja1N1bSwgTGF5b3V0VW5pdCBhc3BlY3RSYXRpbywg
Qm94U2l6aW5nIGJveFNpemluZywgTGF5b3V0VW5pdCBibG9ja1NpemUpCiB7CiAgICAgaWYgKGJv
eFNpemluZyA9PSBCb3hTaXppbmc6OkJvcmRlckJveCkKLSAgICAgICAgcmV0dXJuIGJsb2NrU2l6
ZSAqIExheW91dFVuaXQoYXNwZWN0UmF0aW8pOworICAgICAgICByZXR1cm4gYmxvY2tTaXplICog
YXNwZWN0UmF0aW87CiAKLSAgICByZXR1cm4gKChibG9ja1NpemUgLSBib3JkZXJQYWRkaW5nQmxv
Y2tTdW0pICogTGF5b3V0VW5pdChhc3BlY3RSYXRpbykpICsgYm9yZGVyUGFkZGluZ0lubGluZVN1
bTsKKyAgICByZXR1cm4gKChibG9ja1NpemUgLSBib3JkZXJQYWRkaW5nQmxvY2tTdW0pICogYXNw
ZWN0UmF0aW8pICsgYm9yZGVyUGFkZGluZ0lubGluZVN1bTsKIH0KIAogdm9pZCBSZW5kZXJCb3g6
OmNvbXB1dGVMb2dpY2FsV2lkdGhJbkZyYWdtZW50KExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVl
cyYgY29tcHV0ZWRWYWx1ZXMsIFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiBmcmFnbWVudCkgY29u
c3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5j
cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCmluZGV4IDBj
Zjk2NzI1NWFhYmUzNTBkNDQzYTQ2OTM4Zjk1M2MyZmE3NTA3ZGMuLjgzNGU0NTY2NDdmNDNiNDc3
NGY3NTZhZTYwNDcxZTU5NDcyMDQzNjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl
cmluZy9SZW5kZXJSZXBsYWNlZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl
bmRlclJlcGxhY2VkLmNwcApAQCAtNTMyLDYgKzUzMiwxMyBAQCBMYXlvdXRVbml0IFJlbmRlclJl
cGxhY2VkOjpjb21wdXRlQ29uc3RyYWluZWRMb2dpY2FsV2lkdGgoU2hvdWxkQ29tcHV0ZVByZWZl
cnJlZAogICAgIHJldHVybiBjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGhSZXNwZWN0aW5nTWlu
TWF4V2lkdGgobG9naWNhbFdpZHRoLCBzaG91bGRDb21wdXRlUHJlZmVycmVkKTsKIH0KIAorc3Rh
dGljIGlubGluZSBMYXlvdXRVbml0IHJlc29sdmVXaWR0aEZvclJhdGlvKExheW91dFVuaXQgYm9y
ZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQsIExheW91dFVuaXQgYm9yZGVyQW5kUGFkZGluZ0xv
Z2ljYWxXaWR0aCwgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0LCBkb3VibGUgYXNwZWN0UmF0aW8s
IEJveFNpemluZyBib3hTaXppbmcpCit7CisgICAgaWYgKGJveFNpemluZyA9PSBCb3hTaXppbmc6
OkJvcmRlckJveCkKKyAgICAgICAgcmV0dXJuIExheW91dFVuaXQocm91bmQoKGxvZ2ljYWxIZWln
aHQgKyBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCkgKiBhc3BlY3RSYXRpbykpIC0gYm9y
ZGVyQW5kUGFkZGluZ0xvZ2ljYWxXaWR0aDsKKyAgICByZXR1cm4gTGF5b3V0VW5pdChyb3VuZChs
b2dpY2FsSGVpZ2h0ICogYXNwZWN0UmF0aW8pKTsKK30KKwogTGF5b3V0VW5pdCBSZW5kZXJSZXBs
YWNlZDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbFdpZHRoKFNob3VsZENvbXB1dGVQcmVmZXJyZWQg
c2hvdWxkQ29tcHV0ZVByZWZlcnJlZCkgY29uc3QKIHsKICAgICBpZiAoc3R5bGUoKS5sb2dpY2Fs
V2lkdGgoKS5pc1NwZWNpZmllZCgpIHx8IHN0eWxlKCkubG9naWNhbFdpZHRoKCkuaXNJbnRyaW5z
aWMoKSkKQEAgLTU2Nyw3ICs1NzQsMTAgQEAgTGF5b3V0VW5pdCBSZW5kZXJSZXBsYWNlZDo6Y29t
cHV0ZVJlcGxhY2VkTG9naWNhbFdpZHRoKFNob3VsZENvbXB1dGVQcmVmZXJyZWQgc2gKICAgICAg
ICAgICAgIGlmIChpbnRyaW5zaWNSYXRpbyAmJiAoKGNvbXB1dGVkSGVpZ2h0SXNBdXRvICYmICFo
YXNJbnRyaW5zaWNXaWR0aCAmJiBoYXNJbnRyaW5zaWNIZWlnaHQpIHx8ICFjb21wdXRlZEhlaWdo
dElzQXV0bykpIHsKICAgICAgICAgICAgICAgICBMYXlvdXRVbml0IGVzdGltYXRlZFVzZWRXaWR0
aCA9IGhhc0ludHJpbnNpY1dpZHRoID8gTGF5b3V0VW5pdChjb25zdHJhaW5lZFNpemUud2lkdGgo
KSkgOiBjb21wdXRlQ29uc3RyYWluZWRMb2dpY2FsV2lkdGgoc2hvdWxkQ29tcHV0ZVByZWZlcnJl
ZCk7CiAgICAgICAgICAgICAgICAgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0ID0gY29tcHV0ZVJl
cGxhY2VkTG9naWNhbEhlaWdodChPcHRpb25hbDxMYXlvdXRVbml0Pihlc3RpbWF0ZWRVc2VkV2lk
dGgpKTsKLSAgICAgICAgICAgICAgICByZXR1cm4gY29tcHV0ZVJlcGxhY2VkTG9naWNhbFdpZHRo
UmVzcGVjdGluZ01pbk1heFdpZHRoKHJvdW5kVG9JbnQocm91bmQobG9naWNhbEhlaWdodCAqIGlu
dHJpbnNpY1JhdGlvKSksIHNob3VsZENvbXB1dGVQcmVmZXJyZWQpOworICAgICAgICAgICAgICAg
IEJveFNpemluZyBib3hTaXppbmcgPSBCb3hTaXppbmc6OkNvbnRlbnRCb3g7CisgICAgICAgICAg
ICAgICAgaWYgKHN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSkKKyAgICAgICAgICAgICAgICAgICAg
Ym94U2l6aW5nID0gc3R5bGUoKS5ib3hTaXppbmdGb3JBc3BlY3RSYXRpbygpOworICAgICAgICAg
ICAgICAgIHJldHVybiBjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGhSZXNwZWN0aW5nTWluTWF4
V2lkdGgocmVzb2x2ZVdpZHRoRm9yUmF0aW8oYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQo
KSwgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxXaWR0aCgpLCBsb2dpY2FsSGVpZ2h0LCBpbnRyaW5z
aWNSYXRpbywgYm94U2l6aW5nKSwgc2hvdWxkQ29tcHV0ZVByZWZlcnJlZCk7CiAgICAgICAgICAg
ICB9CiAKICAgICAgICAgICAgIApAQCAtNTk2LDYgKzYwNiwxMyBAQCBMYXlvdXRVbml0IFJlbmRl
clJlcGxhY2VkOjpjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGgoU2hvdWxkQ29tcHV0ZVByZWZl
cnJlZCBzaAogICAgIHJldHVybiBjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGhSZXNwZWN0aW5n
TWluTWF4V2lkdGgoaW50cmluc2ljTG9naWNhbFdpZHRoKCksIHNob3VsZENvbXB1dGVQcmVmZXJy
ZWQpOwogfQogCitzdGF0aWMgaW5saW5lIExheW91dFVuaXQgcmVzb2x2ZUhlaWdodEZvclJhdGlv
KExheW91dFVuaXQgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCBib3Jk
ZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCwgTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgsIGRvdWJs
ZSBhc3BlY3RSYXRpbywgQm94U2l6aW5nIGJveFNpemluZykKK3sKKyAgICBpZiAoYm94U2l6aW5n
ID09IEJveFNpemluZzo6Qm9yZGVyQm94KQorICAgICAgICByZXR1cm4gTGF5b3V0VW5pdChyb3Vu
ZCgobG9naWNhbFdpZHRoICsgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxXaWR0aCkgLyBhc3BlY3RS
YXRpbykpIC0gYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQ7CisgICAgcmV0dXJuIExheW91
dFVuaXQocm91bmQobG9naWNhbFdpZHRoIC8gYXNwZWN0UmF0aW8pKTsKK30KKwogTGF5b3V0VW5p
dCBSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbEhlaWdodChPcHRpb25hbDxM
YXlvdXRVbml0PiBlc3RpbWF0ZWRVc2VkV2lkdGgpIGNvbnN0CiB7CiAgICAgLy8gMTAuNSBDb250
ZW50IGhlaWdodDogdGhlICdoZWlnaHQnIHByb3BlcnR5OiBodHRwOi8vd3d3LnczLm9yZy9UUi9D
U1MyMS92aXN1ZGV0Lmh0bWwjcHJvcGRlZi1oZWlnaHQKQEAgLTYyNSw3ICs2NDIsMTAgQEAgTGF5
b3V0VW5pdCBSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbEhlaWdodChPcHRp
b25hbDxMYXlvdXRVbml0PiBlc3QKICAgICAvLyAodXNlZCB3aWR0aCkgLyAoaW50cmluc2ljIHJh
dGlvKQogICAgIGlmIChpbnRyaW5zaWNSYXRpbykgewogICAgICAgICBMYXlvdXRVbml0IHVzZWRX
aWR0aCA9IGVzdGltYXRlZFVzZWRXaWR0aCA/IGVzdGltYXRlZFVzZWRXaWR0aC52YWx1ZSgpIDog
YXZhaWxhYmxlTG9naWNhbFdpZHRoKCk7Ci0gICAgICAgIHJldHVybiBjb21wdXRlUmVwbGFjZWRM
b2dpY2FsSGVpZ2h0UmVzcGVjdGluZ01pbk1heEhlaWdodChyb3VuZFRvSW50KHJvdW5kKHVzZWRX
aWR0aCAvIGludHJpbnNpY1JhdGlvKSkpOworICAgICAgICBCb3hTaXppbmcgYm94U2l6aW5nID0g
Qm94U2l6aW5nOjpDb250ZW50Qm94OworICAgICAgICBpZiAoc3R5bGUoKS5oYXNBc3BlY3RSYXRp
bygpKQorICAgICAgICAgICAgYm94U2l6aW5nID0gc3R5bGUoKS5ib3hTaXppbmdGb3JBc3BlY3RS
YXRpbygpOworICAgICAgICByZXR1cm4gY29tcHV0ZVJlcGxhY2VkTG9naWNhbEhlaWdodFJlc3Bl
Y3RpbmdNaW5NYXhIZWlnaHQocmVzb2x2ZUhlaWdodEZvclJhdGlvKGJvcmRlckFuZFBhZGRpbmdM
b2dpY2FsV2lkdGgoKSwgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQoKSwgdXNlZFdpZHRo
LCBpbnRyaW5zaWNSYXRpbywgYm94U2l6aW5nKSk7CiAgICAgfQogCiAgICAgLy8gT3RoZXJ3aXNl
LCBpZiAnaGVpZ2h0JyBoYXMgYSBjb21wdXRlZCB2YWx1ZSBvZiAnYXV0bycsIGFuZCB0aGUgZWxl
bWVudCBoYXMgYW4gaW50cmluc2ljIGhlaWdodCwgdGhlbiB0aGF0IGludHJpbnNpYyBoZWlnaHQg
aXMgdGhlIHVzZWQgdmFsdWUgb2YgJ2hlaWdodCcuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9D
aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNDA0ZWEzYThiOGNkYTZlYTUy
ZGVlYjliOTIzZThlNGM1ZGZiMjg1Ny4uY2U0YmRhZGU0NDFmNzE1YWJmZTFjMDA4YTQ0OTY0MGRl
MDdiN2FhMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRl
c3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAzLTAyICBSb2IgQnVpcyAgPHJi
dWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgVGFrZSBib3gtc2l6aW5nIGludG8gYWNjb3VudCBp
biByZXBsYWNlZCBlbGVtZW50IGludHJpbnNpYyBzaXppbmcKKyAgICAgICAgaHR0cHM6Ly9idWdz
LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTY3MQorCisgICAgICAgIFJldmlld2VkIGJ5
IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuYWJsZSBzb21lIHRlc3RzIHRoYXQgcGFzcyBu
b3cuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTAzLTAyICBSb2IgQnVp
cyAgPHJidWlzQGlnYWxpYS5jb20+CiAKICAgICAgICAgTnVsbCBjaGVjayBwbGF0Zm9ybURhdGEg
d2hlbiBkZWNvZGluZwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5n
ZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggMjBlNjVjMGVi
YmFjZWE5MDNlOTU1MGU2NzYyNzllYTQ3NWVlYTIwYS4uZDc3ZjgyOTllMTJjMTZmMWUwMTJmYzcx
NWM0YmMxOTFlODViNTM5MCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0No
YW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMg
KzEsMTQgQEAKKzIwMjEtMDMtMDIgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAg
ICAgICBUYWtlIGJveC1zaXppbmcgaW50byBhY2NvdW50IGluIHJlcGxhY2VkIGVsZW1lbnQgaW50
cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MjIxNjcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgU3luYyB0ZXN0LgorCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
c2l6aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50LTAzMi5odG1sOgorCiAyMDIxLTAy
LTI4ICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgogCiAgICAgICAgIEJsZW5k
aW5nIG9mIGJvcmRlci1pbWFnZS13aWR0aCBzaG91bGQgYmUgZGlzY3JldGUgYmV0d2VlbiAiYXV0
byIgdmFsdWVzIGFuZCBvdGhlciB0eXBlcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4
cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggZDk1ZDQwZjYx
M2NmNzc4MWU0MWNlZjAzZGY3OWU3YjYzNjQ2OTRmMy4uYzljOGQwZjgxNWIwZjlhNmUwOTUzNGIx
Y2MyMGQ2ZTk3MGM3MzUzYyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9u
cworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NTcxLDkgKzQ1NzEsNiBA
QCB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvLwogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5z
aWMtc2l6ZS0wMTMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2
MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y
YXRpby9pbnRyaW5zaWMtc2l6ZS0wMTQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0
Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6
aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMTUuaHRtbCBbIEltYWdlT25seUZhaWx1
cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50LTAzMS5odG1sIFsg
SW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3JlcGxhY2VkLWVsZW1l
bnQtMDMyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v
cmVwbGFjZWQtZWxlbWVudC0wMzMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9y
Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n
L2FzcGVjdC1yYXRpby90YWJsZS1lbGVtZW50LTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd
CiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy1zaXppbmcvY29udGFpbi1pbnRyaW5zaWMtc2l6ZS9jb250YWluLWludHJpbnNpYy1zaXpl
LTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvY29udGFpbi1pbnRyaW5z
aWMtc2l6ZS9jb250YWluLWludHJpbnNpYy1zaXplLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50LTAzMi5odG1s
IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp
emluZy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVudC0wMzIuaHRtbAppbmRleCBhZmE0ODNk
ZDMxNTg5MTAxMzYzOTJlNDA1ZTM2MzI5NDAzM2UwMmQ2Li4wMjJhMmQ3OTdiMWJiNmFkOWNkZTZj
MzgzYWQwNTRmMWJkODM1NDAwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNlZC1l
bGVtZW50LTAzMi5odG1sCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3JlcGxhY2VkLWVsZW1lbnQtMDMy
Lmh0bWwKQEAgLTIzLDEyICsyMywxNiBAQCBpbWcgewogICAgICAgIGJvcmRlci10b3AgaXMgMjB4
NDAgYW5kIHRoZSBjb250ZW50IGJveCBpcyAyMHg2MC4KICAgICAgICAobm90ZTogaGVpZ2h0IGhl
cmUgaXMgdGhlIGJsb2NrIHNpemUgb2YgY29udGVudC1ib3guKQogCi0gIDNyZDogQSBncmVlbiBy
ZWN0IDIweDEwMC4KLSAgICAgICBib3JkZXItdG9wIGlzIDIweDQwIGFuZCB0aGUgY29udGVudCBi
b3ggaXMgMjB4NjAgYmVjYXVzZSB3ZSBjb21wdXRlCisgIDNyZDogQSBncmVlbiByZWN0IDEweDEw
MC4KKyAgICAgICBib3JkZXItdG9wIGlzIDEweDQwIGFuZCB0aGUgY29udGVudCBib3ggaXMgMTB4
NjAgYmVjYXVzZSB3ZSBjb21wdXRlCiAgICAgICAgdGhlIGlubGluZSBzaXplIGJ5IGFzcGVjdC1y
YXRpbyB3aGljaCB3b3JrcyB3aXRoIGJvcmRlci1ib3ggYW5kIHNvIHRoZQotICAgICAgIGlubGlu
ZSBzaXplIGlzIDEwMHB4IC8gNSA9IDIwcHguCisgICAgICAgaW5saW5lIHNpemUgaXMgMTAwcHgg
LyAxMCA9IDEwcHguCiAgICAgICAgKG5vdGU6IGhlaWdodCBoZXJlIGlzIHRoZSBibG9jayBzaXpl
IG9mIGJvcmRlci1ib3guKQorCisgIDR0aDogQSBncmVlbiByZWN0IDEweDEwMC4KKyAgICAgICBi
b3JkZXItdG9wIGlzIDEweDQwIGFuZCB0aGUgY29udGVudCBib3ggaXMgMTB4NjAgdG8gYWRkIHVw
IHRvIDEweDEwMC4KIC0tPgogPGltZyBzcmM9InN1cHBvcnQvMXgxLWdyZWVuLnBuZyIgc3R5bGU9
ImhlaWdodDogMTAwcHg7IGFzcGVjdC1yYXRpbzogYXV0byAxLzEwOyBib3gtc2l6aW5nOiBib3Jk
ZXItYm94OyIKID48aW1nIHNyYz0ic3VwcG9ydC8xeDEtZ3JlZW4ucG5nIiBzdHlsZT0iaGVpZ2h0
OiA2MHB4OyBhc3BlY3QtcmF0aW86IDEvMzsgYm94LXNpemluZzogY29udGVudC1ib3g7IgotPjxp
bWcgc3JjPSJzdXBwb3J0LzF4MS1ncmVlbi5wbmciIHN0eWxlPSJoZWlnaHQ6IDEwMHB4OyBhc3Bl
Y3QtcmF0aW86IDEvNTsgYm94LXNpemluZzogYm9yZGVyLWJveDsiPgorPjxpbWcgc3JjPSJzdXBw
b3J0LzF4MS1ncmVlbi5wbmciIHN0eWxlPSJoZWlnaHQ6IDEwMHB4OyBhc3BlY3QtcmF0aW86IDEv
MTA7IGJveC1zaXppbmc6IGJvcmRlci1ib3g7IgorPjxpbWcgc3JjPSJzdXBwb3J0LzF4MS1ncmVl
bi5wbmciIHN0eWxlPSJ3aWR0aDogMTBweDsgYXNwZWN0LXJhdGlvOiAxLzY7IGJveC1zaXppbmc6
IGNvbnRlbnQtYm94OyI+Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>