<?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>213335</bug_id>
          
          <creation_ts>2020-06-18 00:28:29 -0700</creation_ts>
          <short_desc>Image `crossorigin` mutations should be considered &quot;relevant mutations&quot;</short_desc>
          <delta_ts>2021-03-01 15:06:44 -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>DOM</component>
          <version>Safari Technology Preview</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          <see_also>https://bugs.webkit.org/show_bug.cgi?id=222578</see_also>
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Rob Buis">rbuis</reporter>
          <assigned_to name="Rob Buis">rbuis</assigned_to>
          <cc>cdumez</cc>
    
    <cc>changseok</cc>
    
    <cc>darin</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>gyuyoung.kim</cc>
    
    <cc>japhet</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1663817</commentid>
    <comment_count>0</comment_count>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-06-18 00:28:29 -0700</bug_when>
    <thetext>See discussion in https://bugs.webkit.org/show_bug.cgi?id=209970. The test for this is html/semantics/embedded-content/the-img-element/relevant-mutations.html.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664364</commentid>
    <comment_count>1</comment_count>
      <attachid>402285</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-06-19 08:21:01 -0700</bug_when>
    <thetext>Created attachment 402285
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664717</commentid>
    <comment_count>2</comment_count>
      <attachid>402380</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-06-20 01:52:12 -0700</bug_when>
    <thetext>Created attachment 402380
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664765</commentid>
    <comment_count>3</comment_count>
      <attachid>402396</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-06-20 12:17:40 -0700</bug_when>
    <thetext>Created attachment 402396
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664838</commentid>
    <comment_count>4</comment_count>
      <attachid>402419</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-06-21 06:13:22 -0700</bug_when>
    <thetext>Created attachment 402419
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664864</commentid>
    <comment_count>5</comment_count>
      <attachid>402428</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-06-21 10:52:16 -0700</bug_when>
    <thetext>Created attachment 402428
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664881</commentid>
    <comment_count>6</comment_count>
      <attachid>402428</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2020-06-21 13:25:07 -0700</bug_when>
    <thetext>Comment on attachment 402428
Patch

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

review+ assuming this will be revised to *not* use &quot;!=&quot; to compare string literals

&gt; Source/WebCore/html/HTMLImageElement.cpp:169
&gt; +        if (child.get() == this)

Should not need to call &quot;get&quot; here. RefPtr should have the appropriate operator== overload.

&gt; Source/WebCore/html/HTMLImageElement.cpp:256
&gt; +        auto oldCrossoriginState = oldValue.isNull() ? &quot;empty&quot; : (equalIgnoringASCIICase(oldValue, &quot;use-credentials&quot;) ? &quot;use-credentials&quot; : &quot;anonymous&quot;);
&gt; +        auto newCrossoriginState = newValue.isNull() ? &quot;empty&quot; : (equalIgnoringASCIICase(newValue, &quot;use-credentials&quot;) ? &quot;use-credentials&quot; : &quot;anonymous&quot;);
&gt; +        if (oldCrossoriginState != newCrossoriginState)

This looks dangerous. It compares two &quot;const char*&quot; strings using !=, which doesn’t compare string contents, instead it compares string pointers, which are not guaranteed to be equal. I suggest we use an enumeration with three values here instead of strings. Could also avoid writing the code twice by using a function or lambda. Might call it parseCrossOriginState.

&gt; Source/WebCore/html/HTMLImageElement.h:31
&gt; +#include &quot;ImageLoader.h&quot;

Really unfortunate that we need to add this new include just for the enumeration type. Can we consider a different pattern so we can avoid that? Is there some kind of forward declaration we can do? Maybe make it a non-member enumeration just to avoid this. I worry about headers including others headers having a bad affect on our compile time, cumulatively long term.

&gt; Source/WebCore/html/HTMLSourceElement.cpp:88
&gt; -        if (is&lt;HTMLPictureElement&gt;(*parent))
&gt; -            downcast&lt;HTMLPictureElement&gt;(*parent).sourcesChanged();
&gt; +        if (is&lt;HTMLPictureElement&gt;(*parent)) {
&gt; +            m_validSourceElement = true;
&gt; +            for (const Node* node = previousSibling(); node; node = node-&gt;previousSibling()) {
&gt; +                if (is&lt;HTMLImageElement&gt;(*node))
&gt; +                    m_validSourceElement = false;
&gt; +            }
&gt; +            if (m_validSourceElement)
&gt; +                downcast&lt;HTMLPictureElement&gt;(*parent).sourcesChanged();
&gt; +        }

I would be happier with this code if m_validSourceElement was guaranteed to be false when the element is not in a picture element, rather than being uninitialized (or left set the way it was last time it was the child of a picture element).

Also seems like we could consider removing the is&lt;HTMLPictureElement&gt; checks, because m_validSourceElement would guarantee that it’s a picture element.

&gt; Source/WebCore/html/HTMLSourceElement.h:65
&gt; +    bool m_validSourceElement { false };

This sounds like a variable which would contain an element, not one that is a boolean predicate. Maybe m_isValid? Something else? Is the term &quot;valid&quot; really the correct one for this? We should use the same term that the HTML specification uses for it, ideally.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664952</commentid>
    <comment_count>7</comment_count>
      <attachid>402448</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-06-22 00:50:37 -0700</bug_when>
    <thetext>Created attachment 402448
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664964</commentid>
    <comment_count>8</comment_count>
      <attachid>402428</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-06-22 02:06:30 -0700</bug_when>
    <thetext>Comment on attachment 402428
Patch

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

&gt;&gt; Source/WebCore/html/HTMLImageElement.cpp:169
&gt;&gt; +        if (child.get() == this)
&gt; 
&gt; Should not need to call &quot;get&quot; here. RefPtr should have the appropriate operator== overload.

Done.

&gt;&gt; Source/WebCore/html/HTMLImageElement.cpp:256
&gt;&gt; +        if (oldCrossoriginState != newCrossoriginState)
&gt; 
&gt; This looks dangerous. It compares two &quot;const char*&quot; strings using !=, which doesn’t compare string contents, instead it compares string pointers, which are not guaranteed to be equal. I suggest we use an enumeration with three values here instead of strings. Could also avoid writing the code twice by using a function or lambda. Might call it parseCrossOriginState.

Right, much better! The &quot;empty&quot; solution was a bit hack and random as well. Done.

&gt;&gt; Source/WebCore/html/HTMLImageElement.h:31
&gt;&gt; +#include &quot;ImageLoader.h&quot;
&gt; 
&gt; Really unfortunate that we need to add this new include just for the enumeration type. Can we consider a different pattern so we can avoid that? Is there some kind of forward declaration we can do? Maybe make it a non-member enumeration just to avoid this. I worry about headers including others headers having a bad affect on our compile time, cumulatively long term.

I think possibly the only thing we can do is convert enums to enum classes, which can be forward declared. Maybe we need a bug for that, a bit similar to bug(s) to introduce modern c++ features?

&gt;&gt; Source/WebCore/html/HTMLSourceElement.cpp:88
&gt;&gt; +        }
&gt; 
&gt; I would be happier with this code if m_validSourceElement was guaranteed to be false when the element is not in a picture element, rather than being uninitialized (or left set the way it was last time it was the child of a picture element).
&gt; 
&gt; Also seems like we could consider removing the is&lt;HTMLPictureElement&gt; checks, because m_validSourceElement would guarantee that it’s a picture element.

I removed the is&lt;HTMLPictureElement&gt; checks and do not allow m_validSourceElement to be uninitialized.

&gt;&gt; Source/WebCore/html/HTMLSourceElement.h:65
&gt;&gt; +    bool m_validSourceElement { false };
&gt; 
&gt; This sounds like a variable which would contain an element, not one that is a boolean predicate. Maybe m_isValid? Something else? Is the term &quot;valid&quot; really the correct one for this? We should use the same term that the HTML specification uses for it, ideally.

It is hard to come up with the perfect name here. I think I have a better name now and added a comment why it is needed.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664974</commentid>
    <comment_count>9</comment_count>
      <attachid>402458</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-06-22 02:56:02 -0700</bug_when>
    <thetext>Created attachment 402458
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664981</commentid>
    <comment_count>10</comment_count>
      <attachid>402428</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-06-22 03:41:48 -0700</bug_when>
    <thetext>Comment on attachment 402428
Patch

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

&gt;&gt;&gt; Source/WebCore/html/HTMLImageElement.h:31
&gt;&gt;&gt; +#include &quot;ImageLoader.h&quot;
&gt;&gt; 
&gt;&gt; Really unfortunate that we need to add this new include just for the enumeration type. Can we consider a different pattern so we can avoid that? Is there some kind of forward declaration we can do? Maybe make it a non-member enumeration just to avoid this. I worry about headers including others headers having a bad affect on our compile time, cumulatively long term.
&gt; 
&gt; I think possibly the only thing we can do is convert enums to enum classes, which can be forward declared. Maybe we need a bug for that, a bit similar to bug(s) to introduce modern c++ features?

Ok, RelevantMutation was already an enum class, so it just had to be moved out of ImageLoader class, and now we can avoid the include.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664984</commentid>
    <comment_count>11</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-06-22 03:49:24 -0700</bug_when>
    <thetext>Committed r263345: &lt;https://trac.webkit.org/changeset/263345&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 402458.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1664985</commentid>
    <comment_count>12</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2020-06-22 03:50:21 -0700</bug_when>
    <thetext>&lt;rdar://problem/64590953&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1665023</commentid>
    <comment_count>13</comment_count>
      <attachid>402458</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2020-06-22 07:49:23 -0700</bug_when>
    <thetext>Comment on attachment 402458
Patch

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

&gt; Source/WebCore/html/HTMLImageElement.cpp:169
&gt; +        if (child == this)

I looked again, and I think this is dead code. The loop condition already checked child != this so I don’t see how child == this here could ever be true.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1665036</commentid>
    <comment_count>14</comment_count>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-06-22 08:17:09 -0700</bug_when>
    <thetext>Reopening to attach new patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1665037</commentid>
    <comment_count>15</comment_count>
      <attachid>402476</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-06-22 08:17:12 -0700</bug_when>
    <thetext>Created attachment 402476
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1665042</commentid>
    <comment_count>16</comment_count>
      <attachid>402458</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-06-22 08:21:48 -0700</bug_when>
    <thetext>Comment on attachment 402458
Patch

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

&gt;&gt; Source/WebCore/html/HTMLImageElement.cpp:169
&gt;&gt; +        if (child == this)
&gt; 
&gt; I looked again, and I think this is dead code. The loop condition already checked child != this so I don’t see how child == this here could ever be true.

Nice catch, I thought it was just a normal children iteration loop. This should go green...</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1665056</commentid>
    <comment_count>17</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-06-22 09:09:41 -0700</bug_when>
    <thetext>Committed r263350: &lt;https://trac.webkit.org/changeset/263350&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 402476.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1734587</commentid>
    <comment_count>18</comment_count>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2021-03-01 13:40:09 -0800</bug_when>
    <thetext>This broke srcset in &lt;picture&gt; in iframes, like:

&lt;picture&gt;
    &lt;source srcset=&quot;&quot; media=&quot;(min-width: 1069px) and (-webkit-min-device-pixel-ratio: 1.5), (min-width: 1069px) and (min-resolution: 1.5dppx), (min-width: 1069px) and (min-resolution: 144dpi)&quot;&gt;
    &lt;source srcset=&quot;&quot; media=&quot;(min-width: 1069px)&quot;&gt;&lt;source srcset=&quot;...&quot; media=&quot;(min-width: 735px) and (max-width: 1068px) and (-webkit-min-device-pixel-ratio: 1.5), (min-width: 735px) and (max-width: 1068px) and (min-resolution: 1.5dppx), (min-width: 735px) and (max-width: 1068px) and (min-resolution: 144dpi)&quot;&gt;
    &lt;source srcset=&quot;&quot; media=&quot;(min-width: 735px) and (max-width: 1068px)&quot;&gt;
    &lt;source srcset=&quot;&quot; media=&quot;(max-width: 734px) and (-webkit-min-device-pixel-ratio: 1.5), (max-width: 734px) and (min-resolution: 1.5dppx), (max-width: 734px) and (min-resolution: 144dpi)&quot;&gt;
    &lt;source srcset=&quot;&quot; media=&quot;(max-width: 734px)&quot;&gt;
    &lt;img width=&quot;400&quot; height=&quot;250&quot; class=&quot;jsx-528434275 picture__image&quot;&gt;
&lt;/picture&gt;

Is that intended?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1734595</commentid>
    <comment_count>19</comment_count>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-01 13:49:20 -0800</bug_when>
    <thetext>(In reply to Simon Fraser (smfr) from comment #18)
&gt; This broke srcset in &lt;picture&gt; in iframes, like:
&gt; 
&gt; &lt;picture&gt;
&gt;     &lt;source srcset=&quot;&quot; media=&quot;(min-width: 1069px) and
&gt; (-webkit-min-device-pixel-ratio: 1.5), (min-width: 1069px) and
&gt; (min-resolution: 1.5dppx), (min-width: 1069px) and (min-resolution: 144dpi)&quot;&gt;
&gt;     &lt;source srcset=&quot;&quot; media=&quot;(min-width: 1069px)&quot;&gt;&lt;source srcset=&quot;...&quot;
&gt; media=&quot;(min-width: 735px) and (max-width: 1068px) and
&gt; (-webkit-min-device-pixel-ratio: 1.5), (min-width: 735px) and (max-width:
&gt; 1068px) and (min-resolution: 1.5dppx), (min-width: 735px) and (max-width:
&gt; 1068px) and (min-resolution: 144dpi)&quot;&gt;
&gt;     &lt;source srcset=&quot;&quot; media=&quot;(min-width: 735px) and (max-width: 1068px)&quot;&gt;
&gt;     &lt;source srcset=&quot;&quot; media=&quot;(max-width: 734px) and
&gt; (-webkit-min-device-pixel-ratio: 1.5), (max-width: 734px) and
&gt; (min-resolution: 1.5dppx), (max-width: 734px) and (min-resolution: 144dpi)&quot;&gt;
&gt;     &lt;source srcset=&quot;&quot; media=&quot;(max-width: 734px)&quot;&gt;
&gt;     &lt;img width=&quot;400&quot; height=&quot;250&quot; class=&quot;jsx-528434275 picture__image&quot;&gt;
&gt; &lt;/picture&gt;
&gt; 
&gt; Is that intended?

How do Firefox and Chrome behave here?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1734622</commentid>
    <comment_count>20</comment_count>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2021-03-01 14:53:20 -0800</bug_when>
    <thetext>Testcase: https://codepen.io/chrisyz/pen/NWbMbyb

This works in Firefox.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1734631</commentid>
    <comment_count>21</comment_count>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2021-03-01 15:06:44 -0800</bug_when>
    <thetext>I filed bug 222578</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402285</attachid>
            <date>2020-06-19 08:21:01 -0700</date>
            <delta_ts>2020-06-20 01:52:08 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213335-20200619172100.patch</filename>
            <type>text/plain</type>
            <size>2167</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMjY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzU4NmYwYzE2ZjQ0Yzdm
NjQzNDdlYjcwMzYzZDIwZjA0NjZmYTIzMy4uZGQxMTQ0NzI0MTk1NTRmZjY4ZjM1YjY5OWM2MzRl
ZWY4M2E2NzIyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIwLTA2LTE5ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgSW1hZ2UgYGNyb3Nzb3JpZ2luYCBt
dXRhdGlvbnMgc2hvdWxkIGJlIGNvbnNpZGVyZWQgInJlbGV2YW50IG11dGF0aW9ucyIKKyAgICAg
ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzMzNQorCisgICAg
ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1iZWRkZWQtY29udGVudC90
aGUtaW1nLWVsZW1lbnQvcmVsZXZhbnQtbXV0YXRpb25zLmh0bWwKKworICAgICAgICAqIGh0bWwv
SFRNTEltYWdlRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MSW1hZ2VFbGVtZW50
OjphdHRyaWJ1dGVDaGFuZ2VkKToKKwogMjAyMC0wNi0xMCAgU2VyZ2lvIFZpbGxhciBTZW5pbiAg
PHN2aWxsYXJAaWdhbGlhLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIyNjIyNTQ/KTogW1dQ
RV0gaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJ4ci9pZGxoYXJuZXNzLmh0dHBz
LndpbmRvdy5odG1sIGlzIGZhaWxpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv
SFRNTEltYWdlRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbWFnZUVsZW1l
bnQuY3BwCmluZGV4IGYxZmQ2MjFiNmQzNmU4NWQwZGI2NjY3ZjlhYTgwMjhhODhlY2UwYzAuLmEx
ZDMwZGZjZWQ0ZjRjYjU5NDUzOWZiYTMxODY3MjJiNDg4NjNmMTMgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv
aHRtbC9IVE1MSW1hZ2VFbGVtZW50LmNwcApAQCAtMjQ2LDYgKzI0NiwxMSBAQCB2b2lkIEhUTUxJ
bWFnZUVsZW1lbnQ6OmF0dHJpYnV0ZUNoYW5nZWQoY29uc3QgUXVhbGlmaWVkTmFtZSYgbmFtZSwg
Y29uc3QgQXRvbVN0cgogICAgICAgICBhdXRvIG5ld1JlZmVycmVyUG9saWN5ID0gcGFyc2VSZWZl
cnJlclBvbGljeShuZXdWYWx1ZSwgUmVmZXJyZXJQb2xpY3lTb3VyY2U6OlJlZmVycmVyUG9saWN5
QXR0cmlidXRlKS52YWx1ZU9yKFJlZmVycmVyUG9saWN5OjpFbXB0eVN0cmluZyk7CiAgICAgICAg
IGlmIChvbGRSZWZlcnJlclBvbGljeSAhPSBuZXdSZWZlcnJlclBvbGljeSkKICAgICAgICAgICAg
IG1faW1hZ2VMb2FkZXItPnVwZGF0ZUZyb21FbGVtZW50SWdub3JpbmdQcmV2aW91c0Vycm9yKElt
YWdlTG9hZGVyOjpSZWxldmFudE11dGF0aW9uOjpZZXMpOworICAgIH0gZWxzZSBpZiAobmFtZSA9
PSBjcm9zc29yaWdpbkF0dHIpIHsKKyAgICAgICAgYXV0byBvbGRDcm9zc29yaWdpblN0YXRlID0g
b2xkVmFsdWUuaXNOdWxsKCkgPyAiZW1wdHkiIDogKGVxdWFsSWdub3JpbmdBU0NJSUNhc2Uob2xk
VmFsdWUsICJ1c2UtY3JlZGVudGlhbHMiKSA/ICJ1c2UtY3JlZGVudGlhbHMiIDogImFub255bW91
cyIpOworICAgICAgICBhdXRvIG5ld0Nyb3Nzb3JpZ2luU3RhdGUgPSBuZXdWYWx1ZS5pc051bGwo
KSA/ICJlbXB0eSIgOiAoZXF1YWxJZ25vcmluZ0FTQ0lJQ2FzZShuZXdWYWx1ZSwgInVzZS1jcmVk
ZW50aWFscyIpID8gInVzZS1jcmVkZW50aWFscyIgOiAiYW5vbnltb3VzIik7CisgICAgICAgIGlm
IChvbGRDcm9zc29yaWdpblN0YXRlICE9IG5ld0Nyb3Nzb3JpZ2luU3RhdGUpCisgICAgICAgICAg
ICBtX2ltYWdlTG9hZGVyLT51cGRhdGVGcm9tRWxlbWVudElnbm9yaW5nUHJldmlvdXNFcnJvcihJ
bWFnZUxvYWRlcjo6UmVsZXZhbnRNdXRhdGlvbjo6WWVzKTsKICAgICB9CiAKICAgICBIVE1MRWxl
bWVudDo6YXR0cmlidXRlQ2hhbmdlZChuYW1lLCBvbGRWYWx1ZSwgbmV3VmFsdWUsIHJlYXNvbik7
Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402380</attachid>
            <date>2020-06-20 01:52:12 -0700</date>
            <delta_ts>2020-06-20 12:17:36 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213335-20200620105211.patch</filename>
            <type>text/plain</type>
            <size>16719</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMjY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzU4NmYwYzE2ZjQ0Yzdm
NjQzNDdlYjcwMzYzZDIwZjA0NjZmYTIzMy4uMTFhZjZiZGFlNWNiMDc2NjExMDFhNDkxMzkxZmY0
MDE5NDdmODg1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTA2LTIwICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgSW1hZ2UgYGNyb3Nzb3JpZ2luYCBt
dXRhdGlvbnMgc2hvdWxkIGJlIGNvbnNpZGVyZWQgInJlbGV2YW50IG11dGF0aW9ucyIKKyAgICAg
ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzMzNQorCisgICAg
ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1iZWRkZWQtY29udGVudC90
aGUtaW1nLWVsZW1lbnQvcmVsZXZhbnQtbXV0YXRpb25zLmh0bWwKKworICAgICAgICAqIGh0bWwv
SFRNTEltYWdlRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MSW1hZ2VFbGVtZW50
OjpldmFsdWF0ZUR5bmFtaWNNZWRpYVF1ZXJ5RGVwZW5kZW5jaWVzKToKKyAgICAgICAgKFdlYkNv
cmU6OkhUTUxJbWFnZUVsZW1lbnQ6OnNlbGVjdEltYWdlU291cmNlKToKKyAgICAgICAgKFdlYkNv
cmU6OkhUTUxJbWFnZUVsZW1lbnQ6OmF0dHJpYnV0ZUNoYW5nZWQpOgorICAgICAgICAoV2ViQ29y
ZTo6SFRNTEltYWdlRWxlbWVudDo6cGFyc2VBdHRyaWJ1dGUpOgorICAgICAgICAoV2ViQ29yZTo6
SFRNTEltYWdlRWxlbWVudDo6aW5zZXJ0ZWRJbnRvQW5jZXN0b3IpOgorICAgICAgICAqIGh0bWwv
SFRNTEltYWdlRWxlbWVudC5oOgorICAgICAgICAqIGh0bWwvSFRNTFBpY3R1cmVFbGVtZW50LmNw
cDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxQaWN0dXJlRWxlbWVudDo6c291cmNlc0NoYW5nZWQp
OgorCiAyMDIwLTA2LTEwICBTZXJnaW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29t
PgogCiAgICAgICAgIFJFR1JFU1NJT04ocjI2MjI1ND8pOiBbV1BFXSBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL3dlYnhyL2lkbGhhcm5lc3MuaHR0cHMud2luZG93Lmh0bWwgaXMgZmFp
bGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW1hZ2VFbGVtZW50LmNw
cCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5jcHAKaW5kZXggZjFmZDYy
MWI2ZDM2ZTg1ZDBkYjY2NjdmOWFhODAyOGE4OGVjZTBjMC4uY2VmNjFhN2Y3YzJlNTJjNWZkY2Mz
MjM4N2JjNzlmYzEzNDRiYmQxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M
SW1hZ2VFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbWFnZUVsZW1l
bnQuY3BwCkBAIC0yMTEsMTAgKzIxMSwxMCBAQCB2b2lkIEhUTUxJbWFnZUVsZW1lbnQ6OmV2YWx1
YXRlRHluYW1pY01lZGlhUXVlcnlEZXBlbmRlbmNpZXMoKQogICAgIGlmICghZXZhbHVhdG9yLmV2
YWx1YXRlRm9yQ2hhbmdlcyhtX21lZGlhUXVlcnlEeW5hbWljUmVzdWx0cykpCiAgICAgICAgIHJl
dHVybjsKIAotICAgIHNlbGVjdEltYWdlU291cmNlKCk7CisgICAgc2VsZWN0SW1hZ2VTb3VyY2Uo
SW1hZ2VMb2FkZXI6OlJlbGV2YW50TXV0YXRpb246Ok5vKTsKIH0KIAotdm9pZCBIVE1MSW1hZ2VF
bGVtZW50OjpzZWxlY3RJbWFnZVNvdXJjZSgpCit2b2lkIEhUTUxJbWFnZUVsZW1lbnQ6OnNlbGVj
dEltYWdlU291cmNlKEltYWdlTG9hZGVyOjpSZWxldmFudE11dGF0aW9uIHJlbGV2YW50TXV0YXRp
b24pCiB7CiAgICAgbV9tZWRpYVF1ZXJ5RHluYW1pY1Jlc3VsdHMgPSB7IH07CiAgICAgZG9jdW1l
bnQoKS5yZW1vdmVEeW5hbWljTWVkaWFRdWVyeURlcGVuZGVudEltYWdlKCp0aGlzKTsKQEAgLTIy
OCw3ICsyMjgsNyBAQCB2b2lkIEhUTUxJbWFnZUVsZW1lbnQ6OnNlbGVjdEltYWdlU291cmNlKCkK
ICAgICAgICAgY2FuZGlkYXRlID0gYmVzdEZpdFNvdXJjZUZvckltYWdlQXR0cmlidXRlcyhkb2N1
bWVudCgpLmRldmljZVNjYWxlRmFjdG9yKCksIGF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRp
b24oc3JjQXR0ciksIGF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24oc3Jjc2V0QXR0ciks
IHNvdXJjZVNpemUpOwogICAgIH0KICAgICBzZXRCZXN0Rml0VVJMQW5kRFBSRnJvbUltYWdlQ2Fu
ZGlkYXRlKGNhbmRpZGF0ZSk7Ci0gICAgbV9pbWFnZUxvYWRlci0+dXBkYXRlRnJvbUVsZW1lbnRJ
Z25vcmluZ1ByZXZpb3VzRXJyb3IoKTsKKyAgICBtX2ltYWdlTG9hZGVyLT51cGRhdGVGcm9tRWxl
bWVudElnbm9yaW5nUHJldmlvdXNFcnJvcihyZWxldmFudE11dGF0aW9uKTsKIAogICAgIGlmICgh
bV9tZWRpYVF1ZXJ5RHluYW1pY1Jlc3VsdHMuaXNFbXB0eSgpKQogICAgICAgICBkb2N1bWVudCgp
LmFkZER5bmFtaWNNZWRpYVF1ZXJ5RGVwZW5kZW50SW1hZ2UoKnRoaXMpOwpAQCAtMjQxLDE0ICsy
NDEsMTkgQEAgYm9vbCBIVE1MSW1hZ2VFbGVtZW50OjpoYXNMYXp5TG9hZGFibGVBdHRyaWJ1dGVW
YWx1ZShjb25zdCBBdG9tU3RyaW5nJiBhdHRyaWJ1dGUKIAogdm9pZCBIVE1MSW1hZ2VFbGVtZW50
OjphdHRyaWJ1dGVDaGFuZ2VkKGNvbnN0IFF1YWxpZmllZE5hbWUmIG5hbWUsIGNvbnN0IEF0b21T
dHJpbmcmIG9sZFZhbHVlLCBjb25zdCBBdG9tU3RyaW5nJiBuZXdWYWx1ZSwgQXR0cmlidXRlTW9k
aWZpY2F0aW9uUmVhc29uIHJlYXNvbikKIHsKKyAgICBIVE1MRWxlbWVudDo6YXR0cmlidXRlQ2hh
bmdlZChuYW1lLCBvbGRWYWx1ZSwgbmV3VmFsdWUsIHJlYXNvbik7CisKICAgICBpZiAobmFtZSA9
PSByZWZlcnJlcnBvbGljeUF0dHIgJiYgUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVh
dHVyZXMoKS5yZWZlcnJlclBvbGljeUF0dHJpYnV0ZUVuYWJsZWQoKSkgewogICAgICAgICBhdXRv
IG9sZFJlZmVycmVyUG9saWN5ID0gcGFyc2VSZWZlcnJlclBvbGljeShvbGRWYWx1ZSwgUmVmZXJy
ZXJQb2xpY3lTb3VyY2U6OlJlZmVycmVyUG9saWN5QXR0cmlidXRlKS52YWx1ZU9yKFJlZmVycmVy
UG9saWN5OjpFbXB0eVN0cmluZyk7CiAgICAgICAgIGF1dG8gbmV3UmVmZXJyZXJQb2xpY3kgPSBw
YXJzZVJlZmVycmVyUG9saWN5KG5ld1ZhbHVlLCBSZWZlcnJlclBvbGljeVNvdXJjZTo6UmVmZXJy
ZXJQb2xpY3lBdHRyaWJ1dGUpLnZhbHVlT3IoUmVmZXJyZXJQb2xpY3k6OkVtcHR5U3RyaW5nKTsK
ICAgICAgICAgaWYgKG9sZFJlZmVycmVyUG9saWN5ICE9IG5ld1JlZmVycmVyUG9saWN5KQogICAg
ICAgICAgICAgbV9pbWFnZUxvYWRlci0+dXBkYXRlRnJvbUVsZW1lbnRJZ25vcmluZ1ByZXZpb3Vz
RXJyb3IoSW1hZ2VMb2FkZXI6OlJlbGV2YW50TXV0YXRpb246Olllcyk7CisgICAgfSBlbHNlIGlm
IChuYW1lID09IGNyb3Nzb3JpZ2luQXR0cikgeworICAgICAgICBhdXRvIG9sZENyb3Nzb3JpZ2lu
U3RhdGUgPSBvbGRWYWx1ZS5pc051bGwoKSA/ICJlbXB0eSIgOiAoZXF1YWxJZ25vcmluZ0FTQ0lJ
Q2FzZShvbGRWYWx1ZSwgInVzZS1jcmVkZW50aWFscyIpID8gInVzZS1jcmVkZW50aWFscyIgOiAi
YW5vbnltb3VzIik7CisgICAgICAgIGF1dG8gbmV3Q3Jvc3NvcmlnaW5TdGF0ZSA9IG5ld1ZhbHVl
LmlzTnVsbCgpID8gImVtcHR5IiA6IChlcXVhbElnbm9yaW5nQVNDSUlDYXNlKG5ld1ZhbHVlLCAi
dXNlLWNyZWRlbnRpYWxzIikgPyAidXNlLWNyZWRlbnRpYWxzIiA6ICJhbm9ueW1vdXMiKTsKKyAg
ICAgICAgaWYgKG9sZENyb3Nzb3JpZ2luU3RhdGUgIT0gbmV3Q3Jvc3NvcmlnaW5TdGF0ZSkKKyAg
ICAgICAgICAgIG1faW1hZ2VMb2FkZXItPnVwZGF0ZUZyb21FbGVtZW50SWdub3JpbmdQcmV2aW91
c0Vycm9yKEltYWdlTG9hZGVyOjpSZWxldmFudE11dGF0aW9uOjpZZXMpOwogICAgIH0KLQotICAg
IEhUTUxFbGVtZW50OjphdHRyaWJ1dGVDaGFuZ2VkKG5hbWUsIG9sZFZhbHVlLCBuZXdWYWx1ZSwg
cmVhc29uKTsKIH0KIAogdm9pZCBIVE1MSW1hZ2VFbGVtZW50OjpwYXJzZUF0dHJpYnV0ZShjb25z
dCBRdWFsaWZpZWROYW1lJiBuYW1lLCBjb25zdCBBdG9tU3RyaW5nJiB2YWx1ZSkKQEAgLTI1Nyw3
ICsyNjIsNyBAQCB2b2lkIEhUTUxJbWFnZUVsZW1lbnQ6OnBhcnNlQXR0cmlidXRlKGNvbnN0IFF1
YWxpZmllZE5hbWUmIG5hbWUsIGNvbnN0IEF0b21TdHJpbgogICAgICAgICBpZiAoaXM8UmVuZGVy
SW1hZ2U+KHJlbmRlcmVyKCkpKQogICAgICAgICAgICAgZG93bmNhc3Q8UmVuZGVySW1hZ2U+KCpy
ZW5kZXJlcigpKS51cGRhdGVBbHRUZXh0KCk7CiAgICAgfSBlbHNlIGlmIChuYW1lID09IHNyY0F0
dHIgfHwgbmFtZSA9PSBzcmNzZXRBdHRyIHx8IG5hbWUgPT0gc2l6ZXNBdHRyKQotICAgICAgICBz
ZWxlY3RJbWFnZVNvdXJjZSgpOworICAgICAgICBzZWxlY3RJbWFnZVNvdXJjZShJbWFnZUxvYWRl
cjo6UmVsZXZhbnRNdXRhdGlvbjo6WWVzKTsKICAgICBlbHNlIGlmIChuYW1lID09IHVzZW1hcEF0
dHIpIHsKICAgICAgICAgaWYgKGlzSW5UcmVlU2NvcGUoKSAmJiAhbV9wYXJzZWRVc2VtYXAuaXNO
dWxsKCkpCiAgICAgICAgICAgICB0cmVlU2NvcGUoKS5yZW1vdmVJbWFnZUVsZW1lbnRCeVVzZW1h
cCgqbV9wYXJzZWRVc2VtYXAuaW1wbCgpLCAqdGhpcyk7CkBAIC00MDcsNyArNDEyLDcgQEAgTm9k
ZTo6SW5zZXJ0ZWRJbnRvQW5jZXN0b3JSZXN1bHQgSFRNTEltYWdlRWxlbWVudDo6aW5zZXJ0ZWRJ
bnRvQW5jZXN0b3IoSW5zZXJ0aW8KIAogICAgIGlmIChpczxIVE1MUGljdHVyZUVsZW1lbnQ+KHBh
cmVudE5vZGUoKSkpIHsKICAgICAgICAgc2V0UGljdHVyZUVsZW1lbnQoJmRvd25jYXN0PEhUTUxQ
aWN0dXJlRWxlbWVudD4oKnBhcmVudE5vZGUoKSkpOwotICAgICAgICBzZWxlY3RJbWFnZVNvdXJj
ZSgpOworICAgICAgICBzZWxlY3RJbWFnZVNvdXJjZShJbWFnZUxvYWRlcjo6UmVsZXZhbnRNdXRh
dGlvbjo6WWVzKTsKICAgICB9CiAKICAgICAvLyBJZiB3ZSBoYXZlIGJlZW4gaW5zZXJ0ZWQgZnJv
bSBhIHJlbmRlcmVyLWxlc3MgZG9jdW1lbnQsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9o
dG1sL0hUTUxJbWFnZUVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxl
bWVudC5oCmluZGV4IDM2NzUwMGU5ZTZlNTU0Y2I4MWVmMWFlMDVkNTMzYTAxNGQyYTY5MDQuLjQz
NTE3MDVkOTkxNjc3NGIxMGQ2YmY1ZWYwMmVmMDJhY2NjZTA3NzQgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0
bWwvSFRNTEltYWdlRWxlbWVudC5oCkBAIC0yOCw2ICsyOCw3IEBACiAjaW5jbHVkZSAiR3JhcGhp
Y3NMYXllci5oIgogI2luY2x1ZGUgIkdyYXBoaWNzVHlwZXMuaCIKICNpbmNsdWRlICJIVE1MRWxl
bWVudC5oIgorI2luY2x1ZGUgIkltYWdlTG9hZGVyLmgiCiAjaW5jbHVkZSAiTWVkaWFRdWVyeUV2
YWx1YXRvci5oIgogI2luY2x1ZGUgPHd0Zi9XZWFrUHRyLmg+CiAKQEAgLTE4Myw3ICsxODQsNyBA
QCBwcml2YXRlOgogCiAgICAgYm9vbCBpc0ludGVyYWN0aXZlQ29udGVudCgpIGNvbnN0IGZpbmFs
OwogCi0gICAgdm9pZCBzZWxlY3RJbWFnZVNvdXJjZSgpOworICAgIHZvaWQgc2VsZWN0SW1hZ2VT
b3VyY2UoSW1hZ2VMb2FkZXI6OlJlbGV2YW50TXV0YXRpb24pOwogCiAgICAgSW1hZ2VDYW5kaWRh
dGUgYmVzdEZpdFNvdXJjZUZyb21QaWN0dXJlRWxlbWVudCgpOwogCmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViQ29yZS9odG1sL0hUTUxQaWN0dXJlRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9o
dG1sL0hUTUxQaWN0dXJlRWxlbWVudC5jcHAKaW5kZXggMTgwYjViNDk1ODIwNTQ1ZjE2MGY2Yjdl
NTJmN2JmMjU1ODFmOTBlOC4uYzFkYTNjMzk2N2E4ZjQ1NzEzMDY4NzAyMTQ0NDQzOTdjYWI0YTg4
NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGljdHVyZUVsZW1lbnQuY3Bw
CisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBpY3R1cmVFbGVtZW50LmNwcApAQCAtNjAs
NyArNjAsNyBAQCBSZWY8SFRNTFBpY3R1cmVFbGVtZW50PiBIVE1MUGljdHVyZUVsZW1lbnQ6OmNy
ZWF0ZShjb25zdCBRdWFsaWZpZWROYW1lJiB0YWdOYW1lLAogdm9pZCBIVE1MUGljdHVyZUVsZW1l
bnQ6OnNvdXJjZXNDaGFuZ2VkKCkKIHsKICAgICBmb3IgKGF1dG8mIGVsZW1lbnQgOiBjaGlsZHJl
bk9mVHlwZTxIVE1MSW1hZ2VFbGVtZW50PigqdGhpcykpCi0gICAgICAgIGVsZW1lbnQuc2VsZWN0
SW1hZ2VTb3VyY2UoKTsKKyAgICAgICAgZWxlbWVudC5zZWxlY3RJbWFnZVNvdXJjZShJbWFnZUxv
YWRlcjo6UmVsZXZhbnRNdXRhdGlvbjo6WWVzKTsKIH0KIAogI2lmIFVTRShTWVNURU1fUFJFVklF
VykKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlv
dXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IDNiMjgzMWIxZDI5YjQ1YzA5MzBj
ZTk0NDYxMTM2YTUyMmJmYWNlYzguLjE5MzQwNGVjNWNkZTYwYjU5NzlkYTMyN2I0OTM0YjRmYzhl
ZTAzMzcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKKysr
IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisy
MDIwLTA2LTIwICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgSW1hZ2Ug
YGNyb3Nzb3JpZ2luYCBtdXRhdGlvbnMgc2hvdWxkIGJlIGNvbnNpZGVyZWQgInJlbGV2YW50IG11
dGF0aW9ucyIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTIxMzMzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
IFVwZGF0ZSBpbXByb3ZlZCB0ZXN0IHJlc3VsdC4KKworICAgICAgICAqIHdlYi1wbGF0Zm9ybS10
ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1jb250ZW50L3RoZS1pbWctZWxlbWVudC9yZWxl
dmFudC1tdXRhdGlvbnMtZXhwZWN0ZWQudHh0OgorCiAyMDIwLTA2LTEwICBTZXJnaW8gVmlsbGFy
IFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjI2MjI1
ND8pOiBbV1BFXSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnhyL2lkbGhhcm5l
c3MuaHR0cHMud2luZG93Lmh0bWwgaXMgZmFpbGluZwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1j
b250ZW50L3RoZS1pbWctZWxlbWVudC9yZWxldmFudC1tdXRhdGlvbnMtZXhwZWN0ZWQudHh0IGIv
TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGlj
cy9lbWJlZGRlZC1jb250ZW50L3RoZS1pbWctZWxlbWVudC9yZWxldmFudC1tdXRhdGlvbnMtZXhw
ZWN0ZWQudHh0CmluZGV4IDExY2U0NDYzNDgxMWViOTk4MWE4MDIzNGRkMjI3NzNiYWQ3NjlmZmUu
LjBlZWQ0OWYxNTRhZGE5NGIzMTcwNjBlM2RkMjJlODg4NDQwNDIzODQgMTAwNjQ0Ci0tLSBhL0xh
eW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3Mv
ZW1iZWRkZWQtY29udGVudC90aGUtaW1nLWVsZW1lbnQvcmVsZXZhbnQtbXV0YXRpb25zLWV4cGVj
dGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2h0bWwvc2VtYW50aWNzL2VtYmVkZGVkLWNvbnRlbnQvdGhlLWltZy1lbGVtZW50L3JlbGV2YW50
LW11dGF0aW9ucy1leHBlY3RlZC50eHQKQEAgLTEsMTQgKzEsMTQgQEAKIAogUEFTUyBzcmMgc2V0
IAotRkFJTCBzcmMgY2hhbmdlZCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRh
dGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKK1BBU1Mgc3JjIGNoYW5nZWQg
CiBQQVNTIHNyYyByZW1vdmVkIAogUEFTUyBzcmNzZXQgc2V0IAotRkFJTCBzcmNzZXQgY2hhbmdl
ZCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFj
aGVkIHVucmVhY2hhYmxlIGNvZGUKK1BBU1Mgc3Jjc2V0IGNoYW5nZWQgCiBQQVNTIHNyY3NldCBy
ZW1vdmVkIAogUEFTUyBzaXplcyBzZXQgCiBQQVNTIHNpemVzIGNoYW5nZWQgCiBQQVNTIHNpemVz
IHJlbW92ZWQgCi1GQUlMIHNyYyBzZXQgdG8gc2FtZSB2YWx1ZSBhc3NlcnRfdW5yZWFjaGVkOiB1
cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUK
K1BBU1Mgc3JjIHNldCB0byBzYW1lIHZhbHVlIAogUEFTUyBjcm9zc29yaWdpbiBhYnNlbnQgdG8g
ZW1wdHksIHNyYyBhYnNlbnQgCiBQQVNTIGNyb3Nzb3JpZ2luIGFic2VudCB0byBhbm9ueW1vdXMs
IHNyYyBhYnNlbnQgCiBQQVNTIGNyb3Nzb3JpZ2luIGFic2VudCB0byB1c2UtY3JlZGVudGlhbHMs
IHNyYyBhYnNlbnQgCkBAIC0yMCwxNyArMjAsMTcgQEAgUEFTUyBjcm9zc29yaWdpbiB1c2UtY3Jl
ZGVudGlhbHMgdG8gYWJzZW50LCBzcmMgYWJzZW50CiBQQVNTIGNyb3Nzb3JpZ2luIHVzZS1jcmVk
ZW50aWFscyB0byBlbXB0eSwgc3JjIGFic2VudCAKIFBBU1MgY3Jvc3NvcmlnaW4gdXNlLWNyZWRl
bnRpYWxzIHRvIGFub255bW91cywgc3JjIGFic2VudCAKIFBBU1MgY3Jvc3NvcmlnaW4gdXNlLWNy
ZWRlbnRpYWxzIHRvIGludmFsaWQsIHNyYyBhYnNlbnQgCi1GQUlMIGNyb3Nzb3JpZ2luIGFic2Vu
dCB0byBlbXB0eSwgc3JjIGFscmVhZHkgc2V0IGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUg
aW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQotRkFJTCBjcm9z
c29yaWdpbiBhYnNlbnQgdG8gYW5vbnltb3VzLCBzcmMgYWxyZWFkeSBzZXQgYXNzZXJ0X3VucmVh
Y2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJs
ZSBjb2RlCi1GQUlMIGNyb3Nzb3JpZ2luIGFic2VudCB0byB1c2UtY3JlZGVudGlhbHMsIHNyYyBh
bHJlYWR5IHNldCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0
IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKLUZBSUwgY3Jvc3NvcmlnaW4gZW1wdHkgdG8g
YWJzZW50LCBzcmMgYWxyZWFkeSBzZXQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFn
ZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIGNyb3Nzb3Jp
Z2luIGVtcHR5IHRvIHVzZS1jcmVkZW50aWFscywgc3JjIGFscmVhZHkgc2V0IGFzc2VydF91bnJl
YWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFi
bGUgY29kZQotRkFJTCBjcm9zc29yaWdpbiBhbm9ueW1vdXMgdG8gYWJzZW50LCBzcmMgYWxyZWFk
eSBzZXQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4g
UmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIGNyb3Nzb3JpZ2luIGFub255bW91cyB0byB1
c2UtY3JlZGVudGlhbHMsIHNyYyBhbHJlYWR5IHNldCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUg
dGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKLUZBSUwg
Y3Jvc3NvcmlnaW4gdXNlLWNyZWRlbnRpYWxzIHRvIGFic2VudCwgc3JjIGFscmVhZHkgc2V0IGFz
c2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQg
dW5yZWFjaGFibGUgY29kZQotRkFJTCBjcm9zc29yaWdpbiB1c2UtY3JlZGVudGlhbHMgdG8gZW1w
dHksIHNyYyBhbHJlYWR5IHNldCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRh
dGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKLUZBSUwgY3Jvc3NvcmlnaW4g
dXNlLWNyZWRlbnRpYWxzIHRvIGFub255bW91cywgc3JjIGFscmVhZHkgc2V0IGFzc2VydF91bnJl
YWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFi
bGUgY29kZQotRkFJTCBjcm9zc29yaWdpbiB1c2UtY3JlZGVudGlhbHMgdG8gaW52YWxpZCwgc3Jj
IGFscmVhZHkgc2V0IGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRu
J3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQorUEFTUyBjcm9zc29yaWdpbiBhYnNlbnQg
dG8gZW1wdHksIHNyYyBhbHJlYWR5IHNldCAKK1BBU1MgY3Jvc3NvcmlnaW4gYWJzZW50IHRvIGFu
b255bW91cywgc3JjIGFscmVhZHkgc2V0IAorUEFTUyBjcm9zc29yaWdpbiBhYnNlbnQgdG8gdXNl
LWNyZWRlbnRpYWxzLCBzcmMgYWxyZWFkeSBzZXQgCitQQVNTIGNyb3Nzb3JpZ2luIGVtcHR5IHRv
IGFic2VudCwgc3JjIGFscmVhZHkgc2V0IAorUEFTUyBjcm9zc29yaWdpbiBlbXB0eSB0byB1c2Ut
Y3JlZGVudGlhbHMsIHNyYyBhbHJlYWR5IHNldCAKK1BBU1MgY3Jvc3NvcmlnaW4gYW5vbnltb3Vz
IHRvIGFic2VudCwgc3JjIGFscmVhZHkgc2V0IAorUEFTUyBjcm9zc29yaWdpbiBhbm9ueW1vdXMg
dG8gdXNlLWNyZWRlbnRpYWxzLCBzcmMgYWxyZWFkeSBzZXQgCitQQVNTIGNyb3Nzb3JpZ2luIHVz
ZS1jcmVkZW50aWFscyB0byBhYnNlbnQsIHNyYyBhbHJlYWR5IHNldCAKK1BBU1MgY3Jvc3Nvcmln
aW4gdXNlLWNyZWRlbnRpYWxzIHRvIGVtcHR5LCBzcmMgYWxyZWFkeSBzZXQgCitQQVNTIGNyb3Nz
b3JpZ2luIHVzZS1jcmVkZW50aWFscyB0byBhbm9ueW1vdXMsIHNyYyBhbHJlYWR5IHNldCAKK1BB
U1MgY3Jvc3NvcmlnaW4gdXNlLWNyZWRlbnRpYWxzIHRvIGludmFsaWQsIHNyYyBhbHJlYWR5IHNl
dCAKIFBBU1MgcmVmZXJyZXJwb2xpY3kgYWJzZW50IHRvIG5vLXJlZmVycmVyLXdoZW4tZG93bmdy
YWRlLCBzcmMgYWJzZW50IAogUEFTUyByZWZlcnJlcnBvbGljeSBhYnNlbnQgdG8gbm8tcmVmZXJy
ZXIsIHNyYyBhYnNlbnQgCiBQQVNTIHJlZmVycmVycG9saWN5IGVtcHR5IHRvIG5vLXJlZmVycmVy
LXdoZW4tZG93bmdyYWRlLCBzcmMgYWJzZW50IApAQCAtNTUsMjQgKzU1LDI0IEBAIFBBU1MgcmVm
ZXJyZXJwb2xpY3kgbm8tcmVmZXJyZXIgdG8gYWJzZW50LCBzcmMgYWxyZWFkeSBzZXQKIFBBU1Mg
cmVmZXJyZXJwb2xpY3kgbm8tcmVmZXJyZXIgdG8gZW1wdHksIHNyYyBhbHJlYWR5IHNldCAKIFBB
U1MgcmVmZXJyZXJwb2xpY3kgbm8tcmVmZXJyZXIgdG8gbm8tcmVmZXJyZXItd2hlbi1kb3duZ3Jh
ZGUsIHNyYyBhbHJlYWR5IHNldCAKIFBBU1MgcmVmZXJyZXJwb2xpY3kgbm8tcmVmZXJyZXIgdG8g
aW52YWxpZCwgc3JjIGFscmVhZHkgc2V0IAotRkFJTCBpbnNlcnRlZCBpbnRvIHBpY3R1cmUgYXNz
ZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1
bnJlYWNoYWJsZSBjb2RlCitQQVNTIGluc2VydGVkIGludG8gcGljdHVyZSAKIEZBSUwgcmVtb3Zl
ZCBmcm9tIHBpY3R1cmUgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRp
ZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHBhcmVudCBpcyBwaWN0dXJl
LCBwcmV2aW91cyBzb3VyY2UgaW5zZXJ0ZWQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBp
bWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHBhcmVu
dCBpcyBwaWN0dXJlLCBwcmV2aW91cyBzb3VyY2UgcmVtb3ZlZCBhc3NlcnRfdW5yZWFjaGVkOiB1
cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUK
LUZBSUwgcGFyZW50IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNvdXJjZSBoYXMgc3Jjc2V0IHNldCBh
c3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVk
IHVucmVhY2hhYmxlIGNvZGUKLUZBSUwgcGFyZW50IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNvdXJj
ZSBoYXMgc3Jjc2V0IGNoYW5nZWQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBk
YXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHBhcmVudCBpcyBw
aWN0dXJlLCBwcmV2aW91cyBzb3VyY2UgaGFzIHNyY3NldCByZW1vdmVkIGFzc2VydF91bnJlYWNo
ZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUg
Y29kZQotRkFJTCBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyBzaXplcyBz
ZXQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVh
Y2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91cyBz
b3VyY2UgaGFzIHNpemVzIGNoYW5nZWQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFn
ZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHBhcmVudCBp
cyBwaWN0dXJlLCBwcmV2aW91cyBzb3VyY2UgaGFzIHNpemVzIHJlbW92ZWQgYXNzZXJ0X3VucmVh
Y2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJs
ZSBjb2RlCi1GQUlMIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91cyBzb3VyY2UgaGFzIG1lZGlh
IHNldCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBS
ZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKLUZBSUwgcGFyZW50IGlzIHBpY3R1cmUsIHByZXZpb3Vz
IHNvdXJjZSBoYXMgbWVkaWEgY2hhbmdlZCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGlt
YWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKLUZBSUwgcGFyZW50
IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNvdXJjZSBoYXMgbWVkaWEgcmVtb3ZlZCBhc3NlcnRfdW5y
ZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hh
YmxlIGNvZGUKLUZBSUwgcGFyZW50IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNvdXJjZSBoYXMgdHlw
ZSBzZXQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4g
UmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91
cyBzb3VyY2UgaGFzIHR5cGUgY2hhbmdlZCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGlt
YWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKLUZBSUwgcGFyZW50
IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNvdXJjZSBoYXMgdHlwZSByZW1vdmVkIGFzc2VydF91bnJl
YWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFi
bGUgY29kZQotUEFTUyBzcmNzZXQgaXMgc2V0IHRvIHNhbWUgdmFsdWUgCi1QQVNTIHNpemVzIGlz
IHNldCB0byBzYW1lIHZhbHVlIAorUEFTUyBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291
cmNlIGluc2VydGVkIAorUEFTUyBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIHJl
bW92ZWQgCitQQVNTIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91cyBzb3VyY2UgaGFzIHNyY3Nl
dCBzZXQgCitQQVNTIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91cyBzb3VyY2UgaGFzIHNyY3Nl
dCBjaGFuZ2VkIAorUEFTUyBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyBz
cmNzZXQgcmVtb3ZlZCAKK1BBU1MgcGFyZW50IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNvdXJjZSBo
YXMgc2l6ZXMgc2V0IAorUEFTUyBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhh
cyBzaXplcyBjaGFuZ2VkIAorUEFTUyBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNl
IGhhcyBzaXplcyByZW1vdmVkIAorUEFTUyBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291
cmNlIGhhcyBtZWRpYSBzZXQgCitQQVNTIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91cyBzb3Vy
Y2UgaGFzIG1lZGlhIGNoYW5nZWQgCitQQVNTIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91cyBz
b3VyY2UgaGFzIG1lZGlhIHJlbW92ZWQgCitQQVNTIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91
cyBzb3VyY2UgaGFzIHR5cGUgc2V0IAorUEFTUyBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMg
c291cmNlIGhhcyB0eXBlIGNoYW5nZWQgCitQQVNTIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91
cyBzb3VyY2UgaGFzIHR5cGUgcmVtb3ZlZCAKK0ZBSUwgc3Jjc2V0IGlzIHNldCB0byBzYW1lIHZh
bHVlIGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSB3YXMgcnVuIFJlYWNo
ZWQgdW5yZWFjaGFibGUgY29kZQorRkFJTCBzaXplcyBpcyBzZXQgdG8gc2FtZSB2YWx1ZSBhc3Nl
cnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgd2FzIHJ1biBSZWFjaGVkIHVucmVh
Y2hhYmxlIGNvZGUKIFBBU1MgY3Jvc3NvcmlnaW4gc3RhdGUgbm90IGNoYW5nZWQ6IGFic2VudCwg
cmVtb3ZlQXR0cmlidXRlIAogUEFTUyBjcm9zc29yaWdpbiBzdGF0ZSBub3QgY2hhbmdlZDogZW1w
dHkgdG8gYW5vbnltb3VzIAogUEFTUyBjcm9zc29yaWdpbiBzdGF0ZSBub3QgY2hhbmdlZDogYW5v
bnltb3VzIHRvIGZvb2JhciAKQEAgLTg5LDkgKzg5LDkgQEAgUEFTUyBhbmNlc3RvciBwaWN0dXJl
IGhhcyBhIHNvdXJjZSBpbnNlcnRlZAogUEFTUyBhbmNlc3RvciBwaWN0dXJlIGhhcyBhIHNvdXJj
ZSByZW1vdmVkIAogUEFTUyBhbmNlc3RvciBwaWN0dXJlOyBwcmV2aW91cyBzaWJsaW5nIHNvdXJj
ZSBpbnNlcnRlZCAKIFBBU1MgYW5jZXN0b3IgcGljdHVyZTsgcHJldmlvdXMgc2libGluZyBzb3Vy
Y2UgcmVtb3ZlZCAKLVBBU1MgcGFyZW50IGlzIHBpY3R1cmUsIGZvbGxvd2luZyBzaWJsaW5nIHNv
dXJjZSBpbnNlcnRlZCAKLVBBU1MgcGFyZW50IGlzIHBpY3R1cmUsIGZvbGxvd2luZyBzaWJsaW5n
IHNvdXJjZSByZW1vdmVkIAotUEFTUyBwYXJlbnQgaXMgcGljdHVyZSwgZm9sbG93aW5nIHNpYmxp
bmcgc291cmNlIGhhcyBzcmNzZXQgc2V0IAorRkFJTCBwYXJlbnQgaXMgcGljdHVyZSwgZm9sbG93
aW5nIHNpYmxpbmcgc291cmNlIGluc2VydGVkIGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUg
aW1hZ2UgZGF0YSB3YXMgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQorRkFJTCBwYXJlbnQg
aXMgcGljdHVyZSwgZm9sbG93aW5nIHNpYmxpbmcgc291cmNlIHJlbW92ZWQgYXNzZXJ0X3VucmVh
Y2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIHdhcyBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBj
b2RlCitGQUlMIHBhcmVudCBpcyBwaWN0dXJlLCBmb2xsb3dpbmcgc2libGluZyBzb3VyY2UgaGFz
IHNyY3NldCBzZXQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIHdhcyBy
dW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCiBQQVNTIG1lZGlhIG9uIGltZyBzZXQgCiBQQVNT
IHR5cGUgb24gaW1nIHNldCAKIFBBU1MgY2xhc3Mgb24gaW1nIHNldCAKQEAgLTk5LDEwICs5OSwx
MCBAQCBQQVNTIGFsdCBvbiBpbWcgc2V0CiBQQVNTIHNyYyBvbiBwcmV2aW91cyBzaWJsaW5nIHNv
dXJjZSBzZXQgCiBQQVNTIGNsYXNzIG9uIHByZXZpb3VzIHNpYmxpbmcgc291cmNlIHNldCAKIFBB
U1MgaW5zZXJ0ZWQvcmVtb3ZlZCBjaGlsZHJlbiBvZiBpbWcgCi1QQVNTIHBpY3R1cmUgaXMgaW5z
ZXJ0ZWQ7IGltZyBoYXMgc3JjIAotUEFTUyBwaWN0dXJlIGlzIGluc2VydGVkOyBpbWcgaGFzIHNy
Y3NldCAKLVBBU1MgcGljdHVyZSBpcyBpbnNlcnRlZDsgaW1nIGhhcyBwcmV2aW91cyBzaWJsaW5n
IHNvdXJjZSAKLVBBU1MgcGljdHVyZSBpcyBpbnNlcnRlZDsgaW1nIGhhcyBmb2xsb3dpbmcgc2li
bGluZyBzb3VyY2UgCitGQUlMIHBpY3R1cmUgaXMgaW5zZXJ0ZWQ7IGltZyBoYXMgc3JjIGFzc2Vy
dF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSB3YXMgcnVuIFJlYWNoZWQgdW5yZWFj
aGFibGUgY29kZQorRkFJTCBwaWN0dXJlIGlzIGluc2VydGVkOyBpbWcgaGFzIHNyY3NldCBhc3Nl
cnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgd2FzIHJ1biBSZWFjaGVkIHVucmVh
Y2hhYmxlIGNvZGUKK0ZBSUwgcGljdHVyZSBpcyBpbnNlcnRlZDsgaW1nIGhhcyBwcmV2aW91cyBz
aWJsaW5nIHNvdXJjZSBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgd2Fz
IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKK0ZBSUwgcGljdHVyZSBpcyBpbnNlcnRlZDsg
aW1nIGhhcyBmb2xsb3dpbmcgc2libGluZyBzb3VyY2UgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRl
IHRoZSBpbWFnZSBkYXRhIHdhcyBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCiBQQVNTIHBp
Y3R1cmUgaXMgcmVtb3ZlZDsgaW1nIGhhcyBzcmMgCiBQQVNTIHBpY3R1cmUgaXMgcmVtb3ZlZDsg
aW1nIGhhcyBzcmNzZXQgCiBQQVNTIHBpY3R1cmUgaXMgcmVtb3ZlZDsgaW1nIGhhcyBwcmV2aW91
cyBzaWJsaW5nIHNvdXJjZSAK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402396</attachid>
            <date>2020-06-20 12:17:40 -0700</date>
            <delta_ts>2020-06-21 06:13:18 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213335-20200620211739.patch</filename>
            <type>text/plain</type>
            <size>17050</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMzE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzMwNGYxM2JkY2E2MDI0
ZTFhNGY0NzUzNjcxOWY0MDNhMTJjYmI3ZS4uNDVmNjE2NDUyNmYxNjJlZWRhMzU5Y2I5M2RjMTEx
NGIzMGYzNzMyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTA2LTIwICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgSW1hZ2UgYGNyb3Nzb3JpZ2luYCBt
dXRhdGlvbnMgc2hvdWxkIGJlIGNvbnNpZGVyZWQgInJlbGV2YW50IG11dGF0aW9ucyIKKyAgICAg
ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzMzNQorCisgICAg
ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1iZWRkZWQtY29udGVudC90
aGUtaW1nLWVsZW1lbnQvcmVsZXZhbnQtbXV0YXRpb25zLmh0bWwKKworICAgICAgICAqIGh0bWwv
SFRNTEltYWdlRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MSW1hZ2VFbGVtZW50
OjpldmFsdWF0ZUR5bmFtaWNNZWRpYVF1ZXJ5RGVwZW5kZW5jaWVzKToKKyAgICAgICAgKFdlYkNv
cmU6OkhUTUxJbWFnZUVsZW1lbnQ6OnNlbGVjdEltYWdlU291cmNlKToKKyAgICAgICAgKFdlYkNv
cmU6OkhUTUxJbWFnZUVsZW1lbnQ6OmF0dHJpYnV0ZUNoYW5nZWQpOgorICAgICAgICAoV2ViQ29y
ZTo6SFRNTEltYWdlRWxlbWVudDo6cGFyc2VBdHRyaWJ1dGUpOgorICAgICAgICAoV2ViQ29yZTo6
SFRNTEltYWdlRWxlbWVudDo6aW5zZXJ0ZWRJbnRvQW5jZXN0b3IpOgorICAgICAgICAqIGh0bWwv
SFRNTEltYWdlRWxlbWVudC5oOgorICAgICAgICAqIGh0bWwvSFRNTFBpY3R1cmVFbGVtZW50LmNw
cDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxQaWN0dXJlRWxlbWVudDo6c291cmNlc0NoYW5nZWQp
OgorCiAyMDIwLTA2LTE5ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAg
ICAgW0NvY29hXSBEZWxheSBpc3N1aW5nIE1hbmFnZWRTZXNzaW9uICYgTmV0d29yayBFeHRlbnNp
b24gc2FuZGJveCBleHRlbnNpb25zIHVudGlsIGEgbG9hZCBpcyBhY3R1YWxseSBpc3N1ZWQKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5jcHAgYi9Tb3Vy
Y2UvV2ViQ29yZS9odG1sL0hUTUxJbWFnZUVsZW1lbnQuY3BwCmluZGV4IGYxZmQ2MjFiNmQzNmU4
NWQwZGI2NjY3ZjlhYTgwMjhhODhlY2UwYzAuLmUxZDE3MzIyNjQ4NWE0MGQ4MDZiMzAxZDRjOGIz
OWFhYjdhOWI2NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxl
bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW1hZ2VFbGVtZW50LmNwcApA
QCAtMTY2LDYgKzE2Niw4IEBAIEltYWdlQ2FuZGlkYXRlIEhUTUxJbWFnZUVsZW1lbnQ6OmJlc3RG
aXRTb3VyY2VGcm9tUGljdHVyZUVsZW1lbnQoKQogICAgIEltYWdlQ2FuZGlkYXRlIGNhbmRpZGF0
ZTsKIAogICAgIGZvciAoUmVmUHRyPE5vZGU+IGNoaWxkID0gcGljdHVyZS0+Zmlyc3RDaGlsZCgp
OyBjaGlsZCAmJiBjaGlsZCAhPSB0aGlzOyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGluZygpKSB7
CisgICAgICAgIGlmIChjaGlsZC5nZXQoKSA9PSB0aGlzKQorICAgICAgICAgICAgcmV0dXJuIHsg
fTsKICAgICAgICAgaWYgKCFpczxIVE1MU291cmNlRWxlbWVudD4oKmNoaWxkKSkKICAgICAgICAg
ICAgIGNvbnRpbnVlOwogICAgICAgICBhdXRvJiBzb3VyY2UgPSBkb3duY2FzdDxIVE1MU291cmNl
RWxlbWVudD4oKmNoaWxkKTsKQEAgLTIxMSwxMCArMjEzLDEwIEBAIHZvaWQgSFRNTEltYWdlRWxl
bWVudDo6ZXZhbHVhdGVEeW5hbWljTWVkaWFRdWVyeURlcGVuZGVuY2llcygpCiAgICAgaWYgKCFl
dmFsdWF0b3IuZXZhbHVhdGVGb3JDaGFuZ2VzKG1fbWVkaWFRdWVyeUR5bmFtaWNSZXN1bHRzKSkK
ICAgICAgICAgcmV0dXJuOwogCi0gICAgc2VsZWN0SW1hZ2VTb3VyY2UoKTsKKyAgICBzZWxlY3RJ
bWFnZVNvdXJjZShJbWFnZUxvYWRlcjo6UmVsZXZhbnRNdXRhdGlvbjo6Tm8pOwogfQogCi12b2lk
IEhUTUxJbWFnZUVsZW1lbnQ6OnNlbGVjdEltYWdlU291cmNlKCkKK3ZvaWQgSFRNTEltYWdlRWxl
bWVudDo6c2VsZWN0SW1hZ2VTb3VyY2UoSW1hZ2VMb2FkZXI6OlJlbGV2YW50TXV0YXRpb24gcmVs
ZXZhbnRNdXRhdGlvbikKIHsKICAgICBtX21lZGlhUXVlcnlEeW5hbWljUmVzdWx0cyA9IHsgfTsK
ICAgICBkb2N1bWVudCgpLnJlbW92ZUR5bmFtaWNNZWRpYVF1ZXJ5RGVwZW5kZW50SW1hZ2UoKnRo
aXMpOwpAQCAtMjI4LDcgKzIzMCw3IEBAIHZvaWQgSFRNTEltYWdlRWxlbWVudDo6c2VsZWN0SW1h
Z2VTb3VyY2UoKQogICAgICAgICBjYW5kaWRhdGUgPSBiZXN0Rml0U291cmNlRm9ySW1hZ2VBdHRy
aWJ1dGVzKGRvY3VtZW50KCkuZGV2aWNlU2NhbGVGYWN0b3IoKSwgYXR0cmlidXRlV2l0aG91dFN5
bmNocm9uaXphdGlvbihzcmNBdHRyKSwgYXR0cmlidXRlV2l0aG91dFN5bmNocm9uaXphdGlvbihz
cmNzZXRBdHRyKSwgc291cmNlU2l6ZSk7CiAgICAgfQogICAgIHNldEJlc3RGaXRVUkxBbmREUFJG
cm9tSW1hZ2VDYW5kaWRhdGUoY2FuZGlkYXRlKTsKLSAgICBtX2ltYWdlTG9hZGVyLT51cGRhdGVG
cm9tRWxlbWVudElnbm9yaW5nUHJldmlvdXNFcnJvcigpOworICAgIG1faW1hZ2VMb2FkZXItPnVw
ZGF0ZUZyb21FbGVtZW50SWdub3JpbmdQcmV2aW91c0Vycm9yKHJlbGV2YW50TXV0YXRpb24pOwog
CiAgICAgaWYgKCFtX21lZGlhUXVlcnlEeW5hbWljUmVzdWx0cy5pc0VtcHR5KCkpCiAgICAgICAg
IGRvY3VtZW50KCkuYWRkRHluYW1pY01lZGlhUXVlcnlEZXBlbmRlbnRJbWFnZSgqdGhpcyk7CkBA
IC0yNDEsMTQgKzI0MywxOSBAQCBib29sIEhUTUxJbWFnZUVsZW1lbnQ6Omhhc0xhenlMb2FkYWJs
ZUF0dHJpYnV0ZVZhbHVlKGNvbnN0IEF0b21TdHJpbmcmIGF0dHJpYnV0ZQogCiB2b2lkIEhUTUxJ
bWFnZUVsZW1lbnQ6OmF0dHJpYnV0ZUNoYW5nZWQoY29uc3QgUXVhbGlmaWVkTmFtZSYgbmFtZSwg
Y29uc3QgQXRvbVN0cmluZyYgb2xkVmFsdWUsIGNvbnN0IEF0b21TdHJpbmcmIG5ld1ZhbHVlLCBB
dHRyaWJ1dGVNb2RpZmljYXRpb25SZWFzb24gcmVhc29uKQogeworICAgIEhUTUxFbGVtZW50Ojph
dHRyaWJ1dGVDaGFuZ2VkKG5hbWUsIG9sZFZhbHVlLCBuZXdWYWx1ZSwgcmVhc29uKTsKKwogICAg
IGlmIChuYW1lID09IHJlZmVycmVycG9saWN5QXR0ciAmJiBSdW50aW1lRW5hYmxlZEZlYXR1cmVz
OjpzaGFyZWRGZWF0dXJlcygpLnJlZmVycmVyUG9saWN5QXR0cmlidXRlRW5hYmxlZCgpKSB7CiAg
ICAgICAgIGF1dG8gb2xkUmVmZXJyZXJQb2xpY3kgPSBwYXJzZVJlZmVycmVyUG9saWN5KG9sZFZh
bHVlLCBSZWZlcnJlclBvbGljeVNvdXJjZTo6UmVmZXJyZXJQb2xpY3lBdHRyaWJ1dGUpLnZhbHVl
T3IoUmVmZXJyZXJQb2xpY3k6OkVtcHR5U3RyaW5nKTsKICAgICAgICAgYXV0byBuZXdSZWZlcnJl
clBvbGljeSA9IHBhcnNlUmVmZXJyZXJQb2xpY3kobmV3VmFsdWUsIFJlZmVycmVyUG9saWN5U291
cmNlOjpSZWZlcnJlclBvbGljeUF0dHJpYnV0ZSkudmFsdWVPcihSZWZlcnJlclBvbGljeTo6RW1w
dHlTdHJpbmcpOwogICAgICAgICBpZiAob2xkUmVmZXJyZXJQb2xpY3kgIT0gbmV3UmVmZXJyZXJQ
b2xpY3kpCiAgICAgICAgICAgICBtX2ltYWdlTG9hZGVyLT51cGRhdGVGcm9tRWxlbWVudElnbm9y
aW5nUHJldmlvdXNFcnJvcihJbWFnZUxvYWRlcjo6UmVsZXZhbnRNdXRhdGlvbjo6WWVzKTsKKyAg
ICB9IGVsc2UgaWYgKG5hbWUgPT0gY3Jvc3NvcmlnaW5BdHRyKSB7CisgICAgICAgIGF1dG8gb2xk
Q3Jvc3NvcmlnaW5TdGF0ZSA9IG9sZFZhbHVlLmlzTnVsbCgpID8gImVtcHR5IiA6IChlcXVhbEln
bm9yaW5nQVNDSUlDYXNlKG9sZFZhbHVlLCAidXNlLWNyZWRlbnRpYWxzIikgPyAidXNlLWNyZWRl
bnRpYWxzIiA6ICJhbm9ueW1vdXMiKTsKKyAgICAgICAgYXV0byBuZXdDcm9zc29yaWdpblN0YXRl
ID0gbmV3VmFsdWUuaXNOdWxsKCkgPyAiZW1wdHkiIDogKGVxdWFsSWdub3JpbmdBU0NJSUNhc2Uo
bmV3VmFsdWUsICJ1c2UtY3JlZGVudGlhbHMiKSA/ICJ1c2UtY3JlZGVudGlhbHMiIDogImFub255
bW91cyIpOworICAgICAgICBpZiAob2xkQ3Jvc3NvcmlnaW5TdGF0ZSAhPSBuZXdDcm9zc29yaWdp
blN0YXRlKQorICAgICAgICAgICAgbV9pbWFnZUxvYWRlci0+dXBkYXRlRnJvbUVsZW1lbnRJZ25v
cmluZ1ByZXZpb3VzRXJyb3IoSW1hZ2VMb2FkZXI6OlJlbGV2YW50TXV0YXRpb246Olllcyk7CiAg
ICAgfQotCi0gICAgSFRNTEVsZW1lbnQ6OmF0dHJpYnV0ZUNoYW5nZWQobmFtZSwgb2xkVmFsdWUs
IG5ld1ZhbHVlLCByZWFzb24pOwogfQogCiB2b2lkIEhUTUxJbWFnZUVsZW1lbnQ6OnBhcnNlQXR0
cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmIG5hbWUsIGNvbnN0IEF0b21TdHJpbmcmIHZhbHVl
KQpAQCAtMjU3LDcgKzI2NCw3IEBAIHZvaWQgSFRNTEltYWdlRWxlbWVudDo6cGFyc2VBdHRyaWJ1
dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYgbmFtZSwgY29uc3QgQXRvbVN0cmluCiAgICAgICAgIGlm
IChpczxSZW5kZXJJbWFnZT4ocmVuZGVyZXIoKSkpCiAgICAgICAgICAgICBkb3duY2FzdDxSZW5k
ZXJJbWFnZT4oKnJlbmRlcmVyKCkpLnVwZGF0ZUFsdFRleHQoKTsKICAgICB9IGVsc2UgaWYgKG5h
bWUgPT0gc3JjQXR0ciB8fCBuYW1lID09IHNyY3NldEF0dHIgfHwgbmFtZSA9PSBzaXplc0F0dHIp
Ci0gICAgICAgIHNlbGVjdEltYWdlU291cmNlKCk7CisgICAgICAgIHNlbGVjdEltYWdlU291cmNl
KEltYWdlTG9hZGVyOjpSZWxldmFudE11dGF0aW9uOjpZZXMpOwogICAgIGVsc2UgaWYgKG5hbWUg
PT0gdXNlbWFwQXR0cikgewogICAgICAgICBpZiAoaXNJblRyZWVTY29wZSgpICYmICFtX3BhcnNl
ZFVzZW1hcC5pc051bGwoKSkKICAgICAgICAgICAgIHRyZWVTY29wZSgpLnJlbW92ZUltYWdlRWxl
bWVudEJ5VXNlbWFwKCptX3BhcnNlZFVzZW1hcC5pbXBsKCksICp0aGlzKTsKQEAgLTQwNSw5ICs0
MTIsMTMgQEAgTm9kZTo6SW5zZXJ0ZWRJbnRvQW5jZXN0b3JSZXN1bHQgSFRNTEltYWdlRWxlbWVu
dDo6aW5zZXJ0ZWRJbnRvQW5jZXN0b3IoSW5zZXJ0aW8KICAgICBpZiAoaW5zZXJ0aW9uVHlwZS50
cmVlU2NvcGVDaGFuZ2VkICYmICFtX3BhcnNlZFVzZW1hcC5pc051bGwoKSkKICAgICAgICAgdHJl
ZVNjb3BlKCkuYWRkSW1hZ2VFbGVtZW50QnlVc2VtYXAoKm1fcGFyc2VkVXNlbWFwLmltcGwoKSwg
KnRoaXMpOwogCi0gICAgaWYgKGlzPEhUTUxQaWN0dXJlRWxlbWVudD4ocGFyZW50Tm9kZSgpKSkg
ewotICAgICAgICBzZXRQaWN0dXJlRWxlbWVudCgmZG93bmNhc3Q8SFRNTFBpY3R1cmVFbGVtZW50
PigqcGFyZW50Tm9kZSgpKSk7Ci0gICAgICAgIHNlbGVjdEltYWdlU291cmNlKCk7CisgICAgaWYg
KGlzPEhUTUxQaWN0dXJlRWxlbWVudD4oJnBhcmVudE9mSW5zZXJ0ZWRUcmVlKSkgeworICAgICAg
ICBzZXRQaWN0dXJlRWxlbWVudCgmZG93bmNhc3Q8SFRNTFBpY3R1cmVFbGVtZW50PihwYXJlbnRP
Zkluc2VydGVkVHJlZSkpOworICAgICAgICBhdXRvIGNhbmRpZGF0ZSA9IGJlc3RGaXRTb3VyY2VG
cm9tUGljdHVyZUVsZW1lbnQoKTsKKyAgICAgICAgaWYgKCFjYW5kaWRhdGUuaXNFbXB0eSgpKSB7
CisgICAgICAgICAgICBzZXRCZXN0Rml0VVJMQW5kRFBSRnJvbUltYWdlQ2FuZGlkYXRlKGNhbmRp
ZGF0ZSk7CisgICAgICAgICAgICBtX2ltYWdlTG9hZGVyLT51cGRhdGVGcm9tRWxlbWVudElnbm9y
aW5nUHJldmlvdXNFcnJvcihJbWFnZUxvYWRlcjo6UmVsZXZhbnRNdXRhdGlvbjo6WWVzKTsKKyAg
ICAgICAgfQogICAgIH0KIAogICAgIC8vIElmIHdlIGhhdmUgYmVlbiBpbnNlcnRlZCBmcm9tIGEg
cmVuZGVyZXItbGVzcyBkb2N1bWVudCwKQEAgLTQzMiw4ICs0NDMsMTEgQEAgdm9pZCBIVE1MSW1h
Z2VFbGVtZW50OjpyZW1vdmVkRnJvbUFuY2VzdG9yKFJlbW92YWxUeXBlIHJlbW92YWxUeXBlLCBD
b250YWluZXJOb2QKICAgICBpZiAocmVtb3ZhbFR5cGUudHJlZVNjb3BlQ2hhbmdlZCAmJiAhbV9w
YXJzZWRVc2VtYXAuaXNOdWxsKCkpCiAgICAgICAgIG9sZFBhcmVudE9mUmVtb3ZlZFRyZWUudHJl
ZVNjb3BlKCkucmVtb3ZlSW1hZ2VFbGVtZW50QnlVc2VtYXAoKm1fcGFyc2VkVXNlbWFwLmltcGwo
KSwgKnRoaXMpOwogCi0gICAgaWYgKGlzPEhUTUxQaWN0dXJlRWxlbWVudD4ocGFyZW50Tm9kZSgp
KSkKKyAgICBpZiAoaXM8SFRNTFBpY3R1cmVFbGVtZW50PihwYXJlbnROb2RlKCkpKSB7CiAgICAg
ICAgIHNldFBpY3R1cmVFbGVtZW50KG51bGxwdHIpOworICAgICAgICBpZiAoIXJlbW92YWxUeXBl
LmRpc2Nvbm5lY3RlZEZyb21Eb2N1bWVudCkKKyAgICAgICAgICAgIG1faW1hZ2VMb2FkZXItPnVw
ZGF0ZUZyb21FbGVtZW50SWdub3JpbmdQcmV2aW91c0Vycm9yKEltYWdlTG9hZGVyOjpSZWxldmFu
dE11dGF0aW9uOjpZZXMpOworICAgIH0KIAogICAgIGlmIChyZW1vdmFsVHlwZS5kaXNjb25uZWN0
ZWRGcm9tRG9jdW1lbnQpCiAgICAgICAgIHVwZGF0ZUVkaXRhYmxlSW1hZ2UoKTsKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5oIGIvU291cmNlL1dlYkNv
cmUvaHRtbC9IVE1MSW1hZ2VFbGVtZW50LmgKaW5kZXggMzY3NTAwZTllNmU1NTRjYjgxZWYxYWUw
NWQ1MzNhMDE0ZDJhNjkwNC4uNDM1MTcwNWQ5OTE2Nzc0YjEwZDZiZjVlZjAyZWYwMmFjY2NlMDc3
NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW1hZ2VFbGVtZW50LmgKKysr
IGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW1hZ2VFbGVtZW50LmgKQEAgLTI4LDYgKzI4LDcg
QEAKICNpbmNsdWRlICJHcmFwaGljc0xheWVyLmgiCiAjaW5jbHVkZSAiR3JhcGhpY3NUeXBlcy5o
IgogI2luY2x1ZGUgIkhUTUxFbGVtZW50LmgiCisjaW5jbHVkZSAiSW1hZ2VMb2FkZXIuaCIKICNp
bmNsdWRlICJNZWRpYVF1ZXJ5RXZhbHVhdG9yLmgiCiAjaW5jbHVkZSA8d3RmL1dlYWtQdHIuaD4K
IApAQCAtMTgzLDcgKzE4NCw3IEBAIHByaXZhdGU6CiAKICAgICBib29sIGlzSW50ZXJhY3RpdmVD
b250ZW50KCkgY29uc3QgZmluYWw7CiAKLSAgICB2b2lkIHNlbGVjdEltYWdlU291cmNlKCk7Cisg
ICAgdm9pZCBzZWxlY3RJbWFnZVNvdXJjZShJbWFnZUxvYWRlcjo6UmVsZXZhbnRNdXRhdGlvbik7
CiAKICAgICBJbWFnZUNhbmRpZGF0ZSBiZXN0Rml0U291cmNlRnJvbVBpY3R1cmVFbGVtZW50KCk7
CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBpY3R1cmVFbGVtZW50LmNw
cCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBpY3R1cmVFbGVtZW50LmNwcAppbmRleCAxODBi
NWI0OTU4MjA1NDVmMTYwZjZiN2U1MmY3YmYyNTU4MWY5MGU4Li5jMWRhM2MzOTY3YThmNDU3MTMw
Njg3MDIxNDQ0NDM5N2NhYjRhODg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU
TUxQaWN0dXJlRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGljdHVy
ZUVsZW1lbnQuY3BwCkBAIC02MCw3ICs2MCw3IEBAIFJlZjxIVE1MUGljdHVyZUVsZW1lbnQ+IEhU
TUxQaWN0dXJlRWxlbWVudDo6Y3JlYXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmIHRhZ05hbWUsCiB2
b2lkIEhUTUxQaWN0dXJlRWxlbWVudDo6c291cmNlc0NoYW5nZWQoKQogewogICAgIGZvciAoYXV0
byYgZWxlbWVudCA6IGNoaWxkcmVuT2ZUeXBlPEhUTUxJbWFnZUVsZW1lbnQ+KCp0aGlzKSkKLSAg
ICAgICAgZWxlbWVudC5zZWxlY3RJbWFnZVNvdXJjZSgpOworICAgICAgICBlbGVtZW50LnNlbGVj
dEltYWdlU291cmNlKEltYWdlTG9hZGVyOjpSZWxldmFudE11dGF0aW9uOjpZZXMpOwogfQogCiAj
aWYgVVNFKFNZU1RFTV9QUkVWSUVXKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv
dzNjL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXgg
NjMyZTJjY2E2YWQ0OWY1MTA5NGUwZTYxNTg1ZDU3Zjc4M2I3YWVmZi4uZjVkYmU0OWJhMTk5Njk3
M2NlZmY3ODgzM2YyNDZlNjdhNDIwMzU4YyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0
ZWQvdzNjL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9n
CkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMDYtMjAgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNv
bT4KKworICAgICAgICBJbWFnZSBgY3Jvc3NvcmlnaW5gIG11dGF0aW9ucyBzaG91bGQgYmUgY29u
c2lkZXJlZCAicmVsZXZhbnQgbXV0YXRpb25zIgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEzMzM1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIGltcHJvdmVkIHRlc3QgcmVzdWx0LgorCisgICAg
ICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL2VtYmVkZGVkLWNvbnRlbnQv
dGhlLWltZy1lbGVtZW50L3JlbGV2YW50LW11dGF0aW9ucy1leHBlY3RlZC50eHQ6CisKIDIwMjAt
MDYtMTkgIENsYXJrIFdhbmcgIDxjbGFya193YW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1v
dmUgc2V0VmVsb2NpdHkoKSBmcm9tIFBhbm5lck5vZGUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz
L2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1iZWRkZWQt
Y29udGVudC90aGUtaW1nLWVsZW1lbnQvcmVsZXZhbnQtbXV0YXRpb25zLWV4cGVjdGVkLnR4dCBi
L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRp
Y3MvZW1iZWRkZWQtY29udGVudC90aGUtaW1nLWVsZW1lbnQvcmVsZXZhbnQtbXV0YXRpb25zLWV4
cGVjdGVkLnR4dAppbmRleCAxMWNlNDQ2MzQ4MTFlYjk5ODFhODAyMzRkZDIyNzczYmFkNzY5ZmZl
Li5jZmZhNWIxODg5ZGY4N2Y4MmJkYWQ1ZWZlOTFjOTJlOWM2MGZiN2RmIDEwMDY0NAotLS0gYS9M
YXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNz
L2VtYmVkZGVkLWNvbnRlbnQvdGhlLWltZy1lbGVtZW50L3JlbGV2YW50LW11dGF0aW9ucy1leHBl
Y3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1jb250ZW50L3RoZS1pbWctZWxlbWVudC9yZWxldmFu
dC1tdXRhdGlvbnMtZXhwZWN0ZWQudHh0CkBAIC0xLDE0ICsxLDE0IEBACiAKIFBBU1Mgc3JjIHNl
dCAKLUZBSUwgc3JjIGNoYW5nZWQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBk
YXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCitQQVNTIHNyYyBjaGFuZ2Vk
IAogUEFTUyBzcmMgcmVtb3ZlZCAKIFBBU1Mgc3Jjc2V0IHNldCAKLUZBSUwgc3Jjc2V0IGNoYW5n
ZWQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVh
Y2hlZCB1bnJlYWNoYWJsZSBjb2RlCitQQVNTIHNyY3NldCBjaGFuZ2VkIAogUEFTUyBzcmNzZXQg
cmVtb3ZlZCAKIFBBU1Mgc2l6ZXMgc2V0IAogUEFTUyBzaXplcyBjaGFuZ2VkIAogUEFTUyBzaXpl
cyByZW1vdmVkIAotRkFJTCBzcmMgc2V0IHRvIHNhbWUgdmFsdWUgYXNzZXJ0X3VucmVhY2hlZDog
dXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2Rl
CitQQVNTIHNyYyBzZXQgdG8gc2FtZSB2YWx1ZSAKIFBBU1MgY3Jvc3NvcmlnaW4gYWJzZW50IHRv
IGVtcHR5LCBzcmMgYWJzZW50IAogUEFTUyBjcm9zc29yaWdpbiBhYnNlbnQgdG8gYW5vbnltb3Vz
LCBzcmMgYWJzZW50IAogUEFTUyBjcm9zc29yaWdpbiBhYnNlbnQgdG8gdXNlLWNyZWRlbnRpYWxz
LCBzcmMgYWJzZW50IApAQCAtMjAsMTcgKzIwLDE3IEBAIFBBU1MgY3Jvc3NvcmlnaW4gdXNlLWNy
ZWRlbnRpYWxzIHRvIGFic2VudCwgc3JjIGFic2VudAogUEFTUyBjcm9zc29yaWdpbiB1c2UtY3Jl
ZGVudGlhbHMgdG8gZW1wdHksIHNyYyBhYnNlbnQgCiBQQVNTIGNyb3Nzb3JpZ2luIHVzZS1jcmVk
ZW50aWFscyB0byBhbm9ueW1vdXMsIHNyYyBhYnNlbnQgCiBQQVNTIGNyb3Nzb3JpZ2luIHVzZS1j
cmVkZW50aWFscyB0byBpbnZhbGlkLCBzcmMgYWJzZW50IAotRkFJTCBjcm9zc29yaWdpbiBhYnNl
bnQgdG8gZW1wdHksIHNyYyBhbHJlYWR5IHNldCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhl
IGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKLUZBSUwgY3Jv
c3NvcmlnaW4gYWJzZW50IHRvIGFub255bW91cywgc3JjIGFscmVhZHkgc2V0IGFzc2VydF91bnJl
YWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFi
bGUgY29kZQotRkFJTCBjcm9zc29yaWdpbiBhYnNlbnQgdG8gdXNlLWNyZWRlbnRpYWxzLCBzcmMg
YWxyZWFkeSBzZXQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4n
dCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIGNyb3Nzb3JpZ2luIGVtcHR5IHRv
IGFic2VudCwgc3JjIGFscmVhZHkgc2V0IGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1h
Z2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQotRkFJTCBjcm9zc29y
aWdpbiBlbXB0eSB0byB1c2UtY3JlZGVudGlhbHMsIHNyYyBhbHJlYWR5IHNldCBhc3NlcnRfdW5y
ZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hh
YmxlIGNvZGUKLUZBSUwgY3Jvc3NvcmlnaW4gYW5vbnltb3VzIHRvIGFic2VudCwgc3JjIGFscmVh
ZHkgc2V0IGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVu
IFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQotRkFJTCBjcm9zc29yaWdpbiBhbm9ueW1vdXMgdG8g
dXNlLWNyZWRlbnRpYWxzLCBzcmMgYWxyZWFkeSBzZXQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRl
IHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlM
IGNyb3Nzb3JpZ2luIHVzZS1jcmVkZW50aWFscyB0byBhYnNlbnQsIHNyYyBhbHJlYWR5IHNldCBh
c3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVk
IHVucmVhY2hhYmxlIGNvZGUKLUZBSUwgY3Jvc3NvcmlnaW4gdXNlLWNyZWRlbnRpYWxzIHRvIGVt
cHR5LCBzcmMgYWxyZWFkeSBzZXQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBk
YXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIGNyb3Nzb3JpZ2lu
IHVzZS1jcmVkZW50aWFscyB0byBhbm9ueW1vdXMsIHNyYyBhbHJlYWR5IHNldCBhc3NlcnRfdW5y
ZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hh
YmxlIGNvZGUKLUZBSUwgY3Jvc3NvcmlnaW4gdXNlLWNyZWRlbnRpYWxzIHRvIGludmFsaWQsIHNy
YyBhbHJlYWR5IHNldCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlk
bid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKK1BBU1MgY3Jvc3NvcmlnaW4gYWJzZW50
IHRvIGVtcHR5LCBzcmMgYWxyZWFkeSBzZXQgCitQQVNTIGNyb3Nzb3JpZ2luIGFic2VudCB0byBh
bm9ueW1vdXMsIHNyYyBhbHJlYWR5IHNldCAKK1BBU1MgY3Jvc3NvcmlnaW4gYWJzZW50IHRvIHVz
ZS1jcmVkZW50aWFscywgc3JjIGFscmVhZHkgc2V0IAorUEFTUyBjcm9zc29yaWdpbiBlbXB0eSB0
byBhYnNlbnQsIHNyYyBhbHJlYWR5IHNldCAKK1BBU1MgY3Jvc3NvcmlnaW4gZW1wdHkgdG8gdXNl
LWNyZWRlbnRpYWxzLCBzcmMgYWxyZWFkeSBzZXQgCitQQVNTIGNyb3Nzb3JpZ2luIGFub255bW91
cyB0byBhYnNlbnQsIHNyYyBhbHJlYWR5IHNldCAKK1BBU1MgY3Jvc3NvcmlnaW4gYW5vbnltb3Vz
IHRvIHVzZS1jcmVkZW50aWFscywgc3JjIGFscmVhZHkgc2V0IAorUEFTUyBjcm9zc29yaWdpbiB1
c2UtY3JlZGVudGlhbHMgdG8gYWJzZW50LCBzcmMgYWxyZWFkeSBzZXQgCitQQVNTIGNyb3Nzb3Jp
Z2luIHVzZS1jcmVkZW50aWFscyB0byBlbXB0eSwgc3JjIGFscmVhZHkgc2V0IAorUEFTUyBjcm9z
c29yaWdpbiB1c2UtY3JlZGVudGlhbHMgdG8gYW5vbnltb3VzLCBzcmMgYWxyZWFkeSBzZXQgCitQ
QVNTIGNyb3Nzb3JpZ2luIHVzZS1jcmVkZW50aWFscyB0byBpbnZhbGlkLCBzcmMgYWxyZWFkeSBz
ZXQgCiBQQVNTIHJlZmVycmVycG9saWN5IGFic2VudCB0byBuby1yZWZlcnJlci13aGVuLWRvd25n
cmFkZSwgc3JjIGFic2VudCAKIFBBU1MgcmVmZXJyZXJwb2xpY3kgYWJzZW50IHRvIG5vLXJlZmVy
cmVyLCBzcmMgYWJzZW50IAogUEFTUyByZWZlcnJlcnBvbGljeSBlbXB0eSB0byBuby1yZWZlcnJl
ci13aGVuLWRvd25ncmFkZSwgc3JjIGFic2VudCAKQEAgLTU3LDIyICs1NywyMiBAQCBQQVNTIHJl
ZmVycmVycG9saWN5IG5vLXJlZmVycmVyIHRvIG5vLXJlZmVycmVyLXdoZW4tZG93bmdyYWRlLCBz
cmMgYWxyZWFkeSBzZXQKIFBBU1MgcmVmZXJyZXJwb2xpY3kgbm8tcmVmZXJyZXIgdG8gaW52YWxp
ZCwgc3JjIGFscmVhZHkgc2V0IAogRkFJTCBpbnNlcnRlZCBpbnRvIHBpY3R1cmUgYXNzZXJ0X3Vu
cmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNo
YWJsZSBjb2RlCiBGQUlMIHJlbW92ZWQgZnJvbSBwaWN0dXJlIGFzc2VydF91bnJlYWNoZWQ6IHVw
ZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQot
RkFJTCBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGluc2VydGVkIGFzc2VydF91
bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFj
aGFibGUgY29kZQotRkFJTCBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIHJlbW92
ZWQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVh
Y2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91cyBz
b3VyY2UgaGFzIHNyY3NldCBzZXQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBk
YXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHBhcmVudCBpcyBw
aWN0dXJlLCBwcmV2aW91cyBzb3VyY2UgaGFzIHNyY3NldCBjaGFuZ2VkIGFzc2VydF91bnJlYWNo
ZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUg
Y29kZQotRkFJTCBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyBzcmNzZXQg
cmVtb3ZlZCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1
biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKLUZBSUwgcGFyZW50IGlzIHBpY3R1cmUsIHByZXZp
b3VzIHNvdXJjZSBoYXMgc2l6ZXMgc2V0IGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1h
Z2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQotRkFJTCBwYXJlbnQg
aXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyBzaXplcyBjaGFuZ2VkIGFzc2VydF91bnJl
YWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFi
bGUgY29kZQotRkFJTCBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyBzaXpl
cyByZW1vdmVkIGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3Qg
cnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQotRkFJTCBwYXJlbnQgaXMgcGljdHVyZSwgcHJl
dmlvdXMgc291cmNlIGhhcyBtZWRpYSBzZXQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBp
bWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHBhcmVu
dCBpcyBwaWN0dXJlLCBwcmV2aW91cyBzb3VyY2UgaGFzIG1lZGlhIGNoYW5nZWQgYXNzZXJ0X3Vu
cmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNo
YWJsZSBjb2RlCi1GQUlMIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91cyBzb3VyY2UgaGFzIG1l
ZGlhIHJlbW92ZWQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4n
dCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHBhcmVudCBpcyBwaWN0dXJlLCBw
cmV2aW91cyBzb3VyY2UgaGFzIHR5cGUgc2V0IGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUg
aW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQotRkFJTCBwYXJl
bnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyB0eXBlIGNoYW5nZWQgYXNzZXJ0X3Vu
cmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNo
YWJsZSBjb2RlCi1GQUlMIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91cyBzb3VyY2UgaGFzIHR5
cGUgcmVtb3ZlZCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0
IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKLVBBU1Mgc3Jjc2V0IGlzIHNldCB0byBzYW1l
IHZhbHVlIAotUEFTUyBzaXplcyBpcyBzZXQgdG8gc2FtZSB2YWx1ZSAKK1BBU1MgcGFyZW50IGlz
IHBpY3R1cmUsIHByZXZpb3VzIHNvdXJjZSBpbnNlcnRlZCAKK1BBU1MgcGFyZW50IGlzIHBpY3R1
cmUsIHByZXZpb3VzIHNvdXJjZSByZW1vdmVkIAorUEFTUyBwYXJlbnQgaXMgcGljdHVyZSwgcHJl
dmlvdXMgc291cmNlIGhhcyBzcmNzZXQgc2V0IAorUEFTUyBwYXJlbnQgaXMgcGljdHVyZSwgcHJl
dmlvdXMgc291cmNlIGhhcyBzcmNzZXQgY2hhbmdlZCAKK1BBU1MgcGFyZW50IGlzIHBpY3R1cmUs
IHByZXZpb3VzIHNvdXJjZSBoYXMgc3Jjc2V0IHJlbW92ZWQgCitQQVNTIHBhcmVudCBpcyBwaWN0
dXJlLCBwcmV2aW91cyBzb3VyY2UgaGFzIHNpemVzIHNldCAKK1BBU1MgcGFyZW50IGlzIHBpY3R1
cmUsIHByZXZpb3VzIHNvdXJjZSBoYXMgc2l6ZXMgY2hhbmdlZCAKK1BBU1MgcGFyZW50IGlzIHBp
Y3R1cmUsIHByZXZpb3VzIHNvdXJjZSBoYXMgc2l6ZXMgcmVtb3ZlZCAKK1BBU1MgcGFyZW50IGlz
IHBpY3R1cmUsIHByZXZpb3VzIHNvdXJjZSBoYXMgbWVkaWEgc2V0IAorUEFTUyBwYXJlbnQgaXMg
cGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyBtZWRpYSBjaGFuZ2VkIAorUEFTUyBwYXJlbnQg
aXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyBtZWRpYSByZW1vdmVkIAorUEFTUyBwYXJl
bnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyB0eXBlIHNldCAKK1BBU1MgcGFyZW50
IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNvdXJjZSBoYXMgdHlwZSBjaGFuZ2VkIAorUEFTUyBwYXJl
bnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyB0eXBlIHJlbW92ZWQgCitGQUlMIHNy
Y3NldCBpcyBzZXQgdG8gc2FtZSB2YWx1ZSBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGlt
YWdlIGRhdGEgd2FzIHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKK0ZBSUwgc2l6ZXMgaXMg
c2V0IHRvIHNhbWUgdmFsdWUgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRh
IHdhcyBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCiBQQVNTIGNyb3Nzb3JpZ2luIHN0YXRl
IG5vdCBjaGFuZ2VkOiBhYnNlbnQsIHJlbW92ZUF0dHJpYnV0ZSAKIFBBU1MgY3Jvc3NvcmlnaW4g
c3RhdGUgbm90IGNoYW5nZWQ6IGVtcHR5IHRvIGFub255bW91cyAKIFBBU1MgY3Jvc3NvcmlnaW4g
c3RhdGUgbm90IGNoYW5nZWQ6IGFub255bW91cyB0byBmb29iYXIgCkBAIC04OSw5ICs4OSw5IEBA
IFBBU1MgYW5jZXN0b3IgcGljdHVyZSBoYXMgYSBzb3VyY2UgaW5zZXJ0ZWQKIFBBU1MgYW5jZXN0
b3IgcGljdHVyZSBoYXMgYSBzb3VyY2UgcmVtb3ZlZCAKIFBBU1MgYW5jZXN0b3IgcGljdHVyZTsg
cHJldmlvdXMgc2libGluZyBzb3VyY2UgaW5zZXJ0ZWQgCiBQQVNTIGFuY2VzdG9yIHBpY3R1cmU7
IHByZXZpb3VzIHNpYmxpbmcgc291cmNlIHJlbW92ZWQgCi1QQVNTIHBhcmVudCBpcyBwaWN0dXJl
LCBmb2xsb3dpbmcgc2libGluZyBzb3VyY2UgaW5zZXJ0ZWQgCi1QQVNTIHBhcmVudCBpcyBwaWN0
dXJlLCBmb2xsb3dpbmcgc2libGluZyBzb3VyY2UgcmVtb3ZlZCAKLVBBU1MgcGFyZW50IGlzIHBp
Y3R1cmUsIGZvbGxvd2luZyBzaWJsaW5nIHNvdXJjZSBoYXMgc3Jjc2V0IHNldCAKK0ZBSUwgcGFy
ZW50IGlzIHBpY3R1cmUsIGZvbGxvd2luZyBzaWJsaW5nIHNvdXJjZSBpbnNlcnRlZCBhc3NlcnRf
dW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgd2FzIHJ1biBSZWFjaGVkIHVucmVhY2hh
YmxlIGNvZGUKK0ZBSUwgcGFyZW50IGlzIHBpY3R1cmUsIGZvbGxvd2luZyBzaWJsaW5nIHNvdXJj
ZSByZW1vdmVkIGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSB3YXMgcnVu
IFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQorRkFJTCBwYXJlbnQgaXMgcGljdHVyZSwgZm9sbG93
aW5nIHNpYmxpbmcgc291cmNlIGhhcyBzcmNzZXQgc2V0IGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0
ZSB0aGUgaW1hZ2UgZGF0YSB3YXMgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQogUEFTUyBt
ZWRpYSBvbiBpbWcgc2V0IAogUEFTUyB0eXBlIG9uIGltZyBzZXQgCiBQQVNTIGNsYXNzIG9uIGlt
ZyBzZXQgCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402419</attachid>
            <date>2020-06-21 06:13:22 -0700</date>
            <delta_ts>2020-06-21 10:52:11 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213335-20200621151321.patch</filename>
            <type>text/plain</type>
            <size>18766</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMzE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzMwNGYxM2JkY2E2MDI0
ZTFhNGY0NzUzNjcxOWY0MDNhMTJjYmI3ZS4uMjA0OTg2YzM0YzM4NWVjNDMyZmY3MzQzYmY2Mzk0
ZDQxYTNiOTliNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA2LTIxICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgSW1hZ2UgYGNyb3Nzb3JpZ2luYCBt
dXRhdGlvbnMgc2hvdWxkIGJlIGNvbnNpZGVyZWQgInJlbGV2YW50IG11dGF0aW9ucyIKKyAgICAg
ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzMzNQorCisgICAg
ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1iZWRkZWQtY29udGVudC90
aGUtaW1nLWVsZW1lbnQvcmVsZXZhbnQtbXV0YXRpb25zLmh0bWwKKworICAgICAgICAqIGh0bWwv
SFRNTEltYWdlRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MSW1hZ2VFbGVtZW50
OjpiZXN0Rml0U291cmNlRnJvbVBpY3R1cmVFbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkhU
TUxJbWFnZUVsZW1lbnQ6OmV2YWx1YXRlRHluYW1pY01lZGlhUXVlcnlEZXBlbmRlbmNpZXMpOgor
ICAgICAgICAoV2ViQ29yZTo6SFRNTEltYWdlRWxlbWVudDo6c2VsZWN0SW1hZ2VTb3VyY2UpOgor
ICAgICAgICAoV2ViQ29yZTo6SFRNTEltYWdlRWxlbWVudDo6YXR0cmlidXRlQ2hhbmdlZCk6Cisg
ICAgICAgIChXZWJDb3JlOjpIVE1MSW1hZ2VFbGVtZW50OjpwYXJzZUF0dHJpYnV0ZSk6CisgICAg
ICAgIChXZWJDb3JlOjpIVE1MSW1hZ2VFbGVtZW50OjppbnNlcnRlZEludG9BbmNlc3Rvcik6Cisg
ICAgICAgIChXZWJDb3JlOjpIVE1MSW1hZ2VFbGVtZW50OjpyZW1vdmVkRnJvbUFuY2VzdG9yKToK
KyAgICAgICAgKiBodG1sL0hUTUxJbWFnZUVsZW1lbnQuaDoKKyAgICAgICAgKiBodG1sL0hUTUxQ
aWN0dXJlRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MUGljdHVyZUVsZW1lbnQ6
OnNvdXJjZXNDaGFuZ2VkKToKKwogMjAyMC0wNi0xOSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBw
bGUuY29tPgogCiAgICAgICAgIFtDb2NvYV0gRGVsYXkgaXNzdWluZyBNYW5hZ2VkU2Vzc2lvbiAm
IE5ldHdvcmsgRXh0ZW5zaW9uIHNhbmRib3ggZXh0ZW5zaW9ucyB1bnRpbCBhIGxvYWQgaXMgYWN0
dWFsbHkgaXNzdWVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbWFnZUVs
ZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW1hZ2VFbGVtZW50LmNwcAppbmRl
eCBmMWZkNjIxYjZkMzZlODVkMGRiNjY2N2Y5YWE4MDI4YTg4ZWNlMGMwLi43ZjA5OTRiMTg0ZjJh
NzU3NDE4N2IxNWNlNWE1ODI5OTFkYzMxNTBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9o
dG1sL0hUTUxJbWFnZUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElt
YWdlRWxlbWVudC5jcHAKQEAgLTE2Niw2ICsxNjYsOCBAQCBJbWFnZUNhbmRpZGF0ZSBIVE1MSW1h
Z2VFbGVtZW50OjpiZXN0Rml0U291cmNlRnJvbVBpY3R1cmVFbGVtZW50KCkKICAgICBJbWFnZUNh
bmRpZGF0ZSBjYW5kaWRhdGU7CiAKICAgICBmb3IgKFJlZlB0cjxOb2RlPiBjaGlsZCA9IHBpY3R1
cmUtPmZpcnN0Q2hpbGQoKTsgY2hpbGQgJiYgY2hpbGQgIT0gdGhpczsgY2hpbGQgPSBjaGlsZC0+
bmV4dFNpYmxpbmcoKSkgeworICAgICAgICBpZiAoY2hpbGQuZ2V0KCkgPT0gdGhpcykKKyAgICAg
ICAgICAgIHJldHVybiB7IH07CiAgICAgICAgIGlmICghaXM8SFRNTFNvdXJjZUVsZW1lbnQ+KCpj
aGlsZCkpCiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgYXV0byYgc291cmNlID0gZG93
bmNhc3Q8SFRNTFNvdXJjZUVsZW1lbnQ+KCpjaGlsZCk7CkBAIC0yMTEsMTAgKzIxMywxMCBAQCB2
b2lkIEhUTUxJbWFnZUVsZW1lbnQ6OmV2YWx1YXRlRHluYW1pY01lZGlhUXVlcnlEZXBlbmRlbmNp
ZXMoKQogICAgIGlmICghZXZhbHVhdG9yLmV2YWx1YXRlRm9yQ2hhbmdlcyhtX21lZGlhUXVlcnlE
eW5hbWljUmVzdWx0cykpCiAgICAgICAgIHJldHVybjsKIAotICAgIHNlbGVjdEltYWdlU291cmNl
KCk7CisgICAgc2VsZWN0SW1hZ2VTb3VyY2UoSW1hZ2VMb2FkZXI6OlJlbGV2YW50TXV0YXRpb246
Ok5vKTsKIH0KIAotdm9pZCBIVE1MSW1hZ2VFbGVtZW50OjpzZWxlY3RJbWFnZVNvdXJjZSgpCit2
b2lkIEhUTUxJbWFnZUVsZW1lbnQ6OnNlbGVjdEltYWdlU291cmNlKEltYWdlTG9hZGVyOjpSZWxl
dmFudE11dGF0aW9uIHJlbGV2YW50TXV0YXRpb24pCiB7CiAgICAgbV9tZWRpYVF1ZXJ5RHluYW1p
Y1Jlc3VsdHMgPSB7IH07CiAgICAgZG9jdW1lbnQoKS5yZW1vdmVEeW5hbWljTWVkaWFRdWVyeURl
cGVuZGVudEltYWdlKCp0aGlzKTsKQEAgLTIyOCw3ICsyMzAsNyBAQCB2b2lkIEhUTUxJbWFnZUVs
ZW1lbnQ6OnNlbGVjdEltYWdlU291cmNlKCkKICAgICAgICAgY2FuZGlkYXRlID0gYmVzdEZpdFNv
dXJjZUZvckltYWdlQXR0cmlidXRlcyhkb2N1bWVudCgpLmRldmljZVNjYWxlRmFjdG9yKCksIGF0
dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24oc3JjQXR0ciksIGF0dHJpYnV0ZVdpdGhvdXRT
eW5jaHJvbml6YXRpb24oc3Jjc2V0QXR0ciksIHNvdXJjZVNpemUpOwogICAgIH0KICAgICBzZXRC
ZXN0Rml0VVJMQW5kRFBSRnJvbUltYWdlQ2FuZGlkYXRlKGNhbmRpZGF0ZSk7Ci0gICAgbV9pbWFn
ZUxvYWRlci0+dXBkYXRlRnJvbUVsZW1lbnRJZ25vcmluZ1ByZXZpb3VzRXJyb3IoKTsKKyAgICBt
X2ltYWdlTG9hZGVyLT51cGRhdGVGcm9tRWxlbWVudElnbm9yaW5nUHJldmlvdXNFcnJvcihyZWxl
dmFudE11dGF0aW9uKTsKIAogICAgIGlmICghbV9tZWRpYVF1ZXJ5RHluYW1pY1Jlc3VsdHMuaXNF
bXB0eSgpKQogICAgICAgICBkb2N1bWVudCgpLmFkZER5bmFtaWNNZWRpYVF1ZXJ5RGVwZW5kZW50
SW1hZ2UoKnRoaXMpOwpAQCAtMjQxLDE0ICsyNDMsMTkgQEAgYm9vbCBIVE1MSW1hZ2VFbGVtZW50
OjpoYXNMYXp5TG9hZGFibGVBdHRyaWJ1dGVWYWx1ZShjb25zdCBBdG9tU3RyaW5nJiBhdHRyaWJ1
dGUKIAogdm9pZCBIVE1MSW1hZ2VFbGVtZW50OjphdHRyaWJ1dGVDaGFuZ2VkKGNvbnN0IFF1YWxp
ZmllZE5hbWUmIG5hbWUsIGNvbnN0IEF0b21TdHJpbmcmIG9sZFZhbHVlLCBjb25zdCBBdG9tU3Ry
aW5nJiBuZXdWYWx1ZSwgQXR0cmlidXRlTW9kaWZpY2F0aW9uUmVhc29uIHJlYXNvbikKIHsKKyAg
ICBIVE1MRWxlbWVudDo6YXR0cmlidXRlQ2hhbmdlZChuYW1lLCBvbGRWYWx1ZSwgbmV3VmFsdWUs
IHJlYXNvbik7CisKICAgICBpZiAobmFtZSA9PSByZWZlcnJlcnBvbGljeUF0dHIgJiYgUnVudGlt
ZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5yZWZlcnJlclBvbGljeUF0dHJpYnV0
ZUVuYWJsZWQoKSkgewogICAgICAgICBhdXRvIG9sZFJlZmVycmVyUG9saWN5ID0gcGFyc2VSZWZl
cnJlclBvbGljeShvbGRWYWx1ZSwgUmVmZXJyZXJQb2xpY3lTb3VyY2U6OlJlZmVycmVyUG9saWN5
QXR0cmlidXRlKS52YWx1ZU9yKFJlZmVycmVyUG9saWN5OjpFbXB0eVN0cmluZyk7CiAgICAgICAg
IGF1dG8gbmV3UmVmZXJyZXJQb2xpY3kgPSBwYXJzZVJlZmVycmVyUG9saWN5KG5ld1ZhbHVlLCBS
ZWZlcnJlclBvbGljeVNvdXJjZTo6UmVmZXJyZXJQb2xpY3lBdHRyaWJ1dGUpLnZhbHVlT3IoUmVm
ZXJyZXJQb2xpY3k6OkVtcHR5U3RyaW5nKTsKICAgICAgICAgaWYgKG9sZFJlZmVycmVyUG9saWN5
ICE9IG5ld1JlZmVycmVyUG9saWN5KQogICAgICAgICAgICAgbV9pbWFnZUxvYWRlci0+dXBkYXRl
RnJvbUVsZW1lbnRJZ25vcmluZ1ByZXZpb3VzRXJyb3IoSW1hZ2VMb2FkZXI6OlJlbGV2YW50TXV0
YXRpb246Olllcyk7CisgICAgfSBlbHNlIGlmIChuYW1lID09IGNyb3Nzb3JpZ2luQXR0cikgewor
ICAgICAgICBhdXRvIG9sZENyb3Nzb3JpZ2luU3RhdGUgPSBvbGRWYWx1ZS5pc051bGwoKSA/ICJl
bXB0eSIgOiAoZXF1YWxJZ25vcmluZ0FTQ0lJQ2FzZShvbGRWYWx1ZSwgInVzZS1jcmVkZW50aWFs
cyIpID8gInVzZS1jcmVkZW50aWFscyIgOiAiYW5vbnltb3VzIik7CisgICAgICAgIGF1dG8gbmV3
Q3Jvc3NvcmlnaW5TdGF0ZSA9IG5ld1ZhbHVlLmlzTnVsbCgpID8gImVtcHR5IiA6IChlcXVhbEln
bm9yaW5nQVNDSUlDYXNlKG5ld1ZhbHVlLCAidXNlLWNyZWRlbnRpYWxzIikgPyAidXNlLWNyZWRl
bnRpYWxzIiA6ICJhbm9ueW1vdXMiKTsKKyAgICAgICAgaWYgKG9sZENyb3Nzb3JpZ2luU3RhdGUg
IT0gbmV3Q3Jvc3NvcmlnaW5TdGF0ZSkKKyAgICAgICAgICAgIG1faW1hZ2VMb2FkZXItPnVwZGF0
ZUZyb21FbGVtZW50SWdub3JpbmdQcmV2aW91c0Vycm9yKEltYWdlTG9hZGVyOjpSZWxldmFudE11
dGF0aW9uOjpZZXMpOwogICAgIH0KLQotICAgIEhUTUxFbGVtZW50OjphdHRyaWJ1dGVDaGFuZ2Vk
KG5hbWUsIG9sZFZhbHVlLCBuZXdWYWx1ZSwgcmVhc29uKTsKIH0KIAogdm9pZCBIVE1MSW1hZ2VF
bGVtZW50OjpwYXJzZUF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJiBuYW1lLCBjb25zdCBB
dG9tU3RyaW5nJiB2YWx1ZSkKQEAgLTI1Nyw3ICsyNjQsNyBAQCB2b2lkIEhUTUxJbWFnZUVsZW1l
bnQ6OnBhcnNlQXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmIG5hbWUsIGNvbnN0IEF0b21T
dHJpbgogICAgICAgICBpZiAoaXM8UmVuZGVySW1hZ2U+KHJlbmRlcmVyKCkpKQogICAgICAgICAg
ICAgZG93bmNhc3Q8UmVuZGVySW1hZ2U+KCpyZW5kZXJlcigpKS51cGRhdGVBbHRUZXh0KCk7CiAg
ICAgfSBlbHNlIGlmIChuYW1lID09IHNyY0F0dHIgfHwgbmFtZSA9PSBzcmNzZXRBdHRyIHx8IG5h
bWUgPT0gc2l6ZXNBdHRyKQotICAgICAgICBzZWxlY3RJbWFnZVNvdXJjZSgpOworICAgICAgICBz
ZWxlY3RJbWFnZVNvdXJjZShJbWFnZUxvYWRlcjo6UmVsZXZhbnRNdXRhdGlvbjo6WWVzKTsKICAg
ICBlbHNlIGlmIChuYW1lID09IHVzZW1hcEF0dHIpIHsKICAgICAgICAgaWYgKGlzSW5UcmVlU2Nv
cGUoKSAmJiAhbV9wYXJzZWRVc2VtYXAuaXNOdWxsKCkpCiAgICAgICAgICAgICB0cmVlU2NvcGUo
KS5yZW1vdmVJbWFnZUVsZW1lbnRCeVVzZW1hcCgqbV9wYXJzZWRVc2VtYXAuaW1wbCgpLCAqdGhp
cyk7CkBAIC00MDUsOSArNDEyLDE3IEBAIE5vZGU6Okluc2VydGVkSW50b0FuY2VzdG9yUmVzdWx0
IEhUTUxJbWFnZUVsZW1lbnQ6Omluc2VydGVkSW50b0FuY2VzdG9yKEluc2VydGlvCiAgICAgaWYg
KGluc2VydGlvblR5cGUudHJlZVNjb3BlQ2hhbmdlZCAmJiAhbV9wYXJzZWRVc2VtYXAuaXNOdWxs
KCkpCiAgICAgICAgIHRyZWVTY29wZSgpLmFkZEltYWdlRWxlbWVudEJ5VXNlbWFwKCptX3BhcnNl
ZFVzZW1hcC5pbXBsKCksICp0aGlzKTsKIAotICAgIGlmIChpczxIVE1MUGljdHVyZUVsZW1lbnQ+
KHBhcmVudE5vZGUoKSkpIHsKLSAgICAgICAgc2V0UGljdHVyZUVsZW1lbnQoJmRvd25jYXN0PEhU
TUxQaWN0dXJlRWxlbWVudD4oKnBhcmVudE5vZGUoKSkpOwotICAgICAgICBzZWxlY3RJbWFnZVNv
dXJjZSgpOworICAgIGlmIChpczxIVE1MUGljdHVyZUVsZW1lbnQ+KCZwYXJlbnRPZkluc2VydGVk
VHJlZSkpIHsKKyAgICAgICAgc2V0UGljdHVyZUVsZW1lbnQoJmRvd25jYXN0PEhUTUxQaWN0dXJl
RWxlbWVudD4ocGFyZW50T2ZJbnNlcnRlZFRyZWUpKTsKKyAgICAgICAgaWYgKGluc2VydGlvblR5
cGUuY29ubmVjdGVkVG9Eb2N1bWVudCkgeworICAgICAgICAgICAgc2VsZWN0SW1hZ2VTb3VyY2Uo
SW1hZ2VMb2FkZXI6OlJlbGV2YW50TXV0YXRpb246Olllcyk7CisgICAgICAgICAgICByZXR1cm4g
aW5zZXJ0Tm90aWZpY2F0aW9uUmVxdWVzdDsKKyAgICAgICAgfQorICAgICAgICBhdXRvIGNhbmRp
ZGF0ZSA9IGJlc3RGaXRTb3VyY2VGcm9tUGljdHVyZUVsZW1lbnQoKTsKKyAgICAgICAgaWYgKCFj
YW5kaWRhdGUuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICBzZXRCZXN0Rml0VVJMQW5kRFBSRnJv
bUltYWdlQ2FuZGlkYXRlKGNhbmRpZGF0ZSk7CisgICAgICAgICAgICBtX2ltYWdlTG9hZGVyLT51
cGRhdGVGcm9tRWxlbWVudElnbm9yaW5nUHJldmlvdXNFcnJvcihJbWFnZUxvYWRlcjo6UmVsZXZh
bnRNdXRhdGlvbjo6WWVzKTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIC8vIElmIHdlIGhhdmUg
YmVlbiBpbnNlcnRlZCBmcm9tIGEgcmVuZGVyZXItbGVzcyBkb2N1bWVudCwKQEAgLTQzMiw4ICs0
NDcsMTAgQEAgdm9pZCBIVE1MSW1hZ2VFbGVtZW50OjpyZW1vdmVkRnJvbUFuY2VzdG9yKFJlbW92
YWxUeXBlIHJlbW92YWxUeXBlLCBDb250YWluZXJOb2QKICAgICBpZiAocmVtb3ZhbFR5cGUudHJl
ZVNjb3BlQ2hhbmdlZCAmJiAhbV9wYXJzZWRVc2VtYXAuaXNOdWxsKCkpCiAgICAgICAgIG9sZFBh
cmVudE9mUmVtb3ZlZFRyZWUudHJlZVNjb3BlKCkucmVtb3ZlSW1hZ2VFbGVtZW50QnlVc2VtYXAo
Km1fcGFyc2VkVXNlbWFwLmltcGwoKSwgKnRoaXMpOwogCi0gICAgaWYgKGlzPEhUTUxQaWN0dXJl
RWxlbWVudD4ocGFyZW50Tm9kZSgpKSkKKyAgICBpZiAoaXM8SFRNTFBpY3R1cmVFbGVtZW50Pihv
bGRQYXJlbnRPZlJlbW92ZWRUcmVlKSkgewogICAgICAgICBzZXRQaWN0dXJlRWxlbWVudChudWxs
cHRyKTsKKyAgICAgICAgbV9pbWFnZUxvYWRlci0+dXBkYXRlRnJvbUVsZW1lbnRJZ25vcmluZ1By
ZXZpb3VzRXJyb3IoSW1hZ2VMb2FkZXI6OlJlbGV2YW50TXV0YXRpb246Olllcyk7CisgICAgfQog
CiAgICAgaWYgKHJlbW92YWxUeXBlLmRpc2Nvbm5lY3RlZEZyb21Eb2N1bWVudCkKICAgICAgICAg
dXBkYXRlRWRpdGFibGVJbWFnZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9I
VE1MSW1hZ2VFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbWFnZUVsZW1lbnQu
aAppbmRleCAzNjc1MDBlOWU2ZTU1NGNiODFlZjFhZTA1ZDUzM2EwMTRkMmE2OTA0Li40MzUxNzA1
ZDk5MTY3NzRiMTBkNmJmNWVmMDJlZjAyYWNjY2UwNzc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9odG1sL0hUTUxJbWFnZUVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU
TUxJbWFnZUVsZW1lbnQuaApAQCAtMjgsNiArMjgsNyBAQAogI2luY2x1ZGUgIkdyYXBoaWNzTGF5
ZXIuaCIKICNpbmNsdWRlICJHcmFwaGljc1R5cGVzLmgiCiAjaW5jbHVkZSAiSFRNTEVsZW1lbnQu
aCIKKyNpbmNsdWRlICJJbWFnZUxvYWRlci5oIgogI2luY2x1ZGUgIk1lZGlhUXVlcnlFdmFsdWF0
b3IuaCIKICNpbmNsdWRlIDx3dGYvV2Vha1B0ci5oPgogCkBAIC0xODMsNyArMTg0LDcgQEAgcHJp
dmF0ZToKIAogICAgIGJvb2wgaXNJbnRlcmFjdGl2ZUNvbnRlbnQoKSBjb25zdCBmaW5hbDsKIAot
ICAgIHZvaWQgc2VsZWN0SW1hZ2VTb3VyY2UoKTsKKyAgICB2b2lkIHNlbGVjdEltYWdlU291cmNl
KEltYWdlTG9hZGVyOjpSZWxldmFudE11dGF0aW9uKTsKIAogICAgIEltYWdlQ2FuZGlkYXRlIGJl
c3RGaXRTb3VyY2VGcm9tUGljdHVyZUVsZW1lbnQoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvaHRtbC9IVE1MUGljdHVyZUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9I
VE1MUGljdHVyZUVsZW1lbnQuY3BwCmluZGV4IDE4MGI1YjQ5NTgyMDU0NWYxNjBmNmI3ZTUyZjdi
ZjI1NTgxZjkwZTguLmMxZGEzYzM5NjdhOGY0NTcxMzA2ODcwMjE0NDQ0Mzk3Y2FiNGE4ODYgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBpY3R1cmVFbGVtZW50LmNwcAorKysg
Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQaWN0dXJlRWxlbWVudC5jcHAKQEAgLTYwLDcgKzYw
LDcgQEAgUmVmPEhUTUxQaWN0dXJlRWxlbWVudD4gSFRNTFBpY3R1cmVFbGVtZW50OjpjcmVhdGUo
Y29uc3QgUXVhbGlmaWVkTmFtZSYgdGFnTmFtZSwKIHZvaWQgSFRNTFBpY3R1cmVFbGVtZW50Ojpz
b3VyY2VzQ2hhbmdlZCgpCiB7CiAgICAgZm9yIChhdXRvJiBlbGVtZW50IDogY2hpbGRyZW5PZlR5
cGU8SFRNTEltYWdlRWxlbWVudD4oKnRoaXMpKQotICAgICAgICBlbGVtZW50LnNlbGVjdEltYWdl
U291cmNlKCk7CisgICAgICAgIGVsZW1lbnQuc2VsZWN0SW1hZ2VTb3VyY2UoSW1hZ2VMb2FkZXI6
OlJlbGV2YW50TXV0YXRpb246Olllcyk7CiB9CiAKICNpZiBVU0UoU1lTVEVNX1BSRVZJRVcpCmRp
ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVz
dHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwppbmRleCA2MzJlMmNjYTZhZDQ5ZjUxMDk0ZTBlNjE1
ODVkNTdmNzgzYjdhZWZmLi43ZWMzMjYyM2I4MTRkYmMwMzU0NGFlYWEzOTU5YTQ5YjJkODFjMzc4
IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xh
eW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMC0w
Ni0yMSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIEltYWdlIGBjcm9z
c29yaWdpbmAgbXV0YXRpb25zIHNob3VsZCBiZSBjb25zaWRlcmVkICJyZWxldmFudCBtdXRhdGlv
bnMiCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTMz
MzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRh
dGUgaW1wcm92ZWQgdGVzdCByZXN1bHQuCisKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMv
aHRtbC9jYW52YXMvZWxlbWVudC9kcmF3aW5nLWltYWdlcy10by10aGUtY2FudmFzL2RyYXdpbWFn
ZV9jcm9zc29yaWdpbi5zdWItZXhwZWN0ZWQudHh0OgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10
ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1jb250ZW50L3RoZS1pbWctZWxlbWVudC9yZWxl
dmFudC1tdXRhdGlvbnMtZXhwZWN0ZWQudHh0OgorCiAyMDIwLTA2LTE5ICBDbGFyayBXYW5nICA8
Y2xhcmtfd2FuZ0BhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHNldFZlbG9jaXR5KCkgZnJv
bSBQYW5uZXJOb2RlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2h0bWwvY2FudmFzL2VsZW1lbnQvZHJhd2luZy1pbWFnZXMtdG8tdGhlLWNh
bnZhcy9kcmF3aW1hZ2VfY3Jvc3NvcmlnaW4uc3ViLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz
L2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9jYW52YXMvZWxlbWVudC9kcmF3
aW5nLWltYWdlcy10by10aGUtY2FudmFzL2RyYXdpbWFnZV9jcm9zc29yaWdpbi5zdWItZXhwZWN0
ZWQudHh0CmluZGV4IDczMzRkNTg3MTZiODBhZjcwYmEzNjI5NWI5YzJkOWMzYjEwZDIyYTIuLmI3
M2ZmZGNhNTIyYjBlYmY4M2NjMDA0YWNlMDgxNWRkOWFkYjFiMTkgMTAwNjQ0Ci0tLSBhL0xheW91
dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9jYW52YXMvZWxlbWVu
dC9kcmF3aW5nLWltYWdlcy10by10aGUtY2FudmFzL2RyYXdpbWFnZV9jcm9zc29yaWdpbi5zdWIt
ZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvaHRtbC9jYW52YXMvZWxlbWVudC9kcmF3aW5nLWltYWdlcy10by10aGUtY2FudmFzL2Ry
YXdpbWFnZV9jcm9zc29yaWdpbi5zdWItZXhwZWN0ZWQudHh0CkBAIC0xLDUgKzEsNiBAQAogQmxv
Y2tlZCBhY2Nlc3MgdG8gZXh0ZXJuYWwgVVJMIGh0dHA6Ly93d3cubG9jYWxob3N0Ojg4MDAvaW1h
Z2VzL2dyZWVuLnBuZz9waXBlPWhlYWRlcihBY2Nlc3MtQ29udHJvbC1BbGxvdy1PcmlnaW4sKikK
IEJsb2NrZWQgYWNjZXNzIHRvIGV4dGVybmFsIFVSTCBodHRwOi8vd3d3LmxvY2FsaG9zdDo4ODAw
L2ltYWdlcy9ncmVlbi5wbmc/cGlwZT1oZWFkZXIoQWNjZXNzLUNvbnRyb2wtQWxsb3ctT3JpZ2lu
LCopCitCbG9ja2VkIGFjY2VzcyB0byBleHRlcm5hbCBVUkwgaHR0cDovL3d3dy5sb2NhbGhvc3Q6
ODgwMC9pbWFnZXMvZ3JlZW4ucG5nP3BpcGU9aGVhZGVyKEFjY2Vzcy1Db250cm9sLUFsbG93LU9y
aWdpbiwqKQogQmxvY2tlZCBhY2Nlc3MgdG8gZXh0ZXJuYWwgVVJMIGh0dHA6Ly93d3cubG9jYWxo
b3N0Ojg4MDAvaW1hZ2VzL2dyZWVuLnBuZwogCiBQQVNTIENhbiBnZXQgcGl4ZWxzIG9mIGNhbnZh
cyB3aXRoIHNhbWUgb3JpZ2luIGltYWdlIGRyYXduIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1j
b250ZW50L3RoZS1pbWctZWxlbWVudC9yZWxldmFudC1tdXRhdGlvbnMtZXhwZWN0ZWQudHh0IGIv
TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGlj
cy9lbWJlZGRlZC1jb250ZW50L3RoZS1pbWctZWxlbWVudC9yZWxldmFudC1tdXRhdGlvbnMtZXhw
ZWN0ZWQudHh0CmluZGV4IDExY2U0NDYzNDgxMWViOTk4MWE4MDIzNGRkMjI3NzNiYWQ3NjlmZmUu
LjI5MWFhNGM1ZTRiNmEwZmYwYzg5YjVmY2UwMWZjZjgwN2U3MGVhYjggMTAwNjQ0Ci0tLSBhL0xh
eW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3Mv
ZW1iZWRkZWQtY29udGVudC90aGUtaW1nLWVsZW1lbnQvcmVsZXZhbnQtbXV0YXRpb25zLWV4cGVj
dGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2h0bWwvc2VtYW50aWNzL2VtYmVkZGVkLWNvbnRlbnQvdGhlLWltZy1lbGVtZW50L3JlbGV2YW50
LW11dGF0aW9ucy1leHBlY3RlZC50eHQKQEAgLTEsMTQgKzEsMTQgQEAKIAogUEFTUyBzcmMgc2V0
IAotRkFJTCBzcmMgY2hhbmdlZCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRh
dGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKK1BBU1Mgc3JjIGNoYW5nZWQg
CiBQQVNTIHNyYyByZW1vdmVkIAogUEFTUyBzcmNzZXQgc2V0IAotRkFJTCBzcmNzZXQgY2hhbmdl
ZCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFj
aGVkIHVucmVhY2hhYmxlIGNvZGUKK1BBU1Mgc3Jjc2V0IGNoYW5nZWQgCiBQQVNTIHNyY3NldCBy
ZW1vdmVkIAogUEFTUyBzaXplcyBzZXQgCiBQQVNTIHNpemVzIGNoYW5nZWQgCiBQQVNTIHNpemVz
IHJlbW92ZWQgCi1GQUlMIHNyYyBzZXQgdG8gc2FtZSB2YWx1ZSBhc3NlcnRfdW5yZWFjaGVkOiB1
cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUK
K1BBU1Mgc3JjIHNldCB0byBzYW1lIHZhbHVlIAogUEFTUyBjcm9zc29yaWdpbiBhYnNlbnQgdG8g
ZW1wdHksIHNyYyBhYnNlbnQgCiBQQVNTIGNyb3Nzb3JpZ2luIGFic2VudCB0byBhbm9ueW1vdXMs
IHNyYyBhYnNlbnQgCiBQQVNTIGNyb3Nzb3JpZ2luIGFic2VudCB0byB1c2UtY3JlZGVudGlhbHMs
IHNyYyBhYnNlbnQgCkBAIC0yMCwxNyArMjAsMTcgQEAgUEFTUyBjcm9zc29yaWdpbiB1c2UtY3Jl
ZGVudGlhbHMgdG8gYWJzZW50LCBzcmMgYWJzZW50CiBQQVNTIGNyb3Nzb3JpZ2luIHVzZS1jcmVk
ZW50aWFscyB0byBlbXB0eSwgc3JjIGFic2VudCAKIFBBU1MgY3Jvc3NvcmlnaW4gdXNlLWNyZWRl
bnRpYWxzIHRvIGFub255bW91cywgc3JjIGFic2VudCAKIFBBU1MgY3Jvc3NvcmlnaW4gdXNlLWNy
ZWRlbnRpYWxzIHRvIGludmFsaWQsIHNyYyBhYnNlbnQgCi1GQUlMIGNyb3Nzb3JpZ2luIGFic2Vu
dCB0byBlbXB0eSwgc3JjIGFscmVhZHkgc2V0IGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUg
aW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQotRkFJTCBjcm9z
c29yaWdpbiBhYnNlbnQgdG8gYW5vbnltb3VzLCBzcmMgYWxyZWFkeSBzZXQgYXNzZXJ0X3VucmVh
Y2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJs
ZSBjb2RlCi1GQUlMIGNyb3Nzb3JpZ2luIGFic2VudCB0byB1c2UtY3JlZGVudGlhbHMsIHNyYyBh
bHJlYWR5IHNldCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0
IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKLUZBSUwgY3Jvc3NvcmlnaW4gZW1wdHkgdG8g
YWJzZW50LCBzcmMgYWxyZWFkeSBzZXQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFn
ZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIGNyb3Nzb3Jp
Z2luIGVtcHR5IHRvIHVzZS1jcmVkZW50aWFscywgc3JjIGFscmVhZHkgc2V0IGFzc2VydF91bnJl
YWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFi
bGUgY29kZQotRkFJTCBjcm9zc29yaWdpbiBhbm9ueW1vdXMgdG8gYWJzZW50LCBzcmMgYWxyZWFk
eSBzZXQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4g
UmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIGNyb3Nzb3JpZ2luIGFub255bW91cyB0byB1
c2UtY3JlZGVudGlhbHMsIHNyYyBhbHJlYWR5IHNldCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUg
dGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKLUZBSUwg
Y3Jvc3NvcmlnaW4gdXNlLWNyZWRlbnRpYWxzIHRvIGFic2VudCwgc3JjIGFscmVhZHkgc2V0IGFz
c2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQg
dW5yZWFjaGFibGUgY29kZQotRkFJTCBjcm9zc29yaWdpbiB1c2UtY3JlZGVudGlhbHMgdG8gZW1w
dHksIHNyYyBhbHJlYWR5IHNldCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRh
dGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKLUZBSUwgY3Jvc3NvcmlnaW4g
dXNlLWNyZWRlbnRpYWxzIHRvIGFub255bW91cywgc3JjIGFscmVhZHkgc2V0IGFzc2VydF91bnJl
YWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFi
bGUgY29kZQotRkFJTCBjcm9zc29yaWdpbiB1c2UtY3JlZGVudGlhbHMgdG8gaW52YWxpZCwgc3Jj
IGFscmVhZHkgc2V0IGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRu
J3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQorUEFTUyBjcm9zc29yaWdpbiBhYnNlbnQg
dG8gZW1wdHksIHNyYyBhbHJlYWR5IHNldCAKK1BBU1MgY3Jvc3NvcmlnaW4gYWJzZW50IHRvIGFu
b255bW91cywgc3JjIGFscmVhZHkgc2V0IAorUEFTUyBjcm9zc29yaWdpbiBhYnNlbnQgdG8gdXNl
LWNyZWRlbnRpYWxzLCBzcmMgYWxyZWFkeSBzZXQgCitQQVNTIGNyb3Nzb3JpZ2luIGVtcHR5IHRv
IGFic2VudCwgc3JjIGFscmVhZHkgc2V0IAorUEFTUyBjcm9zc29yaWdpbiBlbXB0eSB0byB1c2Ut
Y3JlZGVudGlhbHMsIHNyYyBhbHJlYWR5IHNldCAKK1BBU1MgY3Jvc3NvcmlnaW4gYW5vbnltb3Vz
IHRvIGFic2VudCwgc3JjIGFscmVhZHkgc2V0IAorUEFTUyBjcm9zc29yaWdpbiBhbm9ueW1vdXMg
dG8gdXNlLWNyZWRlbnRpYWxzLCBzcmMgYWxyZWFkeSBzZXQgCitQQVNTIGNyb3Nzb3JpZ2luIHVz
ZS1jcmVkZW50aWFscyB0byBhYnNlbnQsIHNyYyBhbHJlYWR5IHNldCAKK1BBU1MgY3Jvc3Nvcmln
aW4gdXNlLWNyZWRlbnRpYWxzIHRvIGVtcHR5LCBzcmMgYWxyZWFkeSBzZXQgCitQQVNTIGNyb3Nz
b3JpZ2luIHVzZS1jcmVkZW50aWFscyB0byBhbm9ueW1vdXMsIHNyYyBhbHJlYWR5IHNldCAKK1BB
U1MgY3Jvc3NvcmlnaW4gdXNlLWNyZWRlbnRpYWxzIHRvIGludmFsaWQsIHNyYyBhbHJlYWR5IHNl
dCAKIFBBU1MgcmVmZXJyZXJwb2xpY3kgYWJzZW50IHRvIG5vLXJlZmVycmVyLXdoZW4tZG93bmdy
YWRlLCBzcmMgYWJzZW50IAogUEFTUyByZWZlcnJlcnBvbGljeSBhYnNlbnQgdG8gbm8tcmVmZXJy
ZXIsIHNyYyBhYnNlbnQgCiBQQVNTIHJlZmVycmVycG9saWN5IGVtcHR5IHRvIG5vLXJlZmVycmVy
LXdoZW4tZG93bmdyYWRlLCBzcmMgYWJzZW50IApAQCAtNTUsMjQgKzU1LDI0IEBAIFBBU1MgcmVm
ZXJyZXJwb2xpY3kgbm8tcmVmZXJyZXIgdG8gYWJzZW50LCBzcmMgYWxyZWFkeSBzZXQKIFBBU1Mg
cmVmZXJyZXJwb2xpY3kgbm8tcmVmZXJyZXIgdG8gZW1wdHksIHNyYyBhbHJlYWR5IHNldCAKIFBB
U1MgcmVmZXJyZXJwb2xpY3kgbm8tcmVmZXJyZXIgdG8gbm8tcmVmZXJyZXItd2hlbi1kb3duZ3Jh
ZGUsIHNyYyBhbHJlYWR5IHNldCAKIFBBU1MgcmVmZXJyZXJwb2xpY3kgbm8tcmVmZXJyZXIgdG8g
aW52YWxpZCwgc3JjIGFscmVhZHkgc2V0IAotRkFJTCBpbnNlcnRlZCBpbnRvIHBpY3R1cmUgYXNz
ZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1
bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHJlbW92ZWQgZnJvbSBwaWN0dXJlIGFzc2VydF91bnJlYWNo
ZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUg
Y29kZQotRkFJTCBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGluc2VydGVkIGFz
c2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQg
dW5yZWFjaGFibGUgY29kZQotRkFJTCBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNl
IHJlbW92ZWQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBy
dW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2
aW91cyBzb3VyY2UgaGFzIHNyY3NldCBzZXQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBp
bWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHBhcmVu
dCBpcyBwaWN0dXJlLCBwcmV2aW91cyBzb3VyY2UgaGFzIHNyY3NldCBjaGFuZ2VkIGFzc2VydF91
bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFj
aGFibGUgY29kZQotRkFJTCBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyBz
cmNzZXQgcmVtb3ZlZCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlk
bid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKLUZBSUwgcGFyZW50IGlzIHBpY3R1cmUs
IHByZXZpb3VzIHNvdXJjZSBoYXMgc2l6ZXMgc2V0IGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0
aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQotRkFJTCBw
YXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyBzaXplcyBjaGFuZ2VkIGFzc2Vy
dF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5y
ZWFjaGFibGUgY29kZQotRkFJTCBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhh
cyBzaXplcyByZW1vdmVkIGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBk
aWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQotRkFJTCBwYXJlbnQgaXMgcGljdHVy
ZSwgcHJldmlvdXMgc291cmNlIGhhcyBtZWRpYSBzZXQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRl
IHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlM
IHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91cyBzb3VyY2UgaGFzIG1lZGlhIGNoYW5nZWQgYXNz
ZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1
bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91cyBzb3VyY2Ug
aGFzIG1lZGlhIHJlbW92ZWQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRh
IGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHBhcmVudCBpcyBwaWN0
dXJlLCBwcmV2aW91cyBzb3VyY2UgaGFzIHR5cGUgc2V0IGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0
ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQotRkFJ
TCBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyB0eXBlIGNoYW5nZWQgYXNz
ZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1
bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91cyBzb3VyY2Ug
aGFzIHR5cGUgcmVtb3ZlZCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEg
ZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKLVBBU1Mgc3Jjc2V0IGlzIHNldCB0
byBzYW1lIHZhbHVlIAotUEFTUyBzaXplcyBpcyBzZXQgdG8gc2FtZSB2YWx1ZSAKK1BBU1MgaW5z
ZXJ0ZWQgaW50byBwaWN0dXJlIAorUEFTUyByZW1vdmVkIGZyb20gcGljdHVyZSAKK1BBU1MgcGFy
ZW50IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNvdXJjZSBpbnNlcnRlZCAKK1BBU1MgcGFyZW50IGlz
IHBpY3R1cmUsIHByZXZpb3VzIHNvdXJjZSByZW1vdmVkIAorUEFTUyBwYXJlbnQgaXMgcGljdHVy
ZSwgcHJldmlvdXMgc291cmNlIGhhcyBzcmNzZXQgc2V0IAorUEFTUyBwYXJlbnQgaXMgcGljdHVy
ZSwgcHJldmlvdXMgc291cmNlIGhhcyBzcmNzZXQgY2hhbmdlZCAKK1BBU1MgcGFyZW50IGlzIHBp
Y3R1cmUsIHByZXZpb3VzIHNvdXJjZSBoYXMgc3Jjc2V0IHJlbW92ZWQgCitQQVNTIHBhcmVudCBp
cyBwaWN0dXJlLCBwcmV2aW91cyBzb3VyY2UgaGFzIHNpemVzIHNldCAKK1BBU1MgcGFyZW50IGlz
IHBpY3R1cmUsIHByZXZpb3VzIHNvdXJjZSBoYXMgc2l6ZXMgY2hhbmdlZCAKK1BBU1MgcGFyZW50
IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNvdXJjZSBoYXMgc2l6ZXMgcmVtb3ZlZCAKK1BBU1MgcGFy
ZW50IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNvdXJjZSBoYXMgbWVkaWEgc2V0IAorUEFTUyBwYXJl
bnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyBtZWRpYSBjaGFuZ2VkIAorUEFTUyBw
YXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyBtZWRpYSByZW1vdmVkIAorUEFT
UyBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyB0eXBlIHNldCAKK1BBU1Mg
cGFyZW50IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNvdXJjZSBoYXMgdHlwZSBjaGFuZ2VkIAorUEFT
UyBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyB0eXBlIHJlbW92ZWQgCitG
QUlMIHNyY3NldCBpcyBzZXQgdG8gc2FtZSB2YWx1ZSBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUg
dGhlIGltYWdlIGRhdGEgd2FzIHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKK0ZBSUwgc2l6
ZXMgaXMgc2V0IHRvIHNhbWUgdmFsdWUgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFn
ZSBkYXRhIHdhcyBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCiBQQVNTIGNyb3Nzb3JpZ2lu
IHN0YXRlIG5vdCBjaGFuZ2VkOiBhYnNlbnQsIHJlbW92ZUF0dHJpYnV0ZSAKIFBBU1MgY3Jvc3Nv
cmlnaW4gc3RhdGUgbm90IGNoYW5nZWQ6IGVtcHR5IHRvIGFub255bW91cyAKIFBBU1MgY3Jvc3Nv
cmlnaW4gc3RhdGUgbm90IGNoYW5nZWQ6IGFub255bW91cyB0byBmb29iYXIgCkBAIC04OSw5ICs4
OSw5IEBAIFBBU1MgYW5jZXN0b3IgcGljdHVyZSBoYXMgYSBzb3VyY2UgaW5zZXJ0ZWQKIFBBU1Mg
YW5jZXN0b3IgcGljdHVyZSBoYXMgYSBzb3VyY2UgcmVtb3ZlZCAKIFBBU1MgYW5jZXN0b3IgcGlj
dHVyZTsgcHJldmlvdXMgc2libGluZyBzb3VyY2UgaW5zZXJ0ZWQgCiBQQVNTIGFuY2VzdG9yIHBp
Y3R1cmU7IHByZXZpb3VzIHNpYmxpbmcgc291cmNlIHJlbW92ZWQgCi1QQVNTIHBhcmVudCBpcyBw
aWN0dXJlLCBmb2xsb3dpbmcgc2libGluZyBzb3VyY2UgaW5zZXJ0ZWQgCi1QQVNTIHBhcmVudCBp
cyBwaWN0dXJlLCBmb2xsb3dpbmcgc2libGluZyBzb3VyY2UgcmVtb3ZlZCAKLVBBU1MgcGFyZW50
IGlzIHBpY3R1cmUsIGZvbGxvd2luZyBzaWJsaW5nIHNvdXJjZSBoYXMgc3Jjc2V0IHNldCAKK0ZB
SUwgcGFyZW50IGlzIHBpY3R1cmUsIGZvbGxvd2luZyBzaWJsaW5nIHNvdXJjZSBpbnNlcnRlZCBh
c3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgd2FzIHJ1biBSZWFjaGVkIHVu
cmVhY2hhYmxlIGNvZGUKK0ZBSUwgcGFyZW50IGlzIHBpY3R1cmUsIGZvbGxvd2luZyBzaWJsaW5n
IHNvdXJjZSByZW1vdmVkIGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSB3
YXMgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQorRkFJTCBwYXJlbnQgaXMgcGljdHVyZSwg
Zm9sbG93aW5nIHNpYmxpbmcgc291cmNlIGhhcyBzcmNzZXQgc2V0IGFzc2VydF91bnJlYWNoZWQ6
IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSB3YXMgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQog
UEFTUyBtZWRpYSBvbiBpbWcgc2V0IAogUEFTUyB0eXBlIG9uIGltZyBzZXQgCiBQQVNTIGNsYXNz
IG9uIGltZyBzZXQgCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402428</attachid>
            <date>2020-06-21 10:52:16 -0700</date>
            <delta_ts>2020-06-22 03:42:16 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213335-20200621195214.patch</filename>
            <type>text/plain</type>
            <size>20880</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMzE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzMwNGYxM2JkY2E2MDI0
ZTFhNGY0NzUzNjcxOWY0MDNhMTJjYmI3ZS4uMjZkNzhjNDkyM2VhMDkwNzM1YWFmNzM4ZDY2MDU0
MzAzOGFiNGFhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTA2LTIxICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgSW1hZ2UgYGNyb3Nzb3JpZ2luYCBt
dXRhdGlvbnMgc2hvdWxkIGJlIGNvbnNpZGVyZWQgInJlbGV2YW50IG11dGF0aW9ucyIKKyAgICAg
ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzMzNQorCisgICAg
ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2UgY3Jvc3Nvcmln
aW4gYXR0cmlidXRlJ3Mgc3RhdGUgY2hhbmdlcyByZWxldmFudCBtdXRhdGlvbnMgWzFdLiBUaGlz
IGNoYW5nZQorICAgICAgICBhbHNvIGZpeGVzIHNldmVyYWwgcGljdHVyZSByZWxhdGVkIG11dGF0
aW9ucyB0byBiZSByZWxldmFudCBbMl0uCisKKyAgICAgICAgVGVzdDogaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1jb250ZW50L3RoZS1pbWct
ZWxlbWVudC9yZWxldmFudC1tdXRhdGlvbnMuaHRtbAorCisgICAgICAgIFsxXSBodHRwczovL2h0
bWwuc3BlYy53aGF0d2cub3JnLyNyZWFjdGluZy10by1kb20tbXV0YXRpb25zOmF0dHItaW1nLWNy
b3Nzb3JpZ2luCisgICAgICAgIFsyXSBodHRwczovL2h0bWwuc3BlYy53aGF0d2cub3JnLyNyZWFj
dGluZy10by1kb20tbXV0YXRpb25zCisKKyAgICAgICAgKiBodG1sL0hUTUxJbWFnZUVsZW1lbnQu
Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEltYWdlRWxlbWVudDo6YmVzdEZpdFNvdXJjZUZy
b21QaWN0dXJlRWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MSW1hZ2VFbGVtZW50Ojpl
dmFsdWF0ZUR5bmFtaWNNZWRpYVF1ZXJ5RGVwZW5kZW5jaWVzKToKKyAgICAgICAgKFdlYkNvcmU6
OkhUTUxJbWFnZUVsZW1lbnQ6OnNlbGVjdEltYWdlU291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6
OkhUTUxJbWFnZUVsZW1lbnQ6OmF0dHJpYnV0ZUNoYW5nZWQpOgorICAgICAgICAoV2ViQ29yZTo6
SFRNTEltYWdlRWxlbWVudDo6cGFyc2VBdHRyaWJ1dGUpOgorICAgICAgICAoV2ViQ29yZTo6SFRN
TEltYWdlRWxlbWVudDo6aW5zZXJ0ZWRJbnRvQW5jZXN0b3IpOgorICAgICAgICAoV2ViQ29yZTo6
SFRNTEltYWdlRWxlbWVudDo6cmVtb3ZlZEZyb21BbmNlc3Rvcik6CisgICAgICAgICogaHRtbC9I
VE1MSW1hZ2VFbGVtZW50Lmg6CisgICAgICAgICogaHRtbC9IVE1MUGljdHVyZUVsZW1lbnQuY3Bw
OgorICAgICAgICAoV2ViQ29yZTo6SFRNTFBpY3R1cmVFbGVtZW50Ojpzb3VyY2VzQ2hhbmdlZCk6
CisKIDIwMjAtMDYtMTkgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAg
ICBbQ29jb2FdIERlbGF5IGlzc3VpbmcgTWFuYWdlZFNlc3Npb24gJiBOZXR3b3JrIEV4dGVuc2lv
biBzYW5kYm94IGV4dGVuc2lvbnMgdW50aWwgYSBsb2FkIGlzIGFjdHVhbGx5IGlzc3VlZApkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW1hZ2VFbGVtZW50LmNwcCBiL1NvdXJj
ZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5jcHAKaW5kZXggZjFmZDYyMWI2ZDM2ZTg1
ZDBkYjY2NjdmOWFhODAyOGE4OGVjZTBjMC4uN2YwOTk0YjE4NGYyYTc1NzQxODdiMTVjZTVhNTgy
OTkxZGMzMTUwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW1hZ2VFbGVt
ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbWFnZUVsZW1lbnQuY3BwCkBA
IC0xNjYsNiArMTY2LDggQEAgSW1hZ2VDYW5kaWRhdGUgSFRNTEltYWdlRWxlbWVudDo6YmVzdEZp
dFNvdXJjZUZyb21QaWN0dXJlRWxlbWVudCgpCiAgICAgSW1hZ2VDYW5kaWRhdGUgY2FuZGlkYXRl
OwogCiAgICAgZm9yIChSZWZQdHI8Tm9kZT4gY2hpbGQgPSBwaWN0dXJlLT5maXJzdENoaWxkKCk7
IGNoaWxkICYmIGNoaWxkICE9IHRoaXM7IGNoaWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCkpIHsK
KyAgICAgICAgaWYgKGNoaWxkLmdldCgpID09IHRoaXMpCisgICAgICAgICAgICByZXR1cm4geyB9
OwogICAgICAgICBpZiAoIWlzPEhUTUxTb3VyY2VFbGVtZW50PigqY2hpbGQpKQogICAgICAgICAg
ICAgY29udGludWU7CiAgICAgICAgIGF1dG8mIHNvdXJjZSA9IGRvd25jYXN0PEhUTUxTb3VyY2VF
bGVtZW50PigqY2hpbGQpOwpAQCAtMjExLDEwICsyMTMsMTAgQEAgdm9pZCBIVE1MSW1hZ2VFbGVt
ZW50OjpldmFsdWF0ZUR5bmFtaWNNZWRpYVF1ZXJ5RGVwZW5kZW5jaWVzKCkKICAgICBpZiAoIWV2
YWx1YXRvci5ldmFsdWF0ZUZvckNoYW5nZXMobV9tZWRpYVF1ZXJ5RHluYW1pY1Jlc3VsdHMpKQog
ICAgICAgICByZXR1cm47CiAKLSAgICBzZWxlY3RJbWFnZVNvdXJjZSgpOworICAgIHNlbGVjdElt
YWdlU291cmNlKEltYWdlTG9hZGVyOjpSZWxldmFudE11dGF0aW9uOjpObyk7CiB9CiAKLXZvaWQg
SFRNTEltYWdlRWxlbWVudDo6c2VsZWN0SW1hZ2VTb3VyY2UoKQordm9pZCBIVE1MSW1hZ2VFbGVt
ZW50OjpzZWxlY3RJbWFnZVNvdXJjZShJbWFnZUxvYWRlcjo6UmVsZXZhbnRNdXRhdGlvbiByZWxl
dmFudE11dGF0aW9uKQogewogICAgIG1fbWVkaWFRdWVyeUR5bmFtaWNSZXN1bHRzID0geyB9Owog
ICAgIGRvY3VtZW50KCkucmVtb3ZlRHluYW1pY01lZGlhUXVlcnlEZXBlbmRlbnRJbWFnZSgqdGhp
cyk7CkBAIC0yMjgsNyArMjMwLDcgQEAgdm9pZCBIVE1MSW1hZ2VFbGVtZW50OjpzZWxlY3RJbWFn
ZVNvdXJjZSgpCiAgICAgICAgIGNhbmRpZGF0ZSA9IGJlc3RGaXRTb3VyY2VGb3JJbWFnZUF0dHJp
YnV0ZXMoZG9jdW1lbnQoKS5kZXZpY2VTY2FsZUZhY3RvcigpLCBhdHRyaWJ1dGVXaXRob3V0U3lu
Y2hyb25pemF0aW9uKHNyY0F0dHIpLCBhdHRyaWJ1dGVXaXRob3V0U3luY2hyb25pemF0aW9uKHNy
Y3NldEF0dHIpLCBzb3VyY2VTaXplKTsKICAgICB9CiAgICAgc2V0QmVzdEZpdFVSTEFuZERQUkZy
b21JbWFnZUNhbmRpZGF0ZShjYW5kaWRhdGUpOwotICAgIG1faW1hZ2VMb2FkZXItPnVwZGF0ZUZy
b21FbGVtZW50SWdub3JpbmdQcmV2aW91c0Vycm9yKCk7CisgICAgbV9pbWFnZUxvYWRlci0+dXBk
YXRlRnJvbUVsZW1lbnRJZ25vcmluZ1ByZXZpb3VzRXJyb3IocmVsZXZhbnRNdXRhdGlvbik7CiAK
ICAgICBpZiAoIW1fbWVkaWFRdWVyeUR5bmFtaWNSZXN1bHRzLmlzRW1wdHkoKSkKICAgICAgICAg
ZG9jdW1lbnQoKS5hZGREeW5hbWljTWVkaWFRdWVyeURlcGVuZGVudEltYWdlKCp0aGlzKTsKQEAg
LTI0MSwxNCArMjQzLDE5IEBAIGJvb2wgSFRNTEltYWdlRWxlbWVudDo6aGFzTGF6eUxvYWRhYmxl
QXR0cmlidXRlVmFsdWUoY29uc3QgQXRvbVN0cmluZyYgYXR0cmlidXRlCiAKIHZvaWQgSFRNTElt
YWdlRWxlbWVudDo6YXR0cmlidXRlQ2hhbmdlZChjb25zdCBRdWFsaWZpZWROYW1lJiBuYW1lLCBj
b25zdCBBdG9tU3RyaW5nJiBvbGRWYWx1ZSwgY29uc3QgQXRvbVN0cmluZyYgbmV3VmFsdWUsIEF0
dHJpYnV0ZU1vZGlmaWNhdGlvblJlYXNvbiByZWFzb24pCiB7CisgICAgSFRNTEVsZW1lbnQ6OmF0
dHJpYnV0ZUNoYW5nZWQobmFtZSwgb2xkVmFsdWUsIG5ld1ZhbHVlLCByZWFzb24pOworCiAgICAg
aWYgKG5hbWUgPT0gcmVmZXJyZXJwb2xpY3lBdHRyICYmIFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6
OnNoYXJlZEZlYXR1cmVzKCkucmVmZXJyZXJQb2xpY3lBdHRyaWJ1dGVFbmFibGVkKCkpIHsKICAg
ICAgICAgYXV0byBvbGRSZWZlcnJlclBvbGljeSA9IHBhcnNlUmVmZXJyZXJQb2xpY3kob2xkVmFs
dWUsIFJlZmVycmVyUG9saWN5U291cmNlOjpSZWZlcnJlclBvbGljeUF0dHJpYnV0ZSkudmFsdWVP
cihSZWZlcnJlclBvbGljeTo6RW1wdHlTdHJpbmcpOwogICAgICAgICBhdXRvIG5ld1JlZmVycmVy
UG9saWN5ID0gcGFyc2VSZWZlcnJlclBvbGljeShuZXdWYWx1ZSwgUmVmZXJyZXJQb2xpY3lTb3Vy
Y2U6OlJlZmVycmVyUG9saWN5QXR0cmlidXRlKS52YWx1ZU9yKFJlZmVycmVyUG9saWN5OjpFbXB0
eVN0cmluZyk7CiAgICAgICAgIGlmIChvbGRSZWZlcnJlclBvbGljeSAhPSBuZXdSZWZlcnJlclBv
bGljeSkKICAgICAgICAgICAgIG1faW1hZ2VMb2FkZXItPnVwZGF0ZUZyb21FbGVtZW50SWdub3Jp
bmdQcmV2aW91c0Vycm9yKEltYWdlTG9hZGVyOjpSZWxldmFudE11dGF0aW9uOjpZZXMpOworICAg
IH0gZWxzZSBpZiAobmFtZSA9PSBjcm9zc29yaWdpbkF0dHIpIHsKKyAgICAgICAgYXV0byBvbGRD
cm9zc29yaWdpblN0YXRlID0gb2xkVmFsdWUuaXNOdWxsKCkgPyAiZW1wdHkiIDogKGVxdWFsSWdu
b3JpbmdBU0NJSUNhc2Uob2xkVmFsdWUsICJ1c2UtY3JlZGVudGlhbHMiKSA/ICJ1c2UtY3JlZGVu
dGlhbHMiIDogImFub255bW91cyIpOworICAgICAgICBhdXRvIG5ld0Nyb3Nzb3JpZ2luU3RhdGUg
PSBuZXdWYWx1ZS5pc051bGwoKSA/ICJlbXB0eSIgOiAoZXF1YWxJZ25vcmluZ0FTQ0lJQ2FzZShu
ZXdWYWx1ZSwgInVzZS1jcmVkZW50aWFscyIpID8gInVzZS1jcmVkZW50aWFscyIgOiAiYW5vbnlt
b3VzIik7CisgICAgICAgIGlmIChvbGRDcm9zc29yaWdpblN0YXRlICE9IG5ld0Nyb3Nzb3JpZ2lu
U3RhdGUpCisgICAgICAgICAgICBtX2ltYWdlTG9hZGVyLT51cGRhdGVGcm9tRWxlbWVudElnbm9y
aW5nUHJldmlvdXNFcnJvcihJbWFnZUxvYWRlcjo6UmVsZXZhbnRNdXRhdGlvbjo6WWVzKTsKICAg
ICB9Ci0KLSAgICBIVE1MRWxlbWVudDo6YXR0cmlidXRlQ2hhbmdlZChuYW1lLCBvbGRWYWx1ZSwg
bmV3VmFsdWUsIHJlYXNvbik7CiB9CiAKIHZvaWQgSFRNTEltYWdlRWxlbWVudDo6cGFyc2VBdHRy
aWJ1dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYgbmFtZSwgY29uc3QgQXRvbVN0cmluZyYgdmFsdWUp
CkBAIC0yNTcsNyArMjY0LDcgQEAgdm9pZCBIVE1MSW1hZ2VFbGVtZW50OjpwYXJzZUF0dHJpYnV0
ZShjb25zdCBRdWFsaWZpZWROYW1lJiBuYW1lLCBjb25zdCBBdG9tU3RyaW4KICAgICAgICAgaWYg
KGlzPFJlbmRlckltYWdlPihyZW5kZXJlcigpKSkKICAgICAgICAgICAgIGRvd25jYXN0PFJlbmRl
ckltYWdlPigqcmVuZGVyZXIoKSkudXBkYXRlQWx0VGV4dCgpOwogICAgIH0gZWxzZSBpZiAobmFt
ZSA9PSBzcmNBdHRyIHx8IG5hbWUgPT0gc3Jjc2V0QXR0ciB8fCBuYW1lID09IHNpemVzQXR0cikK
LSAgICAgICAgc2VsZWN0SW1hZ2VTb3VyY2UoKTsKKyAgICAgICAgc2VsZWN0SW1hZ2VTb3VyY2Uo
SW1hZ2VMb2FkZXI6OlJlbGV2YW50TXV0YXRpb246Olllcyk7CiAgICAgZWxzZSBpZiAobmFtZSA9
PSB1c2VtYXBBdHRyKSB7CiAgICAgICAgIGlmIChpc0luVHJlZVNjb3BlKCkgJiYgIW1fcGFyc2Vk
VXNlbWFwLmlzTnVsbCgpKQogICAgICAgICAgICAgdHJlZVNjb3BlKCkucmVtb3ZlSW1hZ2VFbGVt
ZW50QnlVc2VtYXAoKm1fcGFyc2VkVXNlbWFwLmltcGwoKSwgKnRoaXMpOwpAQCAtNDA1LDkgKzQx
MiwxNyBAQCBOb2RlOjpJbnNlcnRlZEludG9BbmNlc3RvclJlc3VsdCBIVE1MSW1hZ2VFbGVtZW50
OjppbnNlcnRlZEludG9BbmNlc3RvcihJbnNlcnRpbwogICAgIGlmIChpbnNlcnRpb25UeXBlLnRy
ZWVTY29wZUNoYW5nZWQgJiYgIW1fcGFyc2VkVXNlbWFwLmlzTnVsbCgpKQogICAgICAgICB0cmVl
U2NvcGUoKS5hZGRJbWFnZUVsZW1lbnRCeVVzZW1hcCgqbV9wYXJzZWRVc2VtYXAuaW1wbCgpLCAq
dGhpcyk7CiAKLSAgICBpZiAoaXM8SFRNTFBpY3R1cmVFbGVtZW50PihwYXJlbnROb2RlKCkpKSB7
Ci0gICAgICAgIHNldFBpY3R1cmVFbGVtZW50KCZkb3duY2FzdDxIVE1MUGljdHVyZUVsZW1lbnQ+
KCpwYXJlbnROb2RlKCkpKTsKLSAgICAgICAgc2VsZWN0SW1hZ2VTb3VyY2UoKTsKKyAgICBpZiAo
aXM8SFRNTFBpY3R1cmVFbGVtZW50PigmcGFyZW50T2ZJbnNlcnRlZFRyZWUpKSB7CisgICAgICAg
IHNldFBpY3R1cmVFbGVtZW50KCZkb3duY2FzdDxIVE1MUGljdHVyZUVsZW1lbnQ+KHBhcmVudE9m
SW5zZXJ0ZWRUcmVlKSk7CisgICAgICAgIGlmIChpbnNlcnRpb25UeXBlLmNvbm5lY3RlZFRvRG9j
dW1lbnQpIHsKKyAgICAgICAgICAgIHNlbGVjdEltYWdlU291cmNlKEltYWdlTG9hZGVyOjpSZWxl
dmFudE11dGF0aW9uOjpZZXMpOworICAgICAgICAgICAgcmV0dXJuIGluc2VydE5vdGlmaWNhdGlv
blJlcXVlc3Q7CisgICAgICAgIH0KKyAgICAgICAgYXV0byBjYW5kaWRhdGUgPSBiZXN0Rml0U291
cmNlRnJvbVBpY3R1cmVFbGVtZW50KCk7CisgICAgICAgIGlmICghY2FuZGlkYXRlLmlzRW1wdHko
KSkgeworICAgICAgICAgICAgc2V0QmVzdEZpdFVSTEFuZERQUkZyb21JbWFnZUNhbmRpZGF0ZShj
YW5kaWRhdGUpOworICAgICAgICAgICAgbV9pbWFnZUxvYWRlci0+dXBkYXRlRnJvbUVsZW1lbnRJ
Z25vcmluZ1ByZXZpb3VzRXJyb3IoSW1hZ2VMb2FkZXI6OlJlbGV2YW50TXV0YXRpb246Olllcyk7
CisgICAgICAgIH0KICAgICB9CiAKICAgICAvLyBJZiB3ZSBoYXZlIGJlZW4gaW5zZXJ0ZWQgZnJv
bSBhIHJlbmRlcmVyLWxlc3MgZG9jdW1lbnQsCkBAIC00MzIsOCArNDQ3LDEwIEBAIHZvaWQgSFRN
TEltYWdlRWxlbWVudDo6cmVtb3ZlZEZyb21BbmNlc3RvcihSZW1vdmFsVHlwZSByZW1vdmFsVHlw
ZSwgQ29udGFpbmVyTm9kCiAgICAgaWYgKHJlbW92YWxUeXBlLnRyZWVTY29wZUNoYW5nZWQgJiYg
IW1fcGFyc2VkVXNlbWFwLmlzTnVsbCgpKQogICAgICAgICBvbGRQYXJlbnRPZlJlbW92ZWRUcmVl
LnRyZWVTY29wZSgpLnJlbW92ZUltYWdlRWxlbWVudEJ5VXNlbWFwKCptX3BhcnNlZFVzZW1hcC5p
bXBsKCksICp0aGlzKTsKIAotICAgIGlmIChpczxIVE1MUGljdHVyZUVsZW1lbnQ+KHBhcmVudE5v
ZGUoKSkpCisgICAgaWYgKGlzPEhUTUxQaWN0dXJlRWxlbWVudD4ob2xkUGFyZW50T2ZSZW1vdmVk
VHJlZSkpIHsKICAgICAgICAgc2V0UGljdHVyZUVsZW1lbnQobnVsbHB0cik7CisgICAgICAgIG1f
aW1hZ2VMb2FkZXItPnVwZGF0ZUZyb21FbGVtZW50SWdub3JpbmdQcmV2aW91c0Vycm9yKEltYWdl
TG9hZGVyOjpSZWxldmFudE11dGF0aW9uOjpZZXMpOworICAgIH0KIAogICAgIGlmIChyZW1vdmFs
VHlwZS5kaXNjb25uZWN0ZWRGcm9tRG9jdW1lbnQpCiAgICAgICAgIHVwZGF0ZUVkaXRhYmxlSW1h
Z2UoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5o
IGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW1hZ2VFbGVtZW50LmgKaW5kZXggMzY3NTAwZTll
NmU1NTRjYjgxZWYxYWUwNWQ1MzNhMDE0ZDJhNjkwNC4uNDM1MTcwNWQ5OTE2Nzc0YjEwZDZiZjVl
ZjAyZWYwMmFjY2NlMDc3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW1h
Z2VFbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW1hZ2VFbGVtZW50LmgK
QEAgLTI4LDYgKzI4LDcgQEAKICNpbmNsdWRlICJHcmFwaGljc0xheWVyLmgiCiAjaW5jbHVkZSAi
R3JhcGhpY3NUeXBlcy5oIgogI2luY2x1ZGUgIkhUTUxFbGVtZW50LmgiCisjaW5jbHVkZSAiSW1h
Z2VMb2FkZXIuaCIKICNpbmNsdWRlICJNZWRpYVF1ZXJ5RXZhbHVhdG9yLmgiCiAjaW5jbHVkZSA8
d3RmL1dlYWtQdHIuaD4KIApAQCAtMTgzLDcgKzE4NCw3IEBAIHByaXZhdGU6CiAKICAgICBib29s
IGlzSW50ZXJhY3RpdmVDb250ZW50KCkgY29uc3QgZmluYWw7CiAKLSAgICB2b2lkIHNlbGVjdElt
YWdlU291cmNlKCk7CisgICAgdm9pZCBzZWxlY3RJbWFnZVNvdXJjZShJbWFnZUxvYWRlcjo6UmVs
ZXZhbnRNdXRhdGlvbik7CiAKICAgICBJbWFnZUNhbmRpZGF0ZSBiZXN0Rml0U291cmNlRnJvbVBp
Y3R1cmVFbGVtZW50KCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBp
Y3R1cmVFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBpY3R1cmVFbGVtZW50
LmNwcAppbmRleCAxODBiNWI0OTU4MjA1NDVmMTYwZjZiN2U1MmY3YmYyNTU4MWY5MGU4Li5jMWRh
M2MzOTY3YThmNDU3MTMwNjg3MDIxNDQ0NDM5N2NhYjRhODg2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViQ29yZS9odG1sL0hUTUxQaWN0dXJlRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv
aHRtbC9IVE1MUGljdHVyZUVsZW1lbnQuY3BwCkBAIC02MCw3ICs2MCw3IEBAIFJlZjxIVE1MUGlj
dHVyZUVsZW1lbnQ+IEhUTUxQaWN0dXJlRWxlbWVudDo6Y3JlYXRlKGNvbnN0IFF1YWxpZmllZE5h
bWUmIHRhZ05hbWUsCiB2b2lkIEhUTUxQaWN0dXJlRWxlbWVudDo6c291cmNlc0NoYW5nZWQoKQog
ewogICAgIGZvciAoYXV0byYgZWxlbWVudCA6IGNoaWxkcmVuT2ZUeXBlPEhUTUxJbWFnZUVsZW1l
bnQ+KCp0aGlzKSkKLSAgICAgICAgZWxlbWVudC5zZWxlY3RJbWFnZVNvdXJjZSgpOworICAgICAg
ICBlbGVtZW50LnNlbGVjdEltYWdlU291cmNlKEltYWdlTG9hZGVyOjpSZWxldmFudE11dGF0aW9u
OjpZZXMpOwogfQogCiAjaWYgVVNFKFNZU1RFTV9QUkVWSUVXKQpkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYkNvcmUvaHRtbC9IVE1MU291cmNlRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1s
L0hUTUxTb3VyY2VFbGVtZW50LmNwcAppbmRleCA0MjE2ZTk3NmI0ODIwYjc4YzEzNDViMzY0Zjhl
ZDQwNzI3YmUwMTBmLi40OTQ1ODk5ZDQyMzkxZDAxYzZjNzNlN2E3YWEyMzI1ZjY3OTc4ZDdiIDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTb3VyY2VFbGVtZW50LmNwcAorKysg
Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTb3VyY2VFbGVtZW50LmNwcApAQCAtMjgsNiArMjgs
NyBAQAogCiAjaW5jbHVkZSAiRXZlbnQuaCIKICNpbmNsdWRlICJFdmVudE5hbWVzLmgiCisjaW5j
bHVkZSAiSFRNTEltYWdlRWxlbWVudC5oIgogI2luY2x1ZGUgIkhUTUxOYW1lcy5oIgogI2luY2x1
ZGUgIkhUTUxQaWN0dXJlRWxlbWVudC5oIgogI2luY2x1ZGUgIkxvZ2dpbmcuaCIKQEAgLTc2LDgg
Kzc3LDE1IEBAIE5vZGU6Okluc2VydGVkSW50b0FuY2VzdG9yUmVzdWx0IEhUTUxTb3VyY2VFbGVt
ZW50OjppbnNlcnRlZEludG9BbmNlc3RvcihJbnNlcnRpCiAgICAgICAgICAgICBkb3duY2FzdDxI
VE1MTWVkaWFFbGVtZW50PigqcGFyZW50KS5zb3VyY2VXYXNBZGRlZCgqdGhpcyk7CiAgICAgICAg
IGVsc2UKICNlbmRpZgotICAgICAgICBpZiAoaXM8SFRNTFBpY3R1cmVFbGVtZW50PigqcGFyZW50
KSkKLSAgICAgICAgICAgIGRvd25jYXN0PEhUTUxQaWN0dXJlRWxlbWVudD4oKnBhcmVudCkuc291
cmNlc0NoYW5nZWQoKTsKKyAgICAgICAgaWYgKGlzPEhUTUxQaWN0dXJlRWxlbWVudD4oKnBhcmVu
dCkpIHsKKyAgICAgICAgICAgIG1fdmFsaWRTb3VyY2VFbGVtZW50ID0gdHJ1ZTsKKyAgICAgICAg
ICAgIGZvciAoY29uc3QgTm9kZSogbm9kZSA9IHByZXZpb3VzU2libGluZygpOyBub2RlOyBub2Rl
ID0gbm9kZS0+cHJldmlvdXNTaWJsaW5nKCkpIHsKKyAgICAgICAgICAgICAgICBpZiAoaXM8SFRN
TEltYWdlRWxlbWVudD4oKm5vZGUpKQorICAgICAgICAgICAgICAgICAgICBtX3ZhbGlkU291cmNl
RWxlbWVudCA9IGZhbHNlOworICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKG1fdmFsaWRT
b3VyY2VFbGVtZW50KQorICAgICAgICAgICAgICAgIGRvd25jYXN0PEhUTUxQaWN0dXJlRWxlbWVu
dD4oKnBhcmVudCkuc291cmNlc0NoYW5nZWQoKTsKKyAgICAgICAgfQogICAgIH0KICAgICByZXR1
cm4gSW5zZXJ0ZWRJbnRvQW5jZXN0b3JSZXN1bHQ6OkRvbmU7CiB9CkBAIC05MSw3ICs5OSw3IEBA
IHZvaWQgSFRNTFNvdXJjZUVsZW1lbnQ6OnJlbW92ZWRGcm9tQW5jZXN0b3IoUmVtb3ZhbFR5cGUg
cmVtb3ZhbFR5cGUsIENvbnRhaW5lck5vCiAgICAgICAgICAgICBkb3duY2FzdDxIVE1MTWVkaWFF
bGVtZW50PihvbGRQYXJlbnRPZlJlbW92ZWRUcmVlKS5zb3VyY2VXYXNSZW1vdmVkKCp0aGlzKTsK
ICAgICAgICAgZWxzZQogI2VuZGlmCi0gICAgICAgIGlmIChpczxIVE1MUGljdHVyZUVsZW1lbnQ+
KG9sZFBhcmVudE9mUmVtb3ZlZFRyZWUpKQorICAgICAgICBpZiAoaXM8SFRNTFBpY3R1cmVFbGVt
ZW50PihvbGRQYXJlbnRPZlJlbW92ZWRUcmVlKSAmJiBtX3ZhbGlkU291cmNlRWxlbWVudCkKICAg
ICAgICAgICAgIGRvd25jYXN0PEhUTUxQaWN0dXJlRWxlbWVudD4ob2xkUGFyZW50T2ZSZW1vdmVk
VHJlZSkuc291cmNlc0NoYW5nZWQoKTsKICAgICB9CiB9CkBAIC0xNTYsNyArMTY0LDcgQEAgdm9p
ZCBIVE1MU291cmNlRWxlbWVudDo6cGFyc2VBdHRyaWJ1dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYg
bmFtZSwgY29uc3QgQXRvbVN0cmkKICAgICAgICAgaWYgKG5hbWUgPT0gbWVkaWFBdHRyKQogICAg
ICAgICAgICAgbV9jYWNoZWRQYXJzZWRNZWRpYUF0dHJpYnV0ZSA9IFdURjo6bnVsbG9wdDsKICAg
ICAgICAgYXV0byBwYXJlbnQgPSBtYWtlUmVmUHRyKHBhcmVudE5vZGUoKSk7Ci0gICAgICAgIGlm
IChpczxIVE1MUGljdHVyZUVsZW1lbnQ+KHBhcmVudCkpCisgICAgICAgIGlmIChpczxIVE1MUGlj
dHVyZUVsZW1lbnQ+KHBhcmVudCkgJiYgbV92YWxpZFNvdXJjZUVsZW1lbnQpCiAgICAgICAgICAg
ICBkb3duY2FzdDxIVE1MUGljdHVyZUVsZW1lbnQ+KCpwYXJlbnQpLnNvdXJjZXNDaGFuZ2VkKCk7
CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MU291cmNlRWxl
bWVudC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MU291cmNlRWxlbWVudC5oCmluZGV4IDRk
ZjBhZjU0MmQzNTNjNDIxMWIwMzg4YTgyNTYzZDQ1YmYxMmNkNDYuLjZjNmExNGQ3ZTQ4OGUwMzBi
MTdmNTEwNzY2YzU4MWRlNzRkYjNiNjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv
SFRNTFNvdXJjZUVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTb3VyY2VF
bGVtZW50LmgKQEAgLTYyLDYgKzYyLDcgQEAgcHJpdmF0ZToKIAogICAgIFRpbWVyIG1fZXJyb3JF
dmVudFRpbWVyOwogICAgIGJvb2wgbV9zaG91bGRSZXNjaGVkdWxlRXJyb3JFdmVudE9uUmVzdW1l
IHsgZmFsc2UgfTsKKyAgICBib29sIG1fdmFsaWRTb3VyY2VFbGVtZW50IHsgZmFsc2UgfTsKICAg
ICBtdXRhYmxlIE9wdGlvbmFsPFJlZlB0cjxjb25zdCBNZWRpYVF1ZXJ5U2V0Pj4gbV9jYWNoZWRQ
YXJzZWRNZWRpYUF0dHJpYnV0ZTsKIH07CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9y
dGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmlu
ZGV4IDYzMmUyY2NhNmFkNDlmNTEwOTRlMGU2MTU4NWQ1N2Y3ODNiN2FlZmYuLjdlYzMyNjIzYjgx
NGRiYzAzNTQ0YWVhYTM5NTlhNDliMmQ4MWMzNzggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2lt
cG9ydGVkL3czYy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5n
ZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIwLTA2LTIxICBSb2IgQnVpcyAgPHJidWlzQGlnYWxp
YS5jb20+CisKKyAgICAgICAgSW1hZ2UgYGNyb3Nzb3JpZ2luYCBtdXRhdGlvbnMgc2hvdWxkIGJl
IGNvbnNpZGVyZWQgInJlbGV2YW50IG11dGF0aW9ucyIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzMzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P
Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZSBpbXByb3ZlZCB0ZXN0IHJlc3VsdC4KKwor
ICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL2NhbnZhcy9lbGVtZW50L2RyYXdpbmct
aW1hZ2VzLXRvLXRoZS1jYW52YXMvZHJhd2ltYWdlX2Nyb3Nzb3JpZ2luLnN1Yi1leHBlY3RlZC50
eHQ6CisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL2VtYmVkZGVk
LWNvbnRlbnQvdGhlLWltZy1lbGVtZW50L3JlbGV2YW50LW11dGF0aW9ucy1leHBlY3RlZC50eHQ6
CisKIDIwMjAtMDYtMTkgIENsYXJrIFdhbmcgIDxjbGFya193YW5nQGFwcGxlLmNvbT4KIAogICAg
ICAgICBSZW1vdmUgc2V0VmVsb2NpdHkoKSBmcm9tIFBhbm5lck5vZGUKZGlmZiAtLWdpdCBhL0xh
eW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9jYW52YXMvZWxl
bWVudC9kcmF3aW5nLWltYWdlcy10by10aGUtY2FudmFzL2RyYXdpbWFnZV9jcm9zc29yaWdpbi5z
dWItZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9odG1sL2NhbnZhcy9lbGVtZW50L2RyYXdpbmctaW1hZ2VzLXRvLXRoZS1jYW52YXMvZHJh
d2ltYWdlX2Nyb3Nzb3JpZ2luLnN1Yi1leHBlY3RlZC50eHQKaW5kZXggNzMzNGQ1ODcxNmI4MGFm
NzBiYTM2Mjk1YjljMmQ5YzNiMTBkMjJhMi4uYjczZmZkY2E1MjJiMGViZjgzY2MwMDRhY2UwODE1
ZGQ5YWRiMWIxOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9odG1sL2NhbnZhcy9lbGVtZW50L2RyYXdpbmctaW1hZ2VzLXRvLXRoZS1jYW52
YXMvZHJhd2ltYWdlX2Nyb3Nzb3JpZ2luLnN1Yi1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVz
dHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL2NhbnZhcy9lbGVtZW50L2Ry
YXdpbmctaW1hZ2VzLXRvLXRoZS1jYW52YXMvZHJhd2ltYWdlX2Nyb3Nzb3JpZ2luLnN1Yi1leHBl
Y3RlZC50eHQKQEAgLTEsNSArMSw2IEBACiBCbG9ja2VkIGFjY2VzcyB0byBleHRlcm5hbCBVUkwg
aHR0cDovL3d3dy5sb2NhbGhvc3Q6ODgwMC9pbWFnZXMvZ3JlZW4ucG5nP3BpcGU9aGVhZGVyKEFj
Y2Vzcy1Db250cm9sLUFsbG93LU9yaWdpbiwqKQogQmxvY2tlZCBhY2Nlc3MgdG8gZXh0ZXJuYWwg
VVJMIGh0dHA6Ly93d3cubG9jYWxob3N0Ojg4MDAvaW1hZ2VzL2dyZWVuLnBuZz9waXBlPWhlYWRl
cihBY2Nlc3MtQ29udHJvbC1BbGxvdy1PcmlnaW4sKikKK0Jsb2NrZWQgYWNjZXNzIHRvIGV4dGVy
bmFsIFVSTCBodHRwOi8vd3d3LmxvY2FsaG9zdDo4ODAwL2ltYWdlcy9ncmVlbi5wbmc/cGlwZT1o
ZWFkZXIoQWNjZXNzLUNvbnRyb2wtQWxsb3ctT3JpZ2luLCopCiBCbG9ja2VkIGFjY2VzcyB0byBl
eHRlcm5hbCBVUkwgaHR0cDovL3d3dy5sb2NhbGhvc3Q6ODgwMC9pbWFnZXMvZ3JlZW4ucG5nCiAK
IFBBU1MgQ2FuIGdldCBwaXhlbHMgb2YgY2FudmFzIHdpdGggc2FtZSBvcmlnaW4gaW1hZ2UgZHJh
d24gCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2h0bWwvc2VtYW50aWNzL2VtYmVkZGVkLWNvbnRlbnQvdGhlLWltZy1lbGVtZW50L3JlbGV2
YW50LW11dGF0aW9ucy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL2VtYmVkZGVkLWNvbnRlbnQvdGhlLWltZy1l
bGVtZW50L3JlbGV2YW50LW11dGF0aW9ucy1leHBlY3RlZC50eHQKaW5kZXggMTFjZTQ0NjM0ODEx
ZWI5OTgxYTgwMjM0ZGQyMjc3M2JhZDc2OWZmZS4uYjUzNmYzYzI0MzI5ZTFhMmRiOTg4NWQzNjFm
MmFlMTEwMThjNDZhZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1jb250ZW50L3RoZS1pbWctZWxl
bWVudC9yZWxldmFudC1tdXRhdGlvbnMtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2lt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1iZWRkZWQtY29u
dGVudC90aGUtaW1nLWVsZW1lbnQvcmVsZXZhbnQtbXV0YXRpb25zLWV4cGVjdGVkLnR4dApAQCAt
MSwxNCArMSwxNCBAQAogCiBQQVNTIHNyYyBzZXQgCi1GQUlMIHNyYyBjaGFuZ2VkIGFzc2VydF91
bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFj
aGFibGUgY29kZQorUEFTUyBzcmMgY2hhbmdlZCAKIFBBU1Mgc3JjIHJlbW92ZWQgCiBQQVNTIHNy
Y3NldCBzZXQgCi1GQUlMIHNyY3NldCBjaGFuZ2VkIGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0
aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQorUEFTUyBz
cmNzZXQgY2hhbmdlZCAKIFBBU1Mgc3Jjc2V0IHJlbW92ZWQgCiBQQVNTIHNpemVzIHNldCAKIFBB
U1Mgc2l6ZXMgY2hhbmdlZCAKIFBBU1Mgc2l6ZXMgcmVtb3ZlZCAKLUZBSUwgc3JjIHNldCB0byBz
YW1lIHZhbHVlIGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3Qg
cnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQorUEFTUyBzcmMgc2V0IHRvIHNhbWUgdmFsdWUg
CiBQQVNTIGNyb3Nzb3JpZ2luIGFic2VudCB0byBlbXB0eSwgc3JjIGFic2VudCAKIFBBU1MgY3Jv
c3NvcmlnaW4gYWJzZW50IHRvIGFub255bW91cywgc3JjIGFic2VudCAKIFBBU1MgY3Jvc3Nvcmln
aW4gYWJzZW50IHRvIHVzZS1jcmVkZW50aWFscywgc3JjIGFic2VudCAKQEAgLTIwLDE3ICsyMCwx
NyBAQCBQQVNTIGNyb3Nzb3JpZ2luIHVzZS1jcmVkZW50aWFscyB0byBhYnNlbnQsIHNyYyBhYnNl
bnQKIFBBU1MgY3Jvc3NvcmlnaW4gdXNlLWNyZWRlbnRpYWxzIHRvIGVtcHR5LCBzcmMgYWJzZW50
IAogUEFTUyBjcm9zc29yaWdpbiB1c2UtY3JlZGVudGlhbHMgdG8gYW5vbnltb3VzLCBzcmMgYWJz
ZW50IAogUEFTUyBjcm9zc29yaWdpbiB1c2UtY3JlZGVudGlhbHMgdG8gaW52YWxpZCwgc3JjIGFi
c2VudCAKLUZBSUwgY3Jvc3NvcmlnaW4gYWJzZW50IHRvIGVtcHR5LCBzcmMgYWxyZWFkeSBzZXQg
YXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hl
ZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIGNyb3Nzb3JpZ2luIGFic2VudCB0byBhbm9ueW1vdXMs
IHNyYyBhbHJlYWR5IHNldCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEg
ZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKLUZBSUwgY3Jvc3NvcmlnaW4gYWJz
ZW50IHRvIHVzZS1jcmVkZW50aWFscywgc3JjIGFscmVhZHkgc2V0IGFzc2VydF91bnJlYWNoZWQ6
IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29k
ZQotRkFJTCBjcm9zc29yaWdpbiBlbXB0eSB0byBhYnNlbnQsIHNyYyBhbHJlYWR5IHNldCBhc3Nl
cnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVu
cmVhY2hhYmxlIGNvZGUKLUZBSUwgY3Jvc3NvcmlnaW4gZW1wdHkgdG8gdXNlLWNyZWRlbnRpYWxz
LCBzcmMgYWxyZWFkeSBzZXQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRh
IGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIGNyb3Nzb3JpZ2luIGFu
b255bW91cyB0byBhYnNlbnQsIHNyYyBhbHJlYWR5IHNldCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRh
dGUgdGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKLUZB
SUwgY3Jvc3NvcmlnaW4gYW5vbnltb3VzIHRvIHVzZS1jcmVkZW50aWFscywgc3JjIGFscmVhZHkg
c2V0IGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJl
YWNoZWQgdW5yZWFjaGFibGUgY29kZQotRkFJTCBjcm9zc29yaWdpbiB1c2UtY3JlZGVudGlhbHMg
dG8gYWJzZW50LCBzcmMgYWxyZWFkeSBzZXQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBp
bWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIGNyb3Nz
b3JpZ2luIHVzZS1jcmVkZW50aWFscyB0byBlbXB0eSwgc3JjIGFscmVhZHkgc2V0IGFzc2VydF91
bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFj
aGFibGUgY29kZQotRkFJTCBjcm9zc29yaWdpbiB1c2UtY3JlZGVudGlhbHMgdG8gYW5vbnltb3Vz
LCBzcmMgYWxyZWFkeSBzZXQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRh
IGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIGNyb3Nzb3JpZ2luIHVz
ZS1jcmVkZW50aWFscyB0byBpbnZhbGlkLCBzcmMgYWxyZWFkeSBzZXQgYXNzZXJ0X3VucmVhY2hl
ZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBj
b2RlCitQQVNTIGNyb3Nzb3JpZ2luIGFic2VudCB0byBlbXB0eSwgc3JjIGFscmVhZHkgc2V0IAor
UEFTUyBjcm9zc29yaWdpbiBhYnNlbnQgdG8gYW5vbnltb3VzLCBzcmMgYWxyZWFkeSBzZXQgCitQ
QVNTIGNyb3Nzb3JpZ2luIGFic2VudCB0byB1c2UtY3JlZGVudGlhbHMsIHNyYyBhbHJlYWR5IHNl
dCAKK1BBU1MgY3Jvc3NvcmlnaW4gZW1wdHkgdG8gYWJzZW50LCBzcmMgYWxyZWFkeSBzZXQgCitQ
QVNTIGNyb3Nzb3JpZ2luIGVtcHR5IHRvIHVzZS1jcmVkZW50aWFscywgc3JjIGFscmVhZHkgc2V0
IAorUEFTUyBjcm9zc29yaWdpbiBhbm9ueW1vdXMgdG8gYWJzZW50LCBzcmMgYWxyZWFkeSBzZXQg
CitQQVNTIGNyb3Nzb3JpZ2luIGFub255bW91cyB0byB1c2UtY3JlZGVudGlhbHMsIHNyYyBhbHJl
YWR5IHNldCAKK1BBU1MgY3Jvc3NvcmlnaW4gdXNlLWNyZWRlbnRpYWxzIHRvIGFic2VudCwgc3Jj
IGFscmVhZHkgc2V0IAorUEFTUyBjcm9zc29yaWdpbiB1c2UtY3JlZGVudGlhbHMgdG8gZW1wdHks
IHNyYyBhbHJlYWR5IHNldCAKK1BBU1MgY3Jvc3NvcmlnaW4gdXNlLWNyZWRlbnRpYWxzIHRvIGFu
b255bW91cywgc3JjIGFscmVhZHkgc2V0IAorUEFTUyBjcm9zc29yaWdpbiB1c2UtY3JlZGVudGlh
bHMgdG8gaW52YWxpZCwgc3JjIGFscmVhZHkgc2V0IAogUEFTUyByZWZlcnJlcnBvbGljeSBhYnNl
bnQgdG8gbm8tcmVmZXJyZXItd2hlbi1kb3duZ3JhZGUsIHNyYyBhYnNlbnQgCiBQQVNTIHJlZmVy
cmVycG9saWN5IGFic2VudCB0byBuby1yZWZlcnJlciwgc3JjIGFic2VudCAKIFBBU1MgcmVmZXJy
ZXJwb2xpY3kgZW1wdHkgdG8gbm8tcmVmZXJyZXItd2hlbi1kb3duZ3JhZGUsIHNyYyBhYnNlbnQg
CkBAIC01NSwyNCArNTUsMjQgQEAgUEFTUyByZWZlcnJlcnBvbGljeSBuby1yZWZlcnJlciB0byBh
YnNlbnQsIHNyYyBhbHJlYWR5IHNldAogUEFTUyByZWZlcnJlcnBvbGljeSBuby1yZWZlcnJlciB0
byBlbXB0eSwgc3JjIGFscmVhZHkgc2V0IAogUEFTUyByZWZlcnJlcnBvbGljeSBuby1yZWZlcnJl
ciB0byBuby1yZWZlcnJlci13aGVuLWRvd25ncmFkZSwgc3JjIGFscmVhZHkgc2V0IAogUEFTUyBy
ZWZlcnJlcnBvbGljeSBuby1yZWZlcnJlciB0byBpbnZhbGlkLCBzcmMgYWxyZWFkeSBzZXQgCi1G
QUlMIGluc2VydGVkIGludG8gcGljdHVyZSBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGlt
YWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKLUZBSUwgcmVtb3Zl
ZCBmcm9tIHBpY3R1cmUgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRp
ZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHBhcmVudCBpcyBwaWN0dXJl
LCBwcmV2aW91cyBzb3VyY2UgaW5zZXJ0ZWQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBp
bWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHBhcmVu
dCBpcyBwaWN0dXJlLCBwcmV2aW91cyBzb3VyY2UgcmVtb3ZlZCBhc3NlcnRfdW5yZWFjaGVkOiB1
cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUK
LUZBSUwgcGFyZW50IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNvdXJjZSBoYXMgc3Jjc2V0IHNldCBh
c3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVk
IHVucmVhY2hhYmxlIGNvZGUKLUZBSUwgcGFyZW50IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNvdXJj
ZSBoYXMgc3Jjc2V0IGNoYW5nZWQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBk
YXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHBhcmVudCBpcyBw
aWN0dXJlLCBwcmV2aW91cyBzb3VyY2UgaGFzIHNyY3NldCByZW1vdmVkIGFzc2VydF91bnJlYWNo
ZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUg
Y29kZQotRkFJTCBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyBzaXplcyBz
ZXQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVh
Y2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91cyBz
b3VyY2UgaGFzIHNpemVzIGNoYW5nZWQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFn
ZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHBhcmVudCBp
cyBwaWN0dXJlLCBwcmV2aW91cyBzb3VyY2UgaGFzIHNpemVzIHJlbW92ZWQgYXNzZXJ0X3VucmVh
Y2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJs
ZSBjb2RlCi1GQUlMIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91cyBzb3VyY2UgaGFzIG1lZGlh
IHNldCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBS
ZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKLUZBSUwgcGFyZW50IGlzIHBpY3R1cmUsIHByZXZpb3Vz
IHNvdXJjZSBoYXMgbWVkaWEgY2hhbmdlZCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGlt
YWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKLUZBSUwgcGFyZW50
IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNvdXJjZSBoYXMgbWVkaWEgcmVtb3ZlZCBhc3NlcnRfdW5y
ZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hh
YmxlIGNvZGUKLUZBSUwgcGFyZW50IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNvdXJjZSBoYXMgdHlw
ZSBzZXQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4g
UmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91
cyBzb3VyY2UgaGFzIHR5cGUgY2hhbmdlZCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGlt
YWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKLUZBSUwgcGFyZW50
IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNvdXJjZSBoYXMgdHlwZSByZW1vdmVkIGFzc2VydF91bnJl
YWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFi
bGUgY29kZQotUEFTUyBzcmNzZXQgaXMgc2V0IHRvIHNhbWUgdmFsdWUgCi1QQVNTIHNpemVzIGlz
IHNldCB0byBzYW1lIHZhbHVlIAorUEFTUyBpbnNlcnRlZCBpbnRvIHBpY3R1cmUgCitQQVNTIHJl
bW92ZWQgZnJvbSBwaWN0dXJlIAorUEFTUyBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291
cmNlIGluc2VydGVkIAorUEFTUyBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIHJl
bW92ZWQgCitQQVNTIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91cyBzb3VyY2UgaGFzIHNyY3Nl
dCBzZXQgCitQQVNTIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91cyBzb3VyY2UgaGFzIHNyY3Nl
dCBjaGFuZ2VkIAorUEFTUyBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyBz
cmNzZXQgcmVtb3ZlZCAKK1BBU1MgcGFyZW50IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNvdXJjZSBo
YXMgc2l6ZXMgc2V0IAorUEFTUyBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhh
cyBzaXplcyBjaGFuZ2VkIAorUEFTUyBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNl
IGhhcyBzaXplcyByZW1vdmVkIAorUEFTUyBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291
cmNlIGhhcyBtZWRpYSBzZXQgCitQQVNTIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91cyBzb3Vy
Y2UgaGFzIG1lZGlhIGNoYW5nZWQgCitQQVNTIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91cyBz
b3VyY2UgaGFzIG1lZGlhIHJlbW92ZWQgCitQQVNTIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91
cyBzb3VyY2UgaGFzIHR5cGUgc2V0IAorUEFTUyBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMg
c291cmNlIGhhcyB0eXBlIGNoYW5nZWQgCitQQVNTIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91
cyBzb3VyY2UgaGFzIHR5cGUgcmVtb3ZlZCAKK0ZBSUwgc3Jjc2V0IGlzIHNldCB0byBzYW1lIHZh
bHVlIGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSB3YXMgcnVuIFJlYWNo
ZWQgdW5yZWFjaGFibGUgY29kZQorRkFJTCBzaXplcyBpcyBzZXQgdG8gc2FtZSB2YWx1ZSBhc3Nl
cnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgd2FzIHJ1biBSZWFjaGVkIHVucmVh
Y2hhYmxlIGNvZGUKIFBBU1MgY3Jvc3NvcmlnaW4gc3RhdGUgbm90IGNoYW5nZWQ6IGFic2VudCwg
cmVtb3ZlQXR0cmlidXRlIAogUEFTUyBjcm9zc29yaWdpbiBzdGF0ZSBub3QgY2hhbmdlZDogZW1w
dHkgdG8gYW5vbnltb3VzIAogUEFTUyBjcm9zc29yaWdpbiBzdGF0ZSBub3QgY2hhbmdlZDogYW5v
bnltb3VzIHRvIGZvb2JhciAK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402448</attachid>
            <date>2020-06-22 00:50:37 -0700</date>
            <delta_ts>2020-06-22 02:55:57 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213335-20200622095035.patch</filename>
            <type>text/plain</type>
            <size>21379</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMzE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzMwNGYxM2JkY2E2MDI0
ZTFhNGY0NzUzNjcxOWY0MDNhMTJjYmI3ZS4uODM2NmM3NzU1ODdkNTA0MDQxNmE5MmJmMjlhMGI2
MDQwMDA1NTYzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDIwLTA2LTIyICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgSW1hZ2UgYGNyb3Nzb3JpZ2luYCBt
dXRhdGlvbnMgc2hvdWxkIGJlIGNvbnNpZGVyZWQgInJlbGV2YW50IG11dGF0aW9ucyIKKyAgICAg
ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzMzNQorCisgICAg
ICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIE1ha2UgY3Jvc3NvcmlnaW4g
YXR0cmlidXRlJ3Mgc3RhdGUgY2hhbmdlcyByZWxldmFudCBtdXRhdGlvbnMgWzFdLiBUaGlzIGNo
YW5nZQorICAgICAgICBhbHNvIGZpeGVzIHNldmVyYWwgcGljdHVyZSByZWxhdGVkIG11dGF0aW9u
cyB0byBiZSByZWxldmFudCBbMl0uCisKKyAgICAgICAgVGVzdDogaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1jb250ZW50L3RoZS1pbWctZWxl
bWVudC9yZWxldmFudC1tdXRhdGlvbnMuaHRtbAorCisgICAgICAgIFsxXSBodHRwczovL2h0bWwu
c3BlYy53aGF0d2cub3JnLyNyZWFjdGluZy10by1kb20tbXV0YXRpb25zOmF0dHItaW1nLWNyb3Nz
b3JpZ2luCisgICAgICAgIFsyXSBodHRwczovL2h0bWwuc3BlYy53aGF0d2cub3JnLyNyZWFjdGlu
Zy10by1kb20tbXV0YXRpb25zCisKKyAgICAgICAgKiBodG1sL0hUTUxJbWFnZUVsZW1lbnQuY3Bw
OgorICAgICAgICAoV2ViQ29yZTo6SFRNTEltYWdlRWxlbWVudDo6YmVzdEZpdFNvdXJjZUZyb21Q
aWN0dXJlRWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MSW1hZ2VFbGVtZW50OjpldmFs
dWF0ZUR5bmFtaWNNZWRpYVF1ZXJ5RGVwZW5kZW5jaWVzKToKKyAgICAgICAgKFdlYkNvcmU6OkhU
TUxJbWFnZUVsZW1lbnQ6OnNlbGVjdEltYWdlU291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6OnBh
cnNlQ3Jvc3NvcmlnaW5TdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MSW1hZ2VFbGVtZW50
OjphdHRyaWJ1dGVDaGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxJbWFnZUVsZW1lbnQ6
OnBhcnNlQXR0cmlidXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxJbWFnZUVsZW1lbnQ6Omlu
c2VydGVkSW50b0FuY2VzdG9yKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxJbWFnZUVsZW1lbnQ6
OnJlbW92ZWRGcm9tQW5jZXN0b3IpOgorICAgICAgICAqIGh0bWwvSFRNTEltYWdlRWxlbWVudC5o
OgorICAgICAgICAqIGh0bWwvSFRNTFBpY3R1cmVFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNv
cmU6OkhUTUxQaWN0dXJlRWxlbWVudDo6c291cmNlc0NoYW5nZWQpOgorICAgICAgICAqIGh0bWwv
SFRNTFNvdXJjZUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFNvdXJjZUVsZW1l
bnQ6Omluc2VydGVkSW50b0FuY2VzdG9yKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxTb3VyY2VF
bGVtZW50OjpyZW1vdmVkRnJvbUFuY2VzdG9yKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxTb3Vy
Y2VFbGVtZW50OjpwYXJzZUF0dHJpYnV0ZSk6CisgICAgICAgICogaHRtbC9IVE1MU291cmNlRWxl
bWVudC5oOgorCiAyMDIwLTA2LTE5ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAK
ICAgICAgICAgW0NvY29hXSBEZWxheSBpc3N1aW5nIE1hbmFnZWRTZXNzaW9uICYgTmV0d29yayBF
eHRlbnNpb24gc2FuZGJveCBleHRlbnNpb25zIHVudGlsIGEgbG9hZCBpcyBhY3R1YWxseSBpc3N1
ZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5jcHAg
Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbWFnZUVsZW1lbnQuY3BwCmluZGV4IGYxZmQ2MjFi
NmQzNmU4NWQwZGI2NjY3ZjlhYTgwMjhhODhlY2UwYzAuLjE0ZDI0YWNjMjYwNmFlNmM4ZmUyY2Zl
OGIwYTYwYTNlNTVkNTQ5NzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElt
YWdlRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW1hZ2VFbGVtZW50
LmNwcApAQCAtMTY2LDYgKzE2Niw4IEBAIEltYWdlQ2FuZGlkYXRlIEhUTUxJbWFnZUVsZW1lbnQ6
OmJlc3RGaXRTb3VyY2VGcm9tUGljdHVyZUVsZW1lbnQoKQogICAgIEltYWdlQ2FuZGlkYXRlIGNh
bmRpZGF0ZTsKIAogICAgIGZvciAoUmVmUHRyPE5vZGU+IGNoaWxkID0gcGljdHVyZS0+Zmlyc3RD
aGlsZCgpOyBjaGlsZCAmJiBjaGlsZCAhPSB0aGlzOyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGlu
ZygpKSB7CisgICAgICAgIGlmIChjaGlsZCA9PSB0aGlzKQorICAgICAgICAgICAgcmV0dXJuIHsg
fTsKICAgICAgICAgaWYgKCFpczxIVE1MU291cmNlRWxlbWVudD4oKmNoaWxkKSkKICAgICAgICAg
ICAgIGNvbnRpbnVlOwogICAgICAgICBhdXRvJiBzb3VyY2UgPSBkb3duY2FzdDxIVE1MU291cmNl
RWxlbWVudD4oKmNoaWxkKTsKQEAgLTIxMSwxMCArMjEzLDEwIEBAIHZvaWQgSFRNTEltYWdlRWxl
bWVudDo6ZXZhbHVhdGVEeW5hbWljTWVkaWFRdWVyeURlcGVuZGVuY2llcygpCiAgICAgaWYgKCFl
dmFsdWF0b3IuZXZhbHVhdGVGb3JDaGFuZ2VzKG1fbWVkaWFRdWVyeUR5bmFtaWNSZXN1bHRzKSkK
ICAgICAgICAgcmV0dXJuOwogCi0gICAgc2VsZWN0SW1hZ2VTb3VyY2UoKTsKKyAgICBzZWxlY3RJ
bWFnZVNvdXJjZShJbWFnZUxvYWRlcjo6UmVsZXZhbnRNdXRhdGlvbjo6Tm8pOwogfQogCi12b2lk
IEhUTUxJbWFnZUVsZW1lbnQ6OnNlbGVjdEltYWdlU291cmNlKCkKK3ZvaWQgSFRNTEltYWdlRWxl
bWVudDo6c2VsZWN0SW1hZ2VTb3VyY2UoSW1hZ2VMb2FkZXI6OlJlbGV2YW50TXV0YXRpb24gcmVs
ZXZhbnRNdXRhdGlvbikKIHsKICAgICBtX21lZGlhUXVlcnlEeW5hbWljUmVzdWx0cyA9IHsgfTsK
ICAgICBkb2N1bWVudCgpLnJlbW92ZUR5bmFtaWNNZWRpYVF1ZXJ5RGVwZW5kZW50SW1hZ2UoKnRo
aXMpOwpAQCAtMjI4LDcgKzIzMCw3IEBAIHZvaWQgSFRNTEltYWdlRWxlbWVudDo6c2VsZWN0SW1h
Z2VTb3VyY2UoKQogICAgICAgICBjYW5kaWRhdGUgPSBiZXN0Rml0U291cmNlRm9ySW1hZ2VBdHRy
aWJ1dGVzKGRvY3VtZW50KCkuZGV2aWNlU2NhbGVGYWN0b3IoKSwgYXR0cmlidXRlV2l0aG91dFN5
bmNocm9uaXphdGlvbihzcmNBdHRyKSwgYXR0cmlidXRlV2l0aG91dFN5bmNocm9uaXphdGlvbihz
cmNzZXRBdHRyKSwgc291cmNlU2l6ZSk7CiAgICAgfQogICAgIHNldEJlc3RGaXRVUkxBbmREUFJG
cm9tSW1hZ2VDYW5kaWRhdGUoY2FuZGlkYXRlKTsKLSAgICBtX2ltYWdlTG9hZGVyLT51cGRhdGVG
cm9tRWxlbWVudElnbm9yaW5nUHJldmlvdXNFcnJvcigpOworICAgIG1faW1hZ2VMb2FkZXItPnVw
ZGF0ZUZyb21FbGVtZW50SWdub3JpbmdQcmV2aW91c0Vycm9yKHJlbGV2YW50TXV0YXRpb24pOwog
CiAgICAgaWYgKCFtX21lZGlhUXVlcnlEeW5hbWljUmVzdWx0cy5pc0VtcHR5KCkpCiAgICAgICAg
IGRvY3VtZW50KCkuYWRkRHluYW1pY01lZGlhUXVlcnlEZXBlbmRlbnRJbWFnZSgqdGhpcyk7CkBA
IC0yMzksMTYgKzI0MSwyNyBAQCBib29sIEhUTUxJbWFnZUVsZW1lbnQ6Omhhc0xhenlMb2FkYWJs
ZUF0dHJpYnV0ZVZhbHVlKGNvbnN0IEF0b21TdHJpbmcmIGF0dHJpYnV0ZQogICAgIHJldHVybiBl
cXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShhdHRyaWJ1dGVWYWx1ZSwgImxhenkiKTsKIH0K
IAorZW51bSBDcm9zc09yaWdpblN0YXRlIHsgTm90U2V0LCBVc2VDcmVkZW50aWFscywgQW5vbnlt
b3VzIH07CitzdGF0aWMgQ3Jvc3NPcmlnaW5TdGF0ZSBwYXJzZUNyb3Nzb3JpZ2luU3RhdGUoY29u
c3QgQXRvbVN0cmluZyYgY3Jvc3NvcmlnaW5WYWx1ZSkKK3sKKyAgICBpZiAoY3Jvc3NvcmlnaW5W
YWx1ZS5pc051bGwoKSkKKyAgICAgICAgcmV0dXJuIE5vdFNldDsKKyAgICByZXR1cm4gZXF1YWxJ
Z25vcmluZ0FTQ0lJQ2FzZShjcm9zc29yaWdpblZhbHVlLCAidXNlLWNyZWRlbnRpYWxzIikgPyBV
c2VDcmVkZW50aWFscyA6IEFub255bW91czsKK30KKwogdm9pZCBIVE1MSW1hZ2VFbGVtZW50Ojph
dHRyaWJ1dGVDaGFuZ2VkKGNvbnN0IFF1YWxpZmllZE5hbWUmIG5hbWUsIGNvbnN0IEF0b21TdHJp
bmcmIG9sZFZhbHVlLCBjb25zdCBBdG9tU3RyaW5nJiBuZXdWYWx1ZSwgQXR0cmlidXRlTW9kaWZp
Y2F0aW9uUmVhc29uIHJlYXNvbikKIHsKKyAgICBIVE1MRWxlbWVudDo6YXR0cmlidXRlQ2hhbmdl
ZChuYW1lLCBvbGRWYWx1ZSwgbmV3VmFsdWUsIHJlYXNvbik7CisKICAgICBpZiAobmFtZSA9PSBy
ZWZlcnJlcnBvbGljeUF0dHIgJiYgUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVy
ZXMoKS5yZWZlcnJlclBvbGljeUF0dHJpYnV0ZUVuYWJsZWQoKSkgewogICAgICAgICBhdXRvIG9s
ZFJlZmVycmVyUG9saWN5ID0gcGFyc2VSZWZlcnJlclBvbGljeShvbGRWYWx1ZSwgUmVmZXJyZXJQ
b2xpY3lTb3VyY2U6OlJlZmVycmVyUG9saWN5QXR0cmlidXRlKS52YWx1ZU9yKFJlZmVycmVyUG9s
aWN5OjpFbXB0eVN0cmluZyk7CiAgICAgICAgIGF1dG8gbmV3UmVmZXJyZXJQb2xpY3kgPSBwYXJz
ZVJlZmVycmVyUG9saWN5KG5ld1ZhbHVlLCBSZWZlcnJlclBvbGljeVNvdXJjZTo6UmVmZXJyZXJQ
b2xpY3lBdHRyaWJ1dGUpLnZhbHVlT3IoUmVmZXJyZXJQb2xpY3k6OkVtcHR5U3RyaW5nKTsKICAg
ICAgICAgaWYgKG9sZFJlZmVycmVyUG9saWN5ICE9IG5ld1JlZmVycmVyUG9saWN5KQogICAgICAg
ICAgICAgbV9pbWFnZUxvYWRlci0+dXBkYXRlRnJvbUVsZW1lbnRJZ25vcmluZ1ByZXZpb3VzRXJy
b3IoSW1hZ2VMb2FkZXI6OlJlbGV2YW50TXV0YXRpb246Olllcyk7CisgICAgfSBlbHNlIGlmIChu
YW1lID09IGNyb3Nzb3JpZ2luQXR0cikgeworICAgICAgICBpZiAocGFyc2VDcm9zc29yaWdpblN0
YXRlKG9sZFZhbHVlKSAhPSBwYXJzZUNyb3Nzb3JpZ2luU3RhdGUobmV3VmFsdWUpKQorICAgICAg
ICAgICAgbV9pbWFnZUxvYWRlci0+dXBkYXRlRnJvbUVsZW1lbnRJZ25vcmluZ1ByZXZpb3VzRXJy
b3IoSW1hZ2VMb2FkZXI6OlJlbGV2YW50TXV0YXRpb246Olllcyk7CiAgICAgfQotCi0gICAgSFRN
TEVsZW1lbnQ6OmF0dHJpYnV0ZUNoYW5nZWQobmFtZSwgb2xkVmFsdWUsIG5ld1ZhbHVlLCByZWFz
b24pOwogfQogCiB2b2lkIEhUTUxJbWFnZUVsZW1lbnQ6OnBhcnNlQXR0cmlidXRlKGNvbnN0IFF1
YWxpZmllZE5hbWUmIG5hbWUsIGNvbnN0IEF0b21TdHJpbmcmIHZhbHVlKQpAQCAtMjU3LDcgKzI3
MCw3IEBAIHZvaWQgSFRNTEltYWdlRWxlbWVudDo6cGFyc2VBdHRyaWJ1dGUoY29uc3QgUXVhbGlm
aWVkTmFtZSYgbmFtZSwgY29uc3QgQXRvbVN0cmluCiAgICAgICAgIGlmIChpczxSZW5kZXJJbWFn
ZT4ocmVuZGVyZXIoKSkpCiAgICAgICAgICAgICBkb3duY2FzdDxSZW5kZXJJbWFnZT4oKnJlbmRl
cmVyKCkpLnVwZGF0ZUFsdFRleHQoKTsKICAgICB9IGVsc2UgaWYgKG5hbWUgPT0gc3JjQXR0ciB8
fCBuYW1lID09IHNyY3NldEF0dHIgfHwgbmFtZSA9PSBzaXplc0F0dHIpCi0gICAgICAgIHNlbGVj
dEltYWdlU291cmNlKCk7CisgICAgICAgIHNlbGVjdEltYWdlU291cmNlKEltYWdlTG9hZGVyOjpS
ZWxldmFudE11dGF0aW9uOjpZZXMpOwogICAgIGVsc2UgaWYgKG5hbWUgPT0gdXNlbWFwQXR0cikg
ewogICAgICAgICBpZiAoaXNJblRyZWVTY29wZSgpICYmICFtX3BhcnNlZFVzZW1hcC5pc051bGwo
KSkKICAgICAgICAgICAgIHRyZWVTY29wZSgpLnJlbW92ZUltYWdlRWxlbWVudEJ5VXNlbWFwKCpt
X3BhcnNlZFVzZW1hcC5pbXBsKCksICp0aGlzKTsKQEAgLTQwNSw5ICs0MTgsMTcgQEAgTm9kZTo6
SW5zZXJ0ZWRJbnRvQW5jZXN0b3JSZXN1bHQgSFRNTEltYWdlRWxlbWVudDo6aW5zZXJ0ZWRJbnRv
QW5jZXN0b3IoSW5zZXJ0aW8KICAgICBpZiAoaW5zZXJ0aW9uVHlwZS50cmVlU2NvcGVDaGFuZ2Vk
ICYmICFtX3BhcnNlZFVzZW1hcC5pc051bGwoKSkKICAgICAgICAgdHJlZVNjb3BlKCkuYWRkSW1h
Z2VFbGVtZW50QnlVc2VtYXAoKm1fcGFyc2VkVXNlbWFwLmltcGwoKSwgKnRoaXMpOwogCi0gICAg
aWYgKGlzPEhUTUxQaWN0dXJlRWxlbWVudD4ocGFyZW50Tm9kZSgpKSkgewotICAgICAgICBzZXRQ
aWN0dXJlRWxlbWVudCgmZG93bmNhc3Q8SFRNTFBpY3R1cmVFbGVtZW50PigqcGFyZW50Tm9kZSgp
KSk7Ci0gICAgICAgIHNlbGVjdEltYWdlU291cmNlKCk7CisgICAgaWYgKGlzPEhUTUxQaWN0dXJl
RWxlbWVudD4oJnBhcmVudE9mSW5zZXJ0ZWRUcmVlKSkgeworICAgICAgICBzZXRQaWN0dXJlRWxl
bWVudCgmZG93bmNhc3Q8SFRNTFBpY3R1cmVFbGVtZW50PihwYXJlbnRPZkluc2VydGVkVHJlZSkp
OworICAgICAgICBpZiAoaW5zZXJ0aW9uVHlwZS5jb25uZWN0ZWRUb0RvY3VtZW50KSB7CisgICAg
ICAgICAgICBzZWxlY3RJbWFnZVNvdXJjZShJbWFnZUxvYWRlcjo6UmVsZXZhbnRNdXRhdGlvbjo6
WWVzKTsKKyAgICAgICAgICAgIHJldHVybiBpbnNlcnROb3RpZmljYXRpb25SZXF1ZXN0OworICAg
ICAgICB9CisgICAgICAgIGF1dG8gY2FuZGlkYXRlID0gYmVzdEZpdFNvdXJjZUZyb21QaWN0dXJl
RWxlbWVudCgpOworICAgICAgICBpZiAoIWNhbmRpZGF0ZS5pc0VtcHR5KCkpIHsKKyAgICAgICAg
ICAgIHNldEJlc3RGaXRVUkxBbmREUFJGcm9tSW1hZ2VDYW5kaWRhdGUoY2FuZGlkYXRlKTsKKyAg
ICAgICAgICAgIG1faW1hZ2VMb2FkZXItPnVwZGF0ZUZyb21FbGVtZW50SWdub3JpbmdQcmV2aW91
c0Vycm9yKEltYWdlTG9hZGVyOjpSZWxldmFudE11dGF0aW9uOjpZZXMpOworICAgICAgICB9CiAg
ICAgfQogCiAgICAgLy8gSWYgd2UgaGF2ZSBiZWVuIGluc2VydGVkIGZyb20gYSByZW5kZXJlci1s
ZXNzIGRvY3VtZW50LApAQCAtNDMyLDggKzQ1MywxMCBAQCB2b2lkIEhUTUxJbWFnZUVsZW1lbnQ6
OnJlbW92ZWRGcm9tQW5jZXN0b3IoUmVtb3ZhbFR5cGUgcmVtb3ZhbFR5cGUsIENvbnRhaW5lck5v
ZAogICAgIGlmIChyZW1vdmFsVHlwZS50cmVlU2NvcGVDaGFuZ2VkICYmICFtX3BhcnNlZFVzZW1h
cC5pc051bGwoKSkKICAgICAgICAgb2xkUGFyZW50T2ZSZW1vdmVkVHJlZS50cmVlU2NvcGUoKS5y
ZW1vdmVJbWFnZUVsZW1lbnRCeVVzZW1hcCgqbV9wYXJzZWRVc2VtYXAuaW1wbCgpLCAqdGhpcyk7
CiAKLSAgICBpZiAoaXM8SFRNTFBpY3R1cmVFbGVtZW50PihwYXJlbnROb2RlKCkpKQorICAgIGlm
IChpczxIVE1MUGljdHVyZUVsZW1lbnQ+KG9sZFBhcmVudE9mUmVtb3ZlZFRyZWUpKSB7CiAgICAg
ICAgIHNldFBpY3R1cmVFbGVtZW50KG51bGxwdHIpOworICAgICAgICBtX2ltYWdlTG9hZGVyLT51
cGRhdGVGcm9tRWxlbWVudElnbm9yaW5nUHJldmlvdXNFcnJvcihJbWFnZUxvYWRlcjo6UmVsZXZh
bnRNdXRhdGlvbjo6WWVzKTsKKyAgICB9CiAKICAgICBpZiAocmVtb3ZhbFR5cGUuZGlzY29ubmVj
dGVkRnJvbURvY3VtZW50KQogICAgICAgICB1cGRhdGVFZGl0YWJsZUltYWdlKCk7CmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbWFnZUVsZW1lbnQuaCBiL1NvdXJjZS9XZWJD
b3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5oCmluZGV4IDM2NzUwMGU5ZTZlNTU0Y2I4MWVmMWFl
MDVkNTMzYTAxNGQyYTY5MDQuLjQzNTE3MDVkOTkxNjc3NGIxMGQ2YmY1ZWYwMmVmMDJhY2NjZTA3
NzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5oCisr
KyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5oCkBAIC0yOCw2ICsyOCw3
IEBACiAjaW5jbHVkZSAiR3JhcGhpY3NMYXllci5oIgogI2luY2x1ZGUgIkdyYXBoaWNzVHlwZXMu
aCIKICNpbmNsdWRlICJIVE1MRWxlbWVudC5oIgorI2luY2x1ZGUgIkltYWdlTG9hZGVyLmgiCiAj
aW5jbHVkZSAiTWVkaWFRdWVyeUV2YWx1YXRvci5oIgogI2luY2x1ZGUgPHd0Zi9XZWFrUHRyLmg+
CiAKQEAgLTE4Myw3ICsxODQsNyBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBpc0ludGVyYWN0aXZl
Q29udGVudCgpIGNvbnN0IGZpbmFsOwogCi0gICAgdm9pZCBzZWxlY3RJbWFnZVNvdXJjZSgpOwor
ICAgIHZvaWQgc2VsZWN0SW1hZ2VTb3VyY2UoSW1hZ2VMb2FkZXI6OlJlbGV2YW50TXV0YXRpb24p
OwogCiAgICAgSW1hZ2VDYW5kaWRhdGUgYmVzdEZpdFNvdXJjZUZyb21QaWN0dXJlRWxlbWVudCgp
OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQaWN0dXJlRWxlbWVudC5j
cHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQaWN0dXJlRWxlbWVudC5jcHAKaW5kZXggMTgw
YjViNDk1ODIwNTQ1ZjE2MGY2YjdlNTJmN2JmMjU1ODFmOTBlOC4uYzFkYTNjMzk2N2E4ZjQ1NzEz
MDY4NzAyMTQ0NDQzOTdjYWI0YTg4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9I
VE1MUGljdHVyZUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBpY3R1
cmVFbGVtZW50LmNwcApAQCAtNjAsNyArNjAsNyBAQCBSZWY8SFRNTFBpY3R1cmVFbGVtZW50PiBI
VE1MUGljdHVyZUVsZW1lbnQ6OmNyZWF0ZShjb25zdCBRdWFsaWZpZWROYW1lJiB0YWdOYW1lLAog
dm9pZCBIVE1MUGljdHVyZUVsZW1lbnQ6OnNvdXJjZXNDaGFuZ2VkKCkKIHsKICAgICBmb3IgKGF1
dG8mIGVsZW1lbnQgOiBjaGlsZHJlbk9mVHlwZTxIVE1MSW1hZ2VFbGVtZW50PigqdGhpcykpCi0g
ICAgICAgIGVsZW1lbnQuc2VsZWN0SW1hZ2VTb3VyY2UoKTsKKyAgICAgICAgZWxlbWVudC5zZWxl
Y3RJbWFnZVNvdXJjZShJbWFnZUxvYWRlcjo6UmVsZXZhbnRNdXRhdGlvbjo6WWVzKTsKIH0KIAog
I2lmIFVTRShTWVNURU1fUFJFVklFVykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv
SFRNTFNvdXJjZUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MU291cmNlRWxl
bWVudC5jcHAKaW5kZXggNDIxNmU5NzZiNDgyMGI3OGMxMzQ1YjM2NGY4ZWQ0MDcyN2JlMDEwZi4u
MTA2YWFkMDk4NWM2OTM4ODRkNWNjNWQ0YjNiZDAzOGFjNDUxNDhhMCAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYkNvcmUvaHRtbC9IVE1MU291cmNlRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNv
cmUvaHRtbC9IVE1MU291cmNlRWxlbWVudC5jcHAKQEAgLTI4LDYgKzI4LDcgQEAKIAogI2luY2x1
ZGUgIkV2ZW50LmgiCiAjaW5jbHVkZSAiRXZlbnROYW1lcy5oIgorI2luY2x1ZGUgIkhUTUxJbWFn
ZUVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MTmFtZXMuaCIKICNpbmNsdWRlICJIVE1MUGljdHVy
ZUVsZW1lbnQuaCIKICNpbmNsdWRlICJMb2dnaW5nLmgiCkBAIC03Niw4ICs3NywxNiBAQCBOb2Rl
OjpJbnNlcnRlZEludG9BbmNlc3RvclJlc3VsdCBIVE1MU291cmNlRWxlbWVudDo6aW5zZXJ0ZWRJ
bnRvQW5jZXN0b3IoSW5zZXJ0aQogICAgICAgICAgICAgZG93bmNhc3Q8SFRNTE1lZGlhRWxlbWVu
dD4oKnBhcmVudCkuc291cmNlV2FzQWRkZWQoKnRoaXMpOwogICAgICAgICBlbHNlCiAjZW5kaWYK
LSAgICAgICAgaWYgKGlzPEhUTUxQaWN0dXJlRWxlbWVudD4oKnBhcmVudCkpCi0gICAgICAgICAg
ICBkb3duY2FzdDxIVE1MUGljdHVyZUVsZW1lbnQ+KCpwYXJlbnQpLnNvdXJjZXNDaGFuZ2VkKCk7
CisgICAgICAgIGlmIChpczxIVE1MUGljdHVyZUVsZW1lbnQ+KCpwYXJlbnQpKSB7CisgICAgICAg
ICAgICAvLyBUaGUgbmV3IHNvdXJjZSBlbGVtZW50IG9ubHkgaXMgYSByZWxldmFudCBtdXRhdGlv
biBpZiBpdCBwcmVjZWRlcyBhbnkgaW1nIGVsZW1lbnQuCisgICAgICAgICAgICBtX3Nob3VsZENh
bGxTb3VyY2VzQ2hhbmdlZCA9IHRydWU7CisgICAgICAgICAgICBmb3IgKGNvbnN0IE5vZGUqIG5v
ZGUgPSBwcmV2aW91c1NpYmxpbmcoKTsgbm9kZTsgbm9kZSA9IG5vZGUtPnByZXZpb3VzU2libGlu
ZygpKSB7CisgICAgICAgICAgICAgICAgaWYgKGlzPEhUTUxJbWFnZUVsZW1lbnQ+KCpub2RlKSkK
KyAgICAgICAgICAgICAgICAgICAgbV9zaG91bGRDYWxsU291cmNlc0NoYW5nZWQgPSBmYWxzZTsK
KyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmIChtX3Nob3VsZENhbGxTb3VyY2VzQ2hhbmdl
ZCkKKyAgICAgICAgICAgICAgICBkb3duY2FzdDxIVE1MUGljdHVyZUVsZW1lbnQ+KCpwYXJlbnQp
LnNvdXJjZXNDaGFuZ2VkKCk7CisgICAgICAgIH0KICAgICB9CiAgICAgcmV0dXJuIEluc2VydGVk
SW50b0FuY2VzdG9yUmVzdWx0OjpEb25lOwogfQpAQCAtOTEsOCArMTAwLDEwIEBAIHZvaWQgSFRN
TFNvdXJjZUVsZW1lbnQ6OnJlbW92ZWRGcm9tQW5jZXN0b3IoUmVtb3ZhbFR5cGUgcmVtb3ZhbFR5
cGUsIENvbnRhaW5lck5vCiAgICAgICAgICAgICBkb3duY2FzdDxIVE1MTWVkaWFFbGVtZW50Pihv
bGRQYXJlbnRPZlJlbW92ZWRUcmVlKS5zb3VyY2VXYXNSZW1vdmVkKCp0aGlzKTsKICAgICAgICAg
ZWxzZQogI2VuZGlmCi0gICAgICAgIGlmIChpczxIVE1MUGljdHVyZUVsZW1lbnQ+KG9sZFBhcmVu
dE9mUmVtb3ZlZFRyZWUpKQorICAgICAgICBpZiAobV9zaG91bGRDYWxsU291cmNlc0NoYW5nZWQp
IHsKICAgICAgICAgICAgIGRvd25jYXN0PEhUTUxQaWN0dXJlRWxlbWVudD4ob2xkUGFyZW50T2ZS
ZW1vdmVkVHJlZSkuc291cmNlc0NoYW5nZWQoKTsKKyAgICAgICAgICAgIG1fc2hvdWxkQ2FsbFNv
dXJjZXNDaGFuZ2VkID0gZmFsc2U7CisgICAgICAgIH0KICAgICB9CiB9CiAKQEAgLTE1Niw3ICsx
NjcsNyBAQCB2b2lkIEhUTUxTb3VyY2VFbGVtZW50OjpwYXJzZUF0dHJpYnV0ZShjb25zdCBRdWFs
aWZpZWROYW1lJiBuYW1lLCBjb25zdCBBdG9tU3RyaQogICAgICAgICBpZiAobmFtZSA9PSBtZWRp
YUF0dHIpCiAgICAgICAgICAgICBtX2NhY2hlZFBhcnNlZE1lZGlhQXR0cmlidXRlID0gV1RGOjpu
dWxsb3B0OwogICAgICAgICBhdXRvIHBhcmVudCA9IG1ha2VSZWZQdHIocGFyZW50Tm9kZSgpKTsK
LSAgICAgICAgaWYgKGlzPEhUTUxQaWN0dXJlRWxlbWVudD4ocGFyZW50KSkKKyAgICAgICAgaWYg
KG1fc2hvdWxkQ2FsbFNvdXJjZXNDaGFuZ2VkKQogICAgICAgICAgICAgZG93bmNhc3Q8SFRNTFBp
Y3R1cmVFbGVtZW50PigqcGFyZW50KS5zb3VyY2VzQ2hhbmdlZCgpOwogICAgIH0KIH0KZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFNvdXJjZUVsZW1lbnQuaCBiL1NvdXJjZS9X
ZWJDb3JlL2h0bWwvSFRNTFNvdXJjZUVsZW1lbnQuaAppbmRleCA0ZGYwYWY1NDJkMzUzYzQyMTFi
MDM4OGE4MjU2M2Q0NWJmMTJjZDQ2Li5lNGFlMWE1NGYxOGYyMDZjNWE0OGE5MGMxYzQ4ZWNmYjEy
ZGJlODc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTb3VyY2VFbGVtZW50
LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MU291cmNlRWxlbWVudC5oCkBAIC02Miw2
ICs2Miw3IEBAIHByaXZhdGU6CiAKICAgICBUaW1lciBtX2Vycm9yRXZlbnRUaW1lcjsKICAgICBi
b29sIG1fc2hvdWxkUmVzY2hlZHVsZUVycm9yRXZlbnRPblJlc3VtZSB7IGZhbHNlIH07CisgICAg
Ym9vbCBtX3Nob3VsZENhbGxTb3VyY2VzQ2hhbmdlZCB7IGZhbHNlIH07CiAgICAgbXV0YWJsZSBP
cHRpb25hbDxSZWZQdHI8Y29uc3QgTWVkaWFRdWVyeVNldD4+IG1fY2FjaGVkUGFyc2VkTWVkaWFB
dHRyaWJ1dGU7CiB9OwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hh
bmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwppbmRleCA2MzJlMmNj
YTZhZDQ5ZjUxMDk0ZTBlNjE1ODVkNTdmNzgzYjdhZWZmLi4wNmE4MmVmOWI5MjNlY2EzMjE2ZGM2
N2M0NzY2NzMzMGQ4NDNlNjI5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv
Q2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwxNSBAQAorMjAyMC0wNi0yMiAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisg
ICAgICAgIEltYWdlIGBjcm9zc29yaWdpbmAgbXV0YXRpb25zIHNob3VsZCBiZSBjb25zaWRlcmVk
ICJyZWxldmFudCBtdXRhdGlvbnMiCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No
b3dfYnVnLmNnaT9pZD0yMTMzMzUKKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4K
KworICAgICAgICBVcGRhdGUgaW1wcm92ZWQgdGVzdCByZXN1bHQuCisKKyAgICAgICAgKiB3ZWIt
cGxhdGZvcm0tdGVzdHMvaHRtbC9jYW52YXMvZWxlbWVudC9kcmF3aW5nLWltYWdlcy10by10aGUt
Y2FudmFzL2RyYXdpbWFnZV9jcm9zc29yaWdpbi5zdWItZXhwZWN0ZWQudHh0OgorICAgICAgICAq
IHdlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1jb250ZW50L3RoZS1p
bWctZWxlbWVudC9yZWxldmFudC1tdXRhdGlvbnMtZXhwZWN0ZWQudHh0OgorCiAyMDIwLTA2LTE5
ICBDbGFyayBXYW5nICA8Y2xhcmtfd2FuZ0BhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHNl
dFZlbG9jaXR5KCkgZnJvbSBQYW5uZXJOb2RlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvY2FudmFzL2VsZW1lbnQvZHJhd2luZy1p
bWFnZXMtdG8tdGhlLWNhbnZhcy9kcmF3aW1hZ2VfY3Jvc3NvcmlnaW4uc3ViLWV4cGVjdGVkLnR4
dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9jYW52
YXMvZWxlbWVudC9kcmF3aW5nLWltYWdlcy10by10aGUtY2FudmFzL2RyYXdpbWFnZV9jcm9zc29y
aWdpbi5zdWItZXhwZWN0ZWQudHh0CmluZGV4IDczMzRkNTg3MTZiODBhZjcwYmEzNjI5NWI5YzJk
OWMzYjEwZDIyYTIuLmI3M2ZmZGNhNTIyYjBlYmY4M2NjMDA0YWNlMDgxNWRkOWFkYjFiMTkgMTAw
NjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRt
bC9jYW52YXMvZWxlbWVudC9kcmF3aW5nLWltYWdlcy10by10aGUtY2FudmFzL2RyYXdpbWFnZV9j
cm9zc29yaWdpbi5zdWItZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9jYW52YXMvZWxlbWVudC9kcmF3aW5nLWltYWdlcy10
by10aGUtY2FudmFzL2RyYXdpbWFnZV9jcm9zc29yaWdpbi5zdWItZXhwZWN0ZWQudHh0CkBAIC0x
LDUgKzEsNiBAQAogQmxvY2tlZCBhY2Nlc3MgdG8gZXh0ZXJuYWwgVVJMIGh0dHA6Ly93d3cubG9j
YWxob3N0Ojg4MDAvaW1hZ2VzL2dyZWVuLnBuZz9waXBlPWhlYWRlcihBY2Nlc3MtQ29udHJvbC1B
bGxvdy1PcmlnaW4sKikKIEJsb2NrZWQgYWNjZXNzIHRvIGV4dGVybmFsIFVSTCBodHRwOi8vd3d3
LmxvY2FsaG9zdDo4ODAwL2ltYWdlcy9ncmVlbi5wbmc/cGlwZT1oZWFkZXIoQWNjZXNzLUNvbnRy
b2wtQWxsb3ctT3JpZ2luLCopCitCbG9ja2VkIGFjY2VzcyB0byBleHRlcm5hbCBVUkwgaHR0cDov
L3d3dy5sb2NhbGhvc3Q6ODgwMC9pbWFnZXMvZ3JlZW4ucG5nP3BpcGU9aGVhZGVyKEFjY2Vzcy1D
b250cm9sLUFsbG93LU9yaWdpbiwqKQogQmxvY2tlZCBhY2Nlc3MgdG8gZXh0ZXJuYWwgVVJMIGh0
dHA6Ly93d3cubG9jYWxob3N0Ojg4MDAvaW1hZ2VzL2dyZWVuLnBuZwogCiBQQVNTIENhbiBnZXQg
cGl4ZWxzIG9mIGNhbnZhcyB3aXRoIHNhbWUgb3JpZ2luIGltYWdlIGRyYXduIApkaWZmIC0tZ2l0
IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFu
dGljcy9lbWJlZGRlZC1jb250ZW50L3RoZS1pbWctZWxlbWVudC9yZWxldmFudC1tdXRhdGlvbnMt
ZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1jb250ZW50L3RoZS1pbWctZWxlbWVudC9yZWxldmFu
dC1tdXRhdGlvbnMtZXhwZWN0ZWQudHh0CmluZGV4IDExY2U0NDYzNDgxMWViOTk4MWE4MDIzNGRk
MjI3NzNiYWQ3NjlmZmUuLmI1MzZmM2MyNDMyOWUxYTJkYjk4ODVkMzYxZjJhZTExMDE4YzQ2YWUg
MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
aHRtbC9zZW1hbnRpY3MvZW1iZWRkZWQtY29udGVudC90aGUtaW1nLWVsZW1lbnQvcmVsZXZhbnQt
bXV0YXRpb25zLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL2VtYmVkZGVkLWNvbnRlbnQvdGhlLWltZy1l
bGVtZW50L3JlbGV2YW50LW11dGF0aW9ucy1leHBlY3RlZC50eHQKQEAgLTEsMTQgKzEsMTQgQEAK
IAogUEFTUyBzcmMgc2V0IAotRkFJTCBzcmMgY2hhbmdlZCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRh
dGUgdGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKK1BB
U1Mgc3JjIGNoYW5nZWQgCiBQQVNTIHNyYyByZW1vdmVkIAogUEFTUyBzcmNzZXQgc2V0IAotRkFJ
TCBzcmNzZXQgY2hhbmdlZCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEg
ZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKK1BBU1Mgc3Jjc2V0IGNoYW5nZWQg
CiBQQVNTIHNyY3NldCByZW1vdmVkIAogUEFTUyBzaXplcyBzZXQgCiBQQVNTIHNpemVzIGNoYW5n
ZWQgCiBQQVNTIHNpemVzIHJlbW92ZWQgCi1GQUlMIHNyYyBzZXQgdG8gc2FtZSB2YWx1ZSBhc3Nl
cnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVu
cmVhY2hhYmxlIGNvZGUKK1BBU1Mgc3JjIHNldCB0byBzYW1lIHZhbHVlIAogUEFTUyBjcm9zc29y
aWdpbiBhYnNlbnQgdG8gZW1wdHksIHNyYyBhYnNlbnQgCiBQQVNTIGNyb3Nzb3JpZ2luIGFic2Vu
dCB0byBhbm9ueW1vdXMsIHNyYyBhYnNlbnQgCiBQQVNTIGNyb3Nzb3JpZ2luIGFic2VudCB0byB1
c2UtY3JlZGVudGlhbHMsIHNyYyBhYnNlbnQgCkBAIC0yMCwxNyArMjAsMTcgQEAgUEFTUyBjcm9z
c29yaWdpbiB1c2UtY3JlZGVudGlhbHMgdG8gYWJzZW50LCBzcmMgYWJzZW50CiBQQVNTIGNyb3Nz
b3JpZ2luIHVzZS1jcmVkZW50aWFscyB0byBlbXB0eSwgc3JjIGFic2VudCAKIFBBU1MgY3Jvc3Nv
cmlnaW4gdXNlLWNyZWRlbnRpYWxzIHRvIGFub255bW91cywgc3JjIGFic2VudCAKIFBBU1MgY3Jv
c3NvcmlnaW4gdXNlLWNyZWRlbnRpYWxzIHRvIGludmFsaWQsIHNyYyBhYnNlbnQgCi1GQUlMIGNy
b3Nzb3JpZ2luIGFic2VudCB0byBlbXB0eSwgc3JjIGFscmVhZHkgc2V0IGFzc2VydF91bnJlYWNo
ZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUg
Y29kZQotRkFJTCBjcm9zc29yaWdpbiBhYnNlbnQgdG8gYW5vbnltb3VzLCBzcmMgYWxyZWFkeSBz
ZXQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVh
Y2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIGNyb3Nzb3JpZ2luIGFic2VudCB0byB1c2UtY3Jl
ZGVudGlhbHMsIHNyYyBhbHJlYWR5IHNldCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGlt
YWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKLUZBSUwgY3Jvc3Nv
cmlnaW4gZW1wdHkgdG8gYWJzZW50LCBzcmMgYWxyZWFkeSBzZXQgYXNzZXJ0X3VucmVhY2hlZDog
dXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2Rl
Ci1GQUlMIGNyb3Nzb3JpZ2luIGVtcHR5IHRvIHVzZS1jcmVkZW50aWFscywgc3JjIGFscmVhZHkg
c2V0IGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJl
YWNoZWQgdW5yZWFjaGFibGUgY29kZQotRkFJTCBjcm9zc29yaWdpbiBhbm9ueW1vdXMgdG8gYWJz
ZW50LCBzcmMgYWxyZWFkeSBzZXQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBk
YXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIGNyb3Nzb3JpZ2lu
IGFub255bW91cyB0byB1c2UtY3JlZGVudGlhbHMsIHNyYyBhbHJlYWR5IHNldCBhc3NlcnRfdW5y
ZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hh
YmxlIGNvZGUKLUZBSUwgY3Jvc3NvcmlnaW4gdXNlLWNyZWRlbnRpYWxzIHRvIGFic2VudCwgc3Jj
IGFscmVhZHkgc2V0IGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRu
J3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQotRkFJTCBjcm9zc29yaWdpbiB1c2UtY3Jl
ZGVudGlhbHMgdG8gZW1wdHksIHNyYyBhbHJlYWR5IHNldCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRh
dGUgdGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKLUZB
SUwgY3Jvc3NvcmlnaW4gdXNlLWNyZWRlbnRpYWxzIHRvIGFub255bW91cywgc3JjIGFscmVhZHkg
c2V0IGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJl
YWNoZWQgdW5yZWFjaGFibGUgY29kZQotRkFJTCBjcm9zc29yaWdpbiB1c2UtY3JlZGVudGlhbHMg
dG8gaW52YWxpZCwgc3JjIGFscmVhZHkgc2V0IGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUg
aW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQorUEFTUyBjcm9z
c29yaWdpbiBhYnNlbnQgdG8gZW1wdHksIHNyYyBhbHJlYWR5IHNldCAKK1BBU1MgY3Jvc3Nvcmln
aW4gYWJzZW50IHRvIGFub255bW91cywgc3JjIGFscmVhZHkgc2V0IAorUEFTUyBjcm9zc29yaWdp
biBhYnNlbnQgdG8gdXNlLWNyZWRlbnRpYWxzLCBzcmMgYWxyZWFkeSBzZXQgCitQQVNTIGNyb3Nz
b3JpZ2luIGVtcHR5IHRvIGFic2VudCwgc3JjIGFscmVhZHkgc2V0IAorUEFTUyBjcm9zc29yaWdp
biBlbXB0eSB0byB1c2UtY3JlZGVudGlhbHMsIHNyYyBhbHJlYWR5IHNldCAKK1BBU1MgY3Jvc3Nv
cmlnaW4gYW5vbnltb3VzIHRvIGFic2VudCwgc3JjIGFscmVhZHkgc2V0IAorUEFTUyBjcm9zc29y
aWdpbiBhbm9ueW1vdXMgdG8gdXNlLWNyZWRlbnRpYWxzLCBzcmMgYWxyZWFkeSBzZXQgCitQQVNT
IGNyb3Nzb3JpZ2luIHVzZS1jcmVkZW50aWFscyB0byBhYnNlbnQsIHNyYyBhbHJlYWR5IHNldCAK
K1BBU1MgY3Jvc3NvcmlnaW4gdXNlLWNyZWRlbnRpYWxzIHRvIGVtcHR5LCBzcmMgYWxyZWFkeSBz
ZXQgCitQQVNTIGNyb3Nzb3JpZ2luIHVzZS1jcmVkZW50aWFscyB0byBhbm9ueW1vdXMsIHNyYyBh
bHJlYWR5IHNldCAKK1BBU1MgY3Jvc3NvcmlnaW4gdXNlLWNyZWRlbnRpYWxzIHRvIGludmFsaWQs
IHNyYyBhbHJlYWR5IHNldCAKIFBBU1MgcmVmZXJyZXJwb2xpY3kgYWJzZW50IHRvIG5vLXJlZmVy
cmVyLXdoZW4tZG93bmdyYWRlLCBzcmMgYWJzZW50IAogUEFTUyByZWZlcnJlcnBvbGljeSBhYnNl
bnQgdG8gbm8tcmVmZXJyZXIsIHNyYyBhYnNlbnQgCiBQQVNTIHJlZmVycmVycG9saWN5IGVtcHR5
IHRvIG5vLXJlZmVycmVyLXdoZW4tZG93bmdyYWRlLCBzcmMgYWJzZW50IApAQCAtNTUsMjQgKzU1
LDI0IEBAIFBBU1MgcmVmZXJyZXJwb2xpY3kgbm8tcmVmZXJyZXIgdG8gYWJzZW50LCBzcmMgYWxy
ZWFkeSBzZXQKIFBBU1MgcmVmZXJyZXJwb2xpY3kgbm8tcmVmZXJyZXIgdG8gZW1wdHksIHNyYyBh
bHJlYWR5IHNldCAKIFBBU1MgcmVmZXJyZXJwb2xpY3kgbm8tcmVmZXJyZXIgdG8gbm8tcmVmZXJy
ZXItd2hlbi1kb3duZ3JhZGUsIHNyYyBhbHJlYWR5IHNldCAKIFBBU1MgcmVmZXJyZXJwb2xpY3kg
bm8tcmVmZXJyZXIgdG8gaW52YWxpZCwgc3JjIGFscmVhZHkgc2V0IAotRkFJTCBpbnNlcnRlZCBp
bnRvIHBpY3R1cmUgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4n
dCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHJlbW92ZWQgZnJvbSBwaWN0dXJl
IGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNo
ZWQgdW5yZWFjaGFibGUgY29kZQotRkFJTCBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291
cmNlIGluc2VydGVkIGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRu
J3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQotRkFJTCBwYXJlbnQgaXMgcGljdHVyZSwg
cHJldmlvdXMgc291cmNlIHJlbW92ZWQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFn
ZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHBhcmVudCBp
cyBwaWN0dXJlLCBwcmV2aW91cyBzb3VyY2UgaGFzIHNyY3NldCBzZXQgYXNzZXJ0X3VucmVhY2hl
ZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBj
b2RlCi1GQUlMIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91cyBzb3VyY2UgaGFzIHNyY3NldCBj
aGFuZ2VkIGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVu
IFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQotRkFJTCBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlv
dXMgc291cmNlIGhhcyBzcmNzZXQgcmVtb3ZlZCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhl
IGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKLUZBSUwgcGFy
ZW50IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNvdXJjZSBoYXMgc2l6ZXMgc2V0IGFzc2VydF91bnJl
YWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFi
bGUgY29kZQotRkFJTCBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyBzaXpl
cyBjaGFuZ2VkIGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3Qg
cnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQotRkFJTCBwYXJlbnQgaXMgcGljdHVyZSwgcHJl
dmlvdXMgc291cmNlIGhhcyBzaXplcyByZW1vdmVkIGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0
aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQotRkFJTCBw
YXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyBtZWRpYSBzZXQgYXNzZXJ0X3Vu
cmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNo
YWJsZSBjb2RlCi1GQUlMIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91cyBzb3VyY2UgaGFzIG1l
ZGlhIGNoYW5nZWQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4n
dCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHBhcmVudCBpcyBwaWN0dXJlLCBw
cmV2aW91cyBzb3VyY2UgaGFzIG1lZGlhIHJlbW92ZWQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRl
IHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlM
IHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91cyBzb3VyY2UgaGFzIHR5cGUgc2V0IGFzc2VydF91
bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFj
aGFibGUgY29kZQotRkFJTCBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyB0
eXBlIGNoYW5nZWQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4n
dCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHBhcmVudCBpcyBwaWN0dXJlLCBw
cmV2aW91cyBzb3VyY2UgaGFzIHR5cGUgcmVtb3ZlZCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUg
dGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKLVBBU1Mg
c3Jjc2V0IGlzIHNldCB0byBzYW1lIHZhbHVlIAotUEFTUyBzaXplcyBpcyBzZXQgdG8gc2FtZSB2
YWx1ZSAKK1BBU1MgaW5zZXJ0ZWQgaW50byBwaWN0dXJlIAorUEFTUyByZW1vdmVkIGZyb20gcGlj
dHVyZSAKK1BBU1MgcGFyZW50IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNvdXJjZSBpbnNlcnRlZCAK
K1BBU1MgcGFyZW50IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNvdXJjZSByZW1vdmVkIAorUEFTUyBw
YXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyBzcmNzZXQgc2V0IAorUEFTUyBw
YXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyBzcmNzZXQgY2hhbmdlZCAKK1BB
U1MgcGFyZW50IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNvdXJjZSBoYXMgc3Jjc2V0IHJlbW92ZWQg
CitQQVNTIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91cyBzb3VyY2UgaGFzIHNpemVzIHNldCAK
K1BBU1MgcGFyZW50IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNvdXJjZSBoYXMgc2l6ZXMgY2hhbmdl
ZCAKK1BBU1MgcGFyZW50IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNvdXJjZSBoYXMgc2l6ZXMgcmVt
b3ZlZCAKK1BBU1MgcGFyZW50IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNvdXJjZSBoYXMgbWVkaWEg
c2V0IAorUEFTUyBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyBtZWRpYSBj
aGFuZ2VkIAorUEFTUyBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyBtZWRp
YSByZW1vdmVkIAorUEFTUyBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyB0
eXBlIHNldCAKK1BBU1MgcGFyZW50IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNvdXJjZSBoYXMgdHlw
ZSBjaGFuZ2VkIAorUEFTUyBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyB0
eXBlIHJlbW92ZWQgCitGQUlMIHNyY3NldCBpcyBzZXQgdG8gc2FtZSB2YWx1ZSBhc3NlcnRfdW5y
ZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgd2FzIHJ1biBSZWFjaGVkIHVucmVhY2hhYmxl
IGNvZGUKK0ZBSUwgc2l6ZXMgaXMgc2V0IHRvIHNhbWUgdmFsdWUgYXNzZXJ0X3VucmVhY2hlZDog
dXBkYXRlIHRoZSBpbWFnZSBkYXRhIHdhcyBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCiBQ
QVNTIGNyb3Nzb3JpZ2luIHN0YXRlIG5vdCBjaGFuZ2VkOiBhYnNlbnQsIHJlbW92ZUF0dHJpYnV0
ZSAKIFBBU1MgY3Jvc3NvcmlnaW4gc3RhdGUgbm90IGNoYW5nZWQ6IGVtcHR5IHRvIGFub255bW91
cyAKIFBBU1MgY3Jvc3NvcmlnaW4gc3RhdGUgbm90IGNoYW5nZWQ6IGFub255bW91cyB0byBmb29i
YXIgCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402458</attachid>
            <date>2020-06-22 02:56:02 -0700</date>
            <delta_ts>2020-06-22 08:17:03 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213335-20200622115600.patch</filename>
            <type>text/plain</type>
            <size>22540</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMzE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzMwNGYxM2JkY2E2MDI0
ZTFhNGY0NzUzNjcxOWY0MDNhMTJjYmI3ZS4uMmUyN2YzMTk3ZjcyNTU0MzljNTBjMDlmYjJkZjEz
YWM4N2YyZmY2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDIwLTA2LTIyICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgSW1hZ2UgYGNyb3Nzb3JpZ2luYCBt
dXRhdGlvbnMgc2hvdWxkIGJlIGNvbnNpZGVyZWQgInJlbGV2YW50IG11dGF0aW9ucyIKKyAgICAg
ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzMzNQorCisgICAg
ICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIE1ha2UgY3Jvc3NvcmlnaW4g
YXR0cmlidXRlJ3Mgc3RhdGUgY2hhbmdlcyByZWxldmFudCBtdXRhdGlvbnMgWzFdLiBUaGlzIGNo
YW5nZQorICAgICAgICBhbHNvIGZpeGVzIHNldmVyYWwgcGljdHVyZSByZWxhdGVkIG11dGF0aW9u
cyB0byBiZSByZWxldmFudCBbMl0uCisKKyAgICAgICAgVGVzdDogaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1jb250ZW50L3RoZS1pbWctZWxl
bWVudC9yZWxldmFudC1tdXRhdGlvbnMuaHRtbAorCisgICAgICAgIFsxXSBodHRwczovL2h0bWwu
c3BlYy53aGF0d2cub3JnLyNyZWFjdGluZy10by1kb20tbXV0YXRpb25zOmF0dHItaW1nLWNyb3Nz
b3JpZ2luCisgICAgICAgIFsyXSBodHRwczovL2h0bWwuc3BlYy53aGF0d2cub3JnLyNyZWFjdGlu
Zy10by1kb20tbXV0YXRpb25zCisKKyAgICAgICAgKiBodG1sL0hUTUxJbWFnZUVsZW1lbnQuY3Bw
OgorICAgICAgICAoV2ViQ29yZTo6SFRNTEltYWdlRWxlbWVudDo6YmVzdEZpdFNvdXJjZUZyb21Q
aWN0dXJlRWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MSW1hZ2VFbGVtZW50OjpldmFs
dWF0ZUR5bmFtaWNNZWRpYVF1ZXJ5RGVwZW5kZW5jaWVzKToKKyAgICAgICAgKFdlYkNvcmU6OkhU
TUxJbWFnZUVsZW1lbnQ6OnNlbGVjdEltYWdlU291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6OnBh
cnNlQ3Jvc3NvcmlnaW5TdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MSW1hZ2VFbGVtZW50
OjphdHRyaWJ1dGVDaGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxJbWFnZUVsZW1lbnQ6
OnBhcnNlQXR0cmlidXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxJbWFnZUVsZW1lbnQ6Omlu
c2VydGVkSW50b0FuY2VzdG9yKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxJbWFnZUVsZW1lbnQ6
OnJlbW92ZWRGcm9tQW5jZXN0b3IpOgorICAgICAgICAqIGh0bWwvSFRNTEltYWdlRWxlbWVudC5o
OgorICAgICAgICAqIGh0bWwvSFRNTFBpY3R1cmVFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNv
cmU6OkhUTUxQaWN0dXJlRWxlbWVudDo6c291cmNlc0NoYW5nZWQpOgorICAgICAgICAqIGh0bWwv
SFRNTFNvdXJjZUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFNvdXJjZUVsZW1l
bnQ6Omluc2VydGVkSW50b0FuY2VzdG9yKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxTb3VyY2VF
bGVtZW50OjpyZW1vdmVkRnJvbUFuY2VzdG9yKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxTb3Vy
Y2VFbGVtZW50OjpwYXJzZUF0dHJpYnV0ZSk6CisgICAgICAgICogaHRtbC9IVE1MU291cmNlRWxl
bWVudC5oOgorICAgICAgICAqIGxvYWRlci9JbWFnZUxvYWRlci5oOgorCiAyMDIwLTA2LTE5ICBD
aHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hXSBEZWxheSBp
c3N1aW5nIE1hbmFnZWRTZXNzaW9uICYgTmV0d29yayBFeHRlbnNpb24gc2FuZGJveCBleHRlbnNp
b25zIHVudGlsIGEgbG9hZCBpcyBhY3R1YWxseSBpc3N1ZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU
TUxJbWFnZUVsZW1lbnQuY3BwCmluZGV4IGYxZmQ2MjFiNmQzNmU4NWQwZGI2NjY3ZjlhYTgwMjhh
ODhlY2UwYzAuLjEzNThmYjg5ODNhNmE1NDcxMWM5N2NmMjQyYWQxZjQ2MmU4ZDVlYzkgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5jcHAKKysrIGIvU291
cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW1hZ2VFbGVtZW50LmNwcApAQCAtMTY2LDYgKzE2Niw4IEBA
IEltYWdlQ2FuZGlkYXRlIEhUTUxJbWFnZUVsZW1lbnQ6OmJlc3RGaXRTb3VyY2VGcm9tUGljdHVy
ZUVsZW1lbnQoKQogICAgIEltYWdlQ2FuZGlkYXRlIGNhbmRpZGF0ZTsKIAogICAgIGZvciAoUmVm
UHRyPE5vZGU+IGNoaWxkID0gcGljdHVyZS0+Zmlyc3RDaGlsZCgpOyBjaGlsZCAmJiBjaGlsZCAh
PSB0aGlzOyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGluZygpKSB7CisgICAgICAgIGlmIChjaGls
ZCA9PSB0aGlzKQorICAgICAgICAgICAgcmV0dXJuIHsgfTsKICAgICAgICAgaWYgKCFpczxIVE1M
U291cmNlRWxlbWVudD4oKmNoaWxkKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICBh
dXRvJiBzb3VyY2UgPSBkb3duY2FzdDxIVE1MU291cmNlRWxlbWVudD4oKmNoaWxkKTsKQEAgLTIx
MSwxMCArMjEzLDEwIEBAIHZvaWQgSFRNTEltYWdlRWxlbWVudDo6ZXZhbHVhdGVEeW5hbWljTWVk
aWFRdWVyeURlcGVuZGVuY2llcygpCiAgICAgaWYgKCFldmFsdWF0b3IuZXZhbHVhdGVGb3JDaGFu
Z2VzKG1fbWVkaWFRdWVyeUR5bmFtaWNSZXN1bHRzKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAg
c2VsZWN0SW1hZ2VTb3VyY2UoKTsKKyAgICBzZWxlY3RJbWFnZVNvdXJjZShSZWxldmFudE11dGF0
aW9uOjpObyk7CiB9CiAKLXZvaWQgSFRNTEltYWdlRWxlbWVudDo6c2VsZWN0SW1hZ2VTb3VyY2Uo
KQordm9pZCBIVE1MSW1hZ2VFbGVtZW50OjpzZWxlY3RJbWFnZVNvdXJjZShSZWxldmFudE11dGF0
aW9uIHJlbGV2YW50TXV0YXRpb24pCiB7CiAgICAgbV9tZWRpYVF1ZXJ5RHluYW1pY1Jlc3VsdHMg
PSB7IH07CiAgICAgZG9jdW1lbnQoKS5yZW1vdmVEeW5hbWljTWVkaWFRdWVyeURlcGVuZGVudElt
YWdlKCp0aGlzKTsKQEAgLTIyOCw3ICsyMzAsNyBAQCB2b2lkIEhUTUxJbWFnZUVsZW1lbnQ6OnNl
bGVjdEltYWdlU291cmNlKCkKICAgICAgICAgY2FuZGlkYXRlID0gYmVzdEZpdFNvdXJjZUZvcklt
YWdlQXR0cmlidXRlcyhkb2N1bWVudCgpLmRldmljZVNjYWxlRmFjdG9yKCksIGF0dHJpYnV0ZVdp
dGhvdXRTeW5jaHJvbml6YXRpb24oc3JjQXR0ciksIGF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6
YXRpb24oc3Jjc2V0QXR0ciksIHNvdXJjZVNpemUpOwogICAgIH0KICAgICBzZXRCZXN0Rml0VVJM
QW5kRFBSRnJvbUltYWdlQ2FuZGlkYXRlKGNhbmRpZGF0ZSk7Ci0gICAgbV9pbWFnZUxvYWRlci0+
dXBkYXRlRnJvbUVsZW1lbnRJZ25vcmluZ1ByZXZpb3VzRXJyb3IoKTsKKyAgICBtX2ltYWdlTG9h
ZGVyLT51cGRhdGVGcm9tRWxlbWVudElnbm9yaW5nUHJldmlvdXNFcnJvcihyZWxldmFudE11dGF0
aW9uKTsKIAogICAgIGlmICghbV9tZWRpYVF1ZXJ5RHluYW1pY1Jlc3VsdHMuaXNFbXB0eSgpKQog
ICAgICAgICBkb2N1bWVudCgpLmFkZER5bmFtaWNNZWRpYVF1ZXJ5RGVwZW5kZW50SW1hZ2UoKnRo
aXMpOwpAQCAtMjM5LDE2ICsyNDEsMjcgQEAgYm9vbCBIVE1MSW1hZ2VFbGVtZW50OjpoYXNMYXp5
TG9hZGFibGVBdHRyaWJ1dGVWYWx1ZShjb25zdCBBdG9tU3RyaW5nJiBhdHRyaWJ1dGUKICAgICBy
ZXR1cm4gZXF1YWxMZXR0ZXJzSWdub3JpbmdBU0NJSUNhc2UoYXR0cmlidXRlVmFsdWUsICJsYXp5
Iik7CiB9CiAKK2VudW0gQ3Jvc3NPcmlnaW5TdGF0ZSB7IE5vdFNldCwgVXNlQ3JlZGVudGlhbHMs
IEFub255bW91cyB9Oworc3RhdGljIENyb3NzT3JpZ2luU3RhdGUgcGFyc2VDcm9zc29yaWdpblN0
YXRlKGNvbnN0IEF0b21TdHJpbmcmIGNyb3Nzb3JpZ2luVmFsdWUpCit7CisgICAgaWYgKGNyb3Nz
b3JpZ2luVmFsdWUuaXNOdWxsKCkpCisgICAgICAgIHJldHVybiBOb3RTZXQ7CisgICAgcmV0dXJu
IGVxdWFsSWdub3JpbmdBU0NJSUNhc2UoY3Jvc3NvcmlnaW5WYWx1ZSwgInVzZS1jcmVkZW50aWFs
cyIpID8gVXNlQ3JlZGVudGlhbHMgOiBBbm9ueW1vdXM7Cit9CisKIHZvaWQgSFRNTEltYWdlRWxl
bWVudDo6YXR0cmlidXRlQ2hhbmdlZChjb25zdCBRdWFsaWZpZWROYW1lJiBuYW1lLCBjb25zdCBB
dG9tU3RyaW5nJiBvbGRWYWx1ZSwgY29uc3QgQXRvbVN0cmluZyYgbmV3VmFsdWUsIEF0dHJpYnV0
ZU1vZGlmaWNhdGlvblJlYXNvbiByZWFzb24pCiB7CisgICAgSFRNTEVsZW1lbnQ6OmF0dHJpYnV0
ZUNoYW5nZWQobmFtZSwgb2xkVmFsdWUsIG5ld1ZhbHVlLCByZWFzb24pOworCiAgICAgaWYgKG5h
bWUgPT0gcmVmZXJyZXJwb2xpY3lBdHRyICYmIFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJl
ZEZlYXR1cmVzKCkucmVmZXJyZXJQb2xpY3lBdHRyaWJ1dGVFbmFibGVkKCkpIHsKICAgICAgICAg
YXV0byBvbGRSZWZlcnJlclBvbGljeSA9IHBhcnNlUmVmZXJyZXJQb2xpY3kob2xkVmFsdWUsIFJl
ZmVycmVyUG9saWN5U291cmNlOjpSZWZlcnJlclBvbGljeUF0dHJpYnV0ZSkudmFsdWVPcihSZWZl
cnJlclBvbGljeTo6RW1wdHlTdHJpbmcpOwogICAgICAgICBhdXRvIG5ld1JlZmVycmVyUG9saWN5
ID0gcGFyc2VSZWZlcnJlclBvbGljeShuZXdWYWx1ZSwgUmVmZXJyZXJQb2xpY3lTb3VyY2U6OlJl
ZmVycmVyUG9saWN5QXR0cmlidXRlKS52YWx1ZU9yKFJlZmVycmVyUG9saWN5OjpFbXB0eVN0cmlu
Zyk7CiAgICAgICAgIGlmIChvbGRSZWZlcnJlclBvbGljeSAhPSBuZXdSZWZlcnJlclBvbGljeSkK
LSAgICAgICAgICAgIG1faW1hZ2VMb2FkZXItPnVwZGF0ZUZyb21FbGVtZW50SWdub3JpbmdQcmV2
aW91c0Vycm9yKEltYWdlTG9hZGVyOjpSZWxldmFudE11dGF0aW9uOjpZZXMpOworICAgICAgICAg
ICAgbV9pbWFnZUxvYWRlci0+dXBkYXRlRnJvbUVsZW1lbnRJZ25vcmluZ1ByZXZpb3VzRXJyb3Io
UmVsZXZhbnRNdXRhdGlvbjo6WWVzKTsKKyAgICB9IGVsc2UgaWYgKG5hbWUgPT0gY3Jvc3Nvcmln
aW5BdHRyKSB7CisgICAgICAgIGlmIChwYXJzZUNyb3Nzb3JpZ2luU3RhdGUob2xkVmFsdWUpICE9
IHBhcnNlQ3Jvc3NvcmlnaW5TdGF0ZShuZXdWYWx1ZSkpCisgICAgICAgICAgICBtX2ltYWdlTG9h
ZGVyLT51cGRhdGVGcm9tRWxlbWVudElnbm9yaW5nUHJldmlvdXNFcnJvcihSZWxldmFudE11dGF0
aW9uOjpZZXMpOwogICAgIH0KLQotICAgIEhUTUxFbGVtZW50OjphdHRyaWJ1dGVDaGFuZ2VkKG5h
bWUsIG9sZFZhbHVlLCBuZXdWYWx1ZSwgcmVhc29uKTsKIH0KIAogdm9pZCBIVE1MSW1hZ2VFbGVt
ZW50OjpwYXJzZUF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJiBuYW1lLCBjb25zdCBBdG9t
U3RyaW5nJiB2YWx1ZSkKQEAgLTI1Nyw3ICsyNzAsNyBAQCB2b2lkIEhUTUxJbWFnZUVsZW1lbnQ6
OnBhcnNlQXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmIG5hbWUsIGNvbnN0IEF0b21TdHJp
bgogICAgICAgICBpZiAoaXM8UmVuZGVySW1hZ2U+KHJlbmRlcmVyKCkpKQogICAgICAgICAgICAg
ZG93bmNhc3Q8UmVuZGVySW1hZ2U+KCpyZW5kZXJlcigpKS51cGRhdGVBbHRUZXh0KCk7CiAgICAg
fSBlbHNlIGlmIChuYW1lID09IHNyY0F0dHIgfHwgbmFtZSA9PSBzcmNzZXRBdHRyIHx8IG5hbWUg
PT0gc2l6ZXNBdHRyKQotICAgICAgICBzZWxlY3RJbWFnZVNvdXJjZSgpOworICAgICAgICBzZWxl
Y3RJbWFnZVNvdXJjZShSZWxldmFudE11dGF0aW9uOjpZZXMpOwogICAgIGVsc2UgaWYgKG5hbWUg
PT0gdXNlbWFwQXR0cikgewogICAgICAgICBpZiAoaXNJblRyZWVTY29wZSgpICYmICFtX3BhcnNl
ZFVzZW1hcC5pc051bGwoKSkKICAgICAgICAgICAgIHRyZWVTY29wZSgpLnJlbW92ZUltYWdlRWxl
bWVudEJ5VXNlbWFwKCptX3BhcnNlZFVzZW1hcC5pbXBsKCksICp0aGlzKTsKQEAgLTQwNSw5ICs0
MTgsMTcgQEAgTm9kZTo6SW5zZXJ0ZWRJbnRvQW5jZXN0b3JSZXN1bHQgSFRNTEltYWdlRWxlbWVu
dDo6aW5zZXJ0ZWRJbnRvQW5jZXN0b3IoSW5zZXJ0aW8KICAgICBpZiAoaW5zZXJ0aW9uVHlwZS50
cmVlU2NvcGVDaGFuZ2VkICYmICFtX3BhcnNlZFVzZW1hcC5pc051bGwoKSkKICAgICAgICAgdHJl
ZVNjb3BlKCkuYWRkSW1hZ2VFbGVtZW50QnlVc2VtYXAoKm1fcGFyc2VkVXNlbWFwLmltcGwoKSwg
KnRoaXMpOwogCi0gICAgaWYgKGlzPEhUTUxQaWN0dXJlRWxlbWVudD4ocGFyZW50Tm9kZSgpKSkg
ewotICAgICAgICBzZXRQaWN0dXJlRWxlbWVudCgmZG93bmNhc3Q8SFRNTFBpY3R1cmVFbGVtZW50
PigqcGFyZW50Tm9kZSgpKSk7Ci0gICAgICAgIHNlbGVjdEltYWdlU291cmNlKCk7CisgICAgaWYg
KGlzPEhUTUxQaWN0dXJlRWxlbWVudD4oJnBhcmVudE9mSW5zZXJ0ZWRUcmVlKSkgeworICAgICAg
ICBzZXRQaWN0dXJlRWxlbWVudCgmZG93bmNhc3Q8SFRNTFBpY3R1cmVFbGVtZW50PihwYXJlbnRP
Zkluc2VydGVkVHJlZSkpOworICAgICAgICBpZiAoaW5zZXJ0aW9uVHlwZS5jb25uZWN0ZWRUb0Rv
Y3VtZW50KSB7CisgICAgICAgICAgICBzZWxlY3RJbWFnZVNvdXJjZShSZWxldmFudE11dGF0aW9u
OjpZZXMpOworICAgICAgICAgICAgcmV0dXJuIGluc2VydE5vdGlmaWNhdGlvblJlcXVlc3Q7Cisg
ICAgICAgIH0KKyAgICAgICAgYXV0byBjYW5kaWRhdGUgPSBiZXN0Rml0U291cmNlRnJvbVBpY3R1
cmVFbGVtZW50KCk7CisgICAgICAgIGlmICghY2FuZGlkYXRlLmlzRW1wdHkoKSkgeworICAgICAg
ICAgICAgc2V0QmVzdEZpdFVSTEFuZERQUkZyb21JbWFnZUNhbmRpZGF0ZShjYW5kaWRhdGUpOwor
ICAgICAgICAgICAgbV9pbWFnZUxvYWRlci0+dXBkYXRlRnJvbUVsZW1lbnRJZ25vcmluZ1ByZXZp
b3VzRXJyb3IoUmVsZXZhbnRNdXRhdGlvbjo6WWVzKTsKKyAgICAgICAgfQogICAgIH0KIAogICAg
IC8vIElmIHdlIGhhdmUgYmVlbiBpbnNlcnRlZCBmcm9tIGEgcmVuZGVyZXItbGVzcyBkb2N1bWVu
dCwKQEAgLTQzMiw4ICs0NTMsMTAgQEAgdm9pZCBIVE1MSW1hZ2VFbGVtZW50OjpyZW1vdmVkRnJv
bUFuY2VzdG9yKFJlbW92YWxUeXBlIHJlbW92YWxUeXBlLCBDb250YWluZXJOb2QKICAgICBpZiAo
cmVtb3ZhbFR5cGUudHJlZVNjb3BlQ2hhbmdlZCAmJiAhbV9wYXJzZWRVc2VtYXAuaXNOdWxsKCkp
CiAgICAgICAgIG9sZFBhcmVudE9mUmVtb3ZlZFRyZWUudHJlZVNjb3BlKCkucmVtb3ZlSW1hZ2VF
bGVtZW50QnlVc2VtYXAoKm1fcGFyc2VkVXNlbWFwLmltcGwoKSwgKnRoaXMpOwogCi0gICAgaWYg
KGlzPEhUTUxQaWN0dXJlRWxlbWVudD4ocGFyZW50Tm9kZSgpKSkKKyAgICBpZiAoaXM8SFRNTFBp
Y3R1cmVFbGVtZW50PihvbGRQYXJlbnRPZlJlbW92ZWRUcmVlKSkgewogICAgICAgICBzZXRQaWN0
dXJlRWxlbWVudChudWxscHRyKTsKKyAgICAgICAgbV9pbWFnZUxvYWRlci0+dXBkYXRlRnJvbUVs
ZW1lbnRJZ25vcmluZ1ByZXZpb3VzRXJyb3IoUmVsZXZhbnRNdXRhdGlvbjo6WWVzKTsKKyAgICB9
CiAKICAgICBpZiAocmVtb3ZhbFR5cGUuZGlzY29ubmVjdGVkRnJvbURvY3VtZW50KQogICAgICAg
ICB1cGRhdGVFZGl0YWJsZUltYWdlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1s
L0hUTUxJbWFnZUVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVu
dC5oCmluZGV4IDM2NzUwMGU5ZTZlNTU0Y2I4MWVmMWFlMDVkNTMzYTAxNGQyYTY5MDQuLjY4M2Mz
NzQ4ZjMzM2UyOWU3MGRmZmM5NTQzNmI4MjA5YzQ2MTc1NmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv
SFRNTEltYWdlRWxlbWVudC5oCkBAIC00Myw2ICs0Myw4IEBAIGNsYXNzIEhUTUxNYXBFbGVtZW50
OwogCiBzdHJ1Y3QgSW1hZ2VDYW5kaWRhdGU7CiAKK2VudW0gY2xhc3MgUmVsZXZhbnRNdXRhdGlv
biA6IGJvb2w7CisKIGNsYXNzIEhUTUxJbWFnZUVsZW1lbnQgOiBwdWJsaWMgSFRNTEVsZW1lbnQs
IHB1YmxpYyBGb3JtTmFtZWRJdGVtIHsKICAgICBXVEZfTUFLRV9JU09fQUxMT0NBVEVEKEhUTUxJ
bWFnZUVsZW1lbnQpOwogICAgIGZyaWVuZCBjbGFzcyBIVE1MRm9ybUVsZW1lbnQ7CkBAIC0xODMs
NyArMTg1LDcgQEAgcHJpdmF0ZToKIAogICAgIGJvb2wgaXNJbnRlcmFjdGl2ZUNvbnRlbnQoKSBj
b25zdCBmaW5hbDsKIAotICAgIHZvaWQgc2VsZWN0SW1hZ2VTb3VyY2UoKTsKKyAgICB2b2lkIHNl
bGVjdEltYWdlU291cmNlKFJlbGV2YW50TXV0YXRpb24pOwogCiAgICAgSW1hZ2VDYW5kaWRhdGUg
YmVzdEZpdFNvdXJjZUZyb21QaWN0dXJlRWxlbWVudCgpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViQ29yZS9odG1sL0hUTUxQaWN0dXJlRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1s
L0hUTUxQaWN0dXJlRWxlbWVudC5jcHAKaW5kZXggMTgwYjViNDk1ODIwNTQ1ZjE2MGY2YjdlNTJm
N2JmMjU1ODFmOTBlOC4uNjJmYjU1NjRiNDI3NzZiYzE1ZDI3ODRiYWU4MWY1MTMxZmU1MmM2ZiAx
MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGljdHVyZUVsZW1lbnQuY3BwCisr
KyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBpY3R1cmVFbGVtZW50LmNwcApAQCAtMjksNiAr
MjksNyBAQAogI2luY2x1ZGUgIkVsZW1lbnRDaGlsZEl0ZXJhdG9yLmgiCiAjaW5jbHVkZSAiSFRN
TEFuY2hvckVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MSW1hZ2VFbGVtZW50LmgiCisjaW5jbHVk
ZSAiSW1hZ2VMb2FkZXIuaCIKICNpbmNsdWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAiUnVudGlt
ZUVuYWJsZWRGZWF0dXJlcy5oIgogI2luY2x1ZGUgPHd0Zi9Jc29NYWxsb2NJbmxpbmVzLmg+CkBA
IC02MCw3ICs2MSw3IEBAIFJlZjxIVE1MUGljdHVyZUVsZW1lbnQ+IEhUTUxQaWN0dXJlRWxlbWVu
dDo6Y3JlYXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmIHRhZ05hbWUsCiB2b2lkIEhUTUxQaWN0dXJl
RWxlbWVudDo6c291cmNlc0NoYW5nZWQoKQogewogICAgIGZvciAoYXV0byYgZWxlbWVudCA6IGNo
aWxkcmVuT2ZUeXBlPEhUTUxJbWFnZUVsZW1lbnQ+KCp0aGlzKSkKLSAgICAgICAgZWxlbWVudC5z
ZWxlY3RJbWFnZVNvdXJjZSgpOworICAgICAgICBlbGVtZW50LnNlbGVjdEltYWdlU291cmNlKFJl
bGV2YW50TXV0YXRpb246Olllcyk7CiB9CiAKICNpZiBVU0UoU1lTVEVNX1BSRVZJRVcpCmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTb3VyY2VFbGVtZW50LmNwcCBiL1NvdXJj
ZS9XZWJDb3JlL2h0bWwvSFRNTFNvdXJjZUVsZW1lbnQuY3BwCmluZGV4IDQyMTZlOTc2YjQ4MjBi
NzhjMTM0NWIzNjRmOGVkNDA3MjdiZTAxMGYuLjEwNmFhZDA5ODVjNjkzODg0ZDVjYzVkNGIzYmQw
MzhhYzQ1MTQ4YTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFNvdXJjZUVs
ZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFNvdXJjZUVsZW1lbnQuY3Bw
CkBAIC0yOCw2ICsyOCw3IEBACiAKICNpbmNsdWRlICJFdmVudC5oIgogI2luY2x1ZGUgIkV2ZW50
TmFtZXMuaCIKKyNpbmNsdWRlICJIVE1MSW1hZ2VFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTE5h
bWVzLmgiCiAjaW5jbHVkZSAiSFRNTFBpY3R1cmVFbGVtZW50LmgiCiAjaW5jbHVkZSAiTG9nZ2lu
Zy5oIgpAQCAtNzYsOCArNzcsMTYgQEAgTm9kZTo6SW5zZXJ0ZWRJbnRvQW5jZXN0b3JSZXN1bHQg
SFRNTFNvdXJjZUVsZW1lbnQ6Omluc2VydGVkSW50b0FuY2VzdG9yKEluc2VydGkKICAgICAgICAg
ICAgIGRvd25jYXN0PEhUTUxNZWRpYUVsZW1lbnQ+KCpwYXJlbnQpLnNvdXJjZVdhc0FkZGVkKCp0
aGlzKTsKICAgICAgICAgZWxzZQogI2VuZGlmCi0gICAgICAgIGlmIChpczxIVE1MUGljdHVyZUVs
ZW1lbnQ+KCpwYXJlbnQpKQotICAgICAgICAgICAgZG93bmNhc3Q8SFRNTFBpY3R1cmVFbGVtZW50
PigqcGFyZW50KS5zb3VyY2VzQ2hhbmdlZCgpOworICAgICAgICBpZiAoaXM8SFRNTFBpY3R1cmVF
bGVtZW50PigqcGFyZW50KSkgeworICAgICAgICAgICAgLy8gVGhlIG5ldyBzb3VyY2UgZWxlbWVu
dCBvbmx5IGlzIGEgcmVsZXZhbnQgbXV0YXRpb24gaWYgaXQgcHJlY2VkZXMgYW55IGltZyBlbGVt
ZW50LgorICAgICAgICAgICAgbV9zaG91bGRDYWxsU291cmNlc0NoYW5nZWQgPSB0cnVlOworICAg
ICAgICAgICAgZm9yIChjb25zdCBOb2RlKiBub2RlID0gcHJldmlvdXNTaWJsaW5nKCk7IG5vZGU7
IG5vZGUgPSBub2RlLT5wcmV2aW91c1NpYmxpbmcoKSkgeworICAgICAgICAgICAgICAgIGlmIChp
czxIVE1MSW1hZ2VFbGVtZW50Pigqbm9kZSkpCisgICAgICAgICAgICAgICAgICAgIG1fc2hvdWxk
Q2FsbFNvdXJjZXNDaGFuZ2VkID0gZmFsc2U7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBp
ZiAobV9zaG91bGRDYWxsU291cmNlc0NoYW5nZWQpCisgICAgICAgICAgICAgICAgZG93bmNhc3Q8
SFRNTFBpY3R1cmVFbGVtZW50PigqcGFyZW50KS5zb3VyY2VzQ2hhbmdlZCgpOworICAgICAgICB9
CiAgICAgfQogICAgIHJldHVybiBJbnNlcnRlZEludG9BbmNlc3RvclJlc3VsdDo6RG9uZTsKIH0K
QEAgLTkxLDggKzEwMCwxMCBAQCB2b2lkIEhUTUxTb3VyY2VFbGVtZW50OjpyZW1vdmVkRnJvbUFu
Y2VzdG9yKFJlbW92YWxUeXBlIHJlbW92YWxUeXBlLCBDb250YWluZXJObwogICAgICAgICAgICAg
ZG93bmNhc3Q8SFRNTE1lZGlhRWxlbWVudD4ob2xkUGFyZW50T2ZSZW1vdmVkVHJlZSkuc291cmNl
V2FzUmVtb3ZlZCgqdGhpcyk7CiAgICAgICAgIGVsc2UKICNlbmRpZgotICAgICAgICBpZiAoaXM8
SFRNTFBpY3R1cmVFbGVtZW50PihvbGRQYXJlbnRPZlJlbW92ZWRUcmVlKSkKKyAgICAgICAgaWYg
KG1fc2hvdWxkQ2FsbFNvdXJjZXNDaGFuZ2VkKSB7CiAgICAgICAgICAgICBkb3duY2FzdDxIVE1M
UGljdHVyZUVsZW1lbnQ+KG9sZFBhcmVudE9mUmVtb3ZlZFRyZWUpLnNvdXJjZXNDaGFuZ2VkKCk7
CisgICAgICAgICAgICBtX3Nob3VsZENhbGxTb3VyY2VzQ2hhbmdlZCA9IGZhbHNlOworICAgICAg
ICB9CiAgICAgfQogfQogCkBAIC0xNTYsNyArMTY3LDcgQEAgdm9pZCBIVE1MU291cmNlRWxlbWVu
dDo6cGFyc2VBdHRyaWJ1dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYgbmFtZSwgY29uc3QgQXRvbVN0
cmkKICAgICAgICAgaWYgKG5hbWUgPT0gbWVkaWFBdHRyKQogICAgICAgICAgICAgbV9jYWNoZWRQ
YXJzZWRNZWRpYUF0dHJpYnV0ZSA9IFdURjo6bnVsbG9wdDsKICAgICAgICAgYXV0byBwYXJlbnQg
PSBtYWtlUmVmUHRyKHBhcmVudE5vZGUoKSk7Ci0gICAgICAgIGlmIChpczxIVE1MUGljdHVyZUVs
ZW1lbnQ+KHBhcmVudCkpCisgICAgICAgIGlmIChtX3Nob3VsZENhbGxTb3VyY2VzQ2hhbmdlZCkK
ICAgICAgICAgICAgIGRvd25jYXN0PEhUTUxQaWN0dXJlRWxlbWVudD4oKnBhcmVudCkuc291cmNl
c0NoYW5nZWQoKTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU
TUxTb3VyY2VFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTb3VyY2VFbGVtZW50
LmgKaW5kZXggNGRmMGFmNTQyZDM1M2M0MjExYjAzODhhODI1NjNkNDViZjEyY2Q0Ni4uZTRhZTFh
NTRmMThmMjA2YzVhNDhhOTBjMWM0OGVjZmIxMmRiZTg3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvaHRtbC9IVE1MU291cmNlRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv
SFRNTFNvdXJjZUVsZW1lbnQuaApAQCAtNjIsNiArNjIsNyBAQCBwcml2YXRlOgogCiAgICAgVGlt
ZXIgbV9lcnJvckV2ZW50VGltZXI7CiAgICAgYm9vbCBtX3Nob3VsZFJlc2NoZWR1bGVFcnJvckV2
ZW50T25SZXN1bWUgeyBmYWxzZSB9OworICAgIGJvb2wgbV9zaG91bGRDYWxsU291cmNlc0NoYW5n
ZWQgeyBmYWxzZSB9OwogICAgIG11dGFibGUgT3B0aW9uYWw8UmVmUHRyPGNvbnN0IE1lZGlhUXVl
cnlTZXQ+PiBtX2NhY2hlZFBhcnNlZE1lZGlhQXR0cmlidXRlOwogfTsKIApkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYkNvcmUvbG9hZGVyL0ltYWdlTG9hZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk
ZXIvSW1hZ2VMb2FkZXIuaAppbmRleCAyZGRiNWQ1ZTc0ZmYyNzQxMjZhOTIwNDQ3OWFkZmQwN2Fj
ZGZiOTNmLi5hMTM4YTdiMjA3MmI2ZjAxODE1MTkzMDRmZmQzN2UxZjgyMGUzY2U2IDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2Vi
Q29yZS9sb2FkZXIvSW1hZ2VMb2FkZXIuaApAQCAtNDAsMTMgKzQwLDEzIEBAIGNsYXNzIFJlbmRl
ckltYWdlUmVzb3VyY2U7CiB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBjbGFzcyBFdmVudFNlbmRlcjsK
IHR5cGVkZWYgRXZlbnRTZW5kZXI8SW1hZ2VMb2FkZXI+IEltYWdlRXZlbnRTZW5kZXI7CiAKK2Vu
dW0gY2xhc3MgUmVsZXZhbnRNdXRhdGlvbiA6IGJvb2wgeyBZZXMsIE5vIH07CisKIGNsYXNzIElt
YWdlTG9hZGVyIDogcHVibGljIENhY2hlZEltYWdlQ2xpZW50IHsKICAgICBXVEZfTUFLRV9GQVNU
X0FMTE9DQVRFRDsKIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5JbWFnZUxvYWRlcigpOwogCi0gICAg
ZW51bSBjbGFzcyBSZWxldmFudE11dGF0aW9uIDogYm9vbCB7IFllcywgTm8gfTsKLQogICAgIC8v
IFRoaXMgZnVuY3Rpb24gc2hvdWxkIGJlIGNhbGxlZCB3aGVuIHRoZSBlbGVtZW50IGlzIGF0dGFj
aGVkIHRvIGEgZG9jdW1lbnQ7IHN0YXJ0cwogICAgIC8vIGxvYWRpbmcgaWYgYSBsb2FkIGhhc24n
dCBhbHJlYWR5IGJlZW4gc3RhcnRlZC4KICAgICB2b2lkIHVwZGF0ZUZyb21FbGVtZW50KFJlbGV2
YW50TXV0YXRpb24gPSBSZWxldmFudE11dGF0aW9uOjpObyk7CmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0No
YW5nZUxvZwppbmRleCA2MzJlMmNjYTZhZDQ5ZjUxMDk0ZTBlNjE1ODVkNTdmNzgzYjdhZWZmLi4w
NmE4MmVmOWI5MjNlY2EzMjE2ZGM2N2M0NzY2NzMzMGQ4NDNlNjI5IDEwMDY0NAotLS0gYS9MYXlv
dXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVk
L3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMC0wNi0yMiAgUm9iIEJ1aXMgIDxy
YnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIEltYWdlIGBjcm9zc29yaWdpbmAgbXV0YXRpb25z
IHNob3VsZCBiZSBjb25zaWRlcmVkICJyZWxldmFudCBtdXRhdGlvbnMiCisgICAgICAgIGh0dHBz
Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTMzMzUKKworICAgICAgICBSZXZp
ZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBVcGRhdGUgaW1wcm92ZWQgdGVzdCByZXN1
bHQuCisKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9jYW52YXMvZWxlbWVudC9k
cmF3aW5nLWltYWdlcy10by10aGUtY2FudmFzL2RyYXdpbWFnZV9jcm9zc29yaWdpbi5zdWItZXhw
ZWN0ZWQudHh0OgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9l
bWJlZGRlZC1jb250ZW50L3RoZS1pbWctZWxlbWVudC9yZWxldmFudC1tdXRhdGlvbnMtZXhwZWN0
ZWQudHh0OgorCiAyMDIwLTA2LTE5ICBDbGFyayBXYW5nICA8Y2xhcmtfd2FuZ0BhcHBsZS5jb20+
CiAKICAgICAgICAgUmVtb3ZlIHNldFZlbG9jaXR5KCkgZnJvbSBQYW5uZXJOb2RlCmRpZmYgLS1n
aXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvY2Fu
dmFzL2VsZW1lbnQvZHJhd2luZy1pbWFnZXMtdG8tdGhlLWNhbnZhcy9kcmF3aW1hZ2VfY3Jvc3Nv
cmlnaW4uc3ViLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvaHRtbC9jYW52YXMvZWxlbWVudC9kcmF3aW5nLWltYWdlcy10by10aGUtY2Fu
dmFzL2RyYXdpbWFnZV9jcm9zc29yaWdpbi5zdWItZXhwZWN0ZWQudHh0CmluZGV4IDczMzRkNTg3
MTZiODBhZjcwYmEzNjI5NWI5YzJkOWMzYjEwZDIyYTIuLmI3M2ZmZGNhNTIyYjBlYmY4M2NjMDA0
YWNlMDgxNWRkOWFkYjFiMTkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9jYW52YXMvZWxlbWVudC9kcmF3aW5nLWltYWdlcy10by10
aGUtY2FudmFzL2RyYXdpbWFnZV9jcm9zc29yaWdpbi5zdWItZXhwZWN0ZWQudHh0CisrKyBiL0xh
eW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9jYW52YXMvZWxl
bWVudC9kcmF3aW5nLWltYWdlcy10by10aGUtY2FudmFzL2RyYXdpbWFnZV9jcm9zc29yaWdpbi5z
dWItZXhwZWN0ZWQudHh0CkBAIC0xLDUgKzEsNiBAQAogQmxvY2tlZCBhY2Nlc3MgdG8gZXh0ZXJu
YWwgVVJMIGh0dHA6Ly93d3cubG9jYWxob3N0Ojg4MDAvaW1hZ2VzL2dyZWVuLnBuZz9waXBlPWhl
YWRlcihBY2Nlc3MtQ29udHJvbC1BbGxvdy1PcmlnaW4sKikKIEJsb2NrZWQgYWNjZXNzIHRvIGV4
dGVybmFsIFVSTCBodHRwOi8vd3d3LmxvY2FsaG9zdDo4ODAwL2ltYWdlcy9ncmVlbi5wbmc/cGlw
ZT1oZWFkZXIoQWNjZXNzLUNvbnRyb2wtQWxsb3ctT3JpZ2luLCopCitCbG9ja2VkIGFjY2VzcyB0
byBleHRlcm5hbCBVUkwgaHR0cDovL3d3dy5sb2NhbGhvc3Q6ODgwMC9pbWFnZXMvZ3JlZW4ucG5n
P3BpcGU9aGVhZGVyKEFjY2Vzcy1Db250cm9sLUFsbG93LU9yaWdpbiwqKQogQmxvY2tlZCBhY2Nl
c3MgdG8gZXh0ZXJuYWwgVVJMIGh0dHA6Ly93d3cubG9jYWxob3N0Ojg4MDAvaW1hZ2VzL2dyZWVu
LnBuZwogCiBQQVNTIENhbiBnZXQgcGl4ZWxzIG9mIGNhbnZhcyB3aXRoIHNhbWUgb3JpZ2luIGlt
YWdlIGRyYXduIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1jb250ZW50L3RoZS1pbWctZWxlbWVu
dC9yZWxldmFudC1tdXRhdGlvbnMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1jb250ZW50L3Ro
ZS1pbWctZWxlbWVudC9yZWxldmFudC1tdXRhdGlvbnMtZXhwZWN0ZWQudHh0CmluZGV4IDExY2U0
NDYzNDgxMWViOTk4MWE4MDIzNGRkMjI3NzNiYWQ3NjlmZmUuLmI1MzZmM2MyNDMyOWUxYTJkYjk4
ODVkMzYxZjJhZTExMDE4YzQ2YWUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvZW1iZWRkZWQtY29udGVudC90aGUt
aW1nLWVsZW1lbnQvcmVsZXZhbnQtbXV0YXRpb25zLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRU
ZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL2VtYmVk
ZGVkLWNvbnRlbnQvdGhlLWltZy1lbGVtZW50L3JlbGV2YW50LW11dGF0aW9ucy1leHBlY3RlZC50
eHQKQEAgLTEsMTQgKzEsMTQgQEAKIAogUEFTUyBzcmMgc2V0IAotRkFJTCBzcmMgY2hhbmdlZCBh
c3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVk
IHVucmVhY2hhYmxlIGNvZGUKK1BBU1Mgc3JjIGNoYW5nZWQgCiBQQVNTIHNyYyByZW1vdmVkIAog
UEFTUyBzcmNzZXQgc2V0IAotRkFJTCBzcmNzZXQgY2hhbmdlZCBhc3NlcnRfdW5yZWFjaGVkOiB1
cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUK
K1BBU1Mgc3Jjc2V0IGNoYW5nZWQgCiBQQVNTIHNyY3NldCByZW1vdmVkIAogUEFTUyBzaXplcyBz
ZXQgCiBQQVNTIHNpemVzIGNoYW5nZWQgCiBQQVNTIHNpemVzIHJlbW92ZWQgCi1GQUlMIHNyYyBz
ZXQgdG8gc2FtZSB2YWx1ZSBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEg
ZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKK1BBU1Mgc3JjIHNldCB0byBzYW1l
IHZhbHVlIAogUEFTUyBjcm9zc29yaWdpbiBhYnNlbnQgdG8gZW1wdHksIHNyYyBhYnNlbnQgCiBQ
QVNTIGNyb3Nzb3JpZ2luIGFic2VudCB0byBhbm9ueW1vdXMsIHNyYyBhYnNlbnQgCiBQQVNTIGNy
b3Nzb3JpZ2luIGFic2VudCB0byB1c2UtY3JlZGVudGlhbHMsIHNyYyBhYnNlbnQgCkBAIC0yMCwx
NyArMjAsMTcgQEAgUEFTUyBjcm9zc29yaWdpbiB1c2UtY3JlZGVudGlhbHMgdG8gYWJzZW50LCBz
cmMgYWJzZW50CiBQQVNTIGNyb3Nzb3JpZ2luIHVzZS1jcmVkZW50aWFscyB0byBlbXB0eSwgc3Jj
IGFic2VudCAKIFBBU1MgY3Jvc3NvcmlnaW4gdXNlLWNyZWRlbnRpYWxzIHRvIGFub255bW91cywg
c3JjIGFic2VudCAKIFBBU1MgY3Jvc3NvcmlnaW4gdXNlLWNyZWRlbnRpYWxzIHRvIGludmFsaWQs
IHNyYyBhYnNlbnQgCi1GQUlMIGNyb3Nzb3JpZ2luIGFic2VudCB0byBlbXB0eSwgc3JjIGFscmVh
ZHkgc2V0IGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVu
IFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQotRkFJTCBjcm9zc29yaWdpbiBhYnNlbnQgdG8gYW5v
bnltb3VzLCBzcmMgYWxyZWFkeSBzZXQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFn
ZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIGNyb3Nzb3Jp
Z2luIGFic2VudCB0byB1c2UtY3JlZGVudGlhbHMsIHNyYyBhbHJlYWR5IHNldCBhc3NlcnRfdW5y
ZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVhY2hh
YmxlIGNvZGUKLUZBSUwgY3Jvc3NvcmlnaW4gZW1wdHkgdG8gYWJzZW50LCBzcmMgYWxyZWFkeSBz
ZXQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVh
Y2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIGNyb3Nzb3JpZ2luIGVtcHR5IHRvIHVzZS1jcmVk
ZW50aWFscywgc3JjIGFscmVhZHkgc2V0IGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1h
Z2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQotRkFJTCBjcm9zc29y
aWdpbiBhbm9ueW1vdXMgdG8gYWJzZW50LCBzcmMgYWxyZWFkeSBzZXQgYXNzZXJ0X3VucmVhY2hl
ZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBj
b2RlCi1GQUlMIGNyb3Nzb3JpZ2luIGFub255bW91cyB0byB1c2UtY3JlZGVudGlhbHMsIHNyYyBh
bHJlYWR5IHNldCBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0
IHJ1biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKLUZBSUwgY3Jvc3NvcmlnaW4gdXNlLWNyZWRl
bnRpYWxzIHRvIGFic2VudCwgc3JjIGFscmVhZHkgc2V0IGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0
ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQotRkFJ
TCBjcm9zc29yaWdpbiB1c2UtY3JlZGVudGlhbHMgdG8gZW1wdHksIHNyYyBhbHJlYWR5IHNldCBh
c3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVk
IHVucmVhY2hhYmxlIGNvZGUKLUZBSUwgY3Jvc3NvcmlnaW4gdXNlLWNyZWRlbnRpYWxzIHRvIGFu
b255bW91cywgc3JjIGFscmVhZHkgc2V0IGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1h
Z2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQotRkFJTCBjcm9zc29y
aWdpbiB1c2UtY3JlZGVudGlhbHMgdG8gaW52YWxpZCwgc3JjIGFscmVhZHkgc2V0IGFzc2VydF91
bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFj
aGFibGUgY29kZQorUEFTUyBjcm9zc29yaWdpbiBhYnNlbnQgdG8gZW1wdHksIHNyYyBhbHJlYWR5
IHNldCAKK1BBU1MgY3Jvc3NvcmlnaW4gYWJzZW50IHRvIGFub255bW91cywgc3JjIGFscmVhZHkg
c2V0IAorUEFTUyBjcm9zc29yaWdpbiBhYnNlbnQgdG8gdXNlLWNyZWRlbnRpYWxzLCBzcmMgYWxy
ZWFkeSBzZXQgCitQQVNTIGNyb3Nzb3JpZ2luIGVtcHR5IHRvIGFic2VudCwgc3JjIGFscmVhZHkg
c2V0IAorUEFTUyBjcm9zc29yaWdpbiBlbXB0eSB0byB1c2UtY3JlZGVudGlhbHMsIHNyYyBhbHJl
YWR5IHNldCAKK1BBU1MgY3Jvc3NvcmlnaW4gYW5vbnltb3VzIHRvIGFic2VudCwgc3JjIGFscmVh
ZHkgc2V0IAorUEFTUyBjcm9zc29yaWdpbiBhbm9ueW1vdXMgdG8gdXNlLWNyZWRlbnRpYWxzLCBz
cmMgYWxyZWFkeSBzZXQgCitQQVNTIGNyb3Nzb3JpZ2luIHVzZS1jcmVkZW50aWFscyB0byBhYnNl
bnQsIHNyYyBhbHJlYWR5IHNldCAKK1BBU1MgY3Jvc3NvcmlnaW4gdXNlLWNyZWRlbnRpYWxzIHRv
IGVtcHR5LCBzcmMgYWxyZWFkeSBzZXQgCitQQVNTIGNyb3Nzb3JpZ2luIHVzZS1jcmVkZW50aWFs
cyB0byBhbm9ueW1vdXMsIHNyYyBhbHJlYWR5IHNldCAKK1BBU1MgY3Jvc3NvcmlnaW4gdXNlLWNy
ZWRlbnRpYWxzIHRvIGludmFsaWQsIHNyYyBhbHJlYWR5IHNldCAKIFBBU1MgcmVmZXJyZXJwb2xp
Y3kgYWJzZW50IHRvIG5vLXJlZmVycmVyLXdoZW4tZG93bmdyYWRlLCBzcmMgYWJzZW50IAogUEFT
UyByZWZlcnJlcnBvbGljeSBhYnNlbnQgdG8gbm8tcmVmZXJyZXIsIHNyYyBhYnNlbnQgCiBQQVNT
IHJlZmVycmVycG9saWN5IGVtcHR5IHRvIG5vLXJlZmVycmVyLXdoZW4tZG93bmdyYWRlLCBzcmMg
YWJzZW50IApAQCAtNTUsMjQgKzU1LDI0IEBAIFBBU1MgcmVmZXJyZXJwb2xpY3kgbm8tcmVmZXJy
ZXIgdG8gYWJzZW50LCBzcmMgYWxyZWFkeSBzZXQKIFBBU1MgcmVmZXJyZXJwb2xpY3kgbm8tcmVm
ZXJyZXIgdG8gZW1wdHksIHNyYyBhbHJlYWR5IHNldCAKIFBBU1MgcmVmZXJyZXJwb2xpY3kgbm8t
cmVmZXJyZXIgdG8gbm8tcmVmZXJyZXItd2hlbi1kb3duZ3JhZGUsIHNyYyBhbHJlYWR5IHNldCAK
IFBBU1MgcmVmZXJyZXJwb2xpY3kgbm8tcmVmZXJyZXIgdG8gaW52YWxpZCwgc3JjIGFscmVhZHkg
c2V0IAotRkFJTCBpbnNlcnRlZCBpbnRvIHBpY3R1cmUgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRl
IHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlM
IHJlbW92ZWQgZnJvbSBwaWN0dXJlIGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2Ug
ZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQotRkFJTCBwYXJlbnQgaXMg
cGljdHVyZSwgcHJldmlvdXMgc291cmNlIGluc2VydGVkIGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0
ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQotRkFJ
TCBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIHJlbW92ZWQgYXNzZXJ0X3VucmVh
Y2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJs
ZSBjb2RlCi1GQUlMIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91cyBzb3VyY2UgaGFzIHNyY3Nl
dCBzZXQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4g
UmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91
cyBzb3VyY2UgaGFzIHNyY3NldCBjaGFuZ2VkIGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUg
aW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQotRkFJTCBwYXJl
bnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyBzcmNzZXQgcmVtb3ZlZCBhc3NlcnRf
dW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVucmVh
Y2hhYmxlIGNvZGUKLUZBSUwgcGFyZW50IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNvdXJjZSBoYXMg
c2l6ZXMgc2V0IGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3Qg
cnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQotRkFJTCBwYXJlbnQgaXMgcGljdHVyZSwgcHJl
dmlvdXMgc291cmNlIGhhcyBzaXplcyBjaGFuZ2VkIGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0
aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQotRkFJTCBw
YXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhhcyBzaXplcyByZW1vdmVkIGFzc2Vy
dF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRuJ3QgcnVuIFJlYWNoZWQgdW5y
ZWFjaGFibGUgY29kZQotRkFJTCBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhh
cyBtZWRpYSBzZXQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4n
dCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHBhcmVudCBpcyBwaWN0dXJlLCBw
cmV2aW91cyBzb3VyY2UgaGFzIG1lZGlhIGNoYW5nZWQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRl
IHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlM
IHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91cyBzb3VyY2UgaGFzIG1lZGlhIHJlbW92ZWQgYXNz
ZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1
bnJlYWNoYWJsZSBjb2RlCi1GQUlMIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91cyBzb3VyY2Ug
aGFzIHR5cGUgc2V0IGFzc2VydF91bnJlYWNoZWQ6IHVwZGF0ZSB0aGUgaW1hZ2UgZGF0YSBkaWRu
J3QgcnVuIFJlYWNoZWQgdW5yZWFjaGFibGUgY29kZQotRkFJTCBwYXJlbnQgaXMgcGljdHVyZSwg
cHJldmlvdXMgc291cmNlIGhhcyB0eXBlIGNoYW5nZWQgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRl
IHRoZSBpbWFnZSBkYXRhIGRpZG4ndCBydW4gUmVhY2hlZCB1bnJlYWNoYWJsZSBjb2RlCi1GQUlM
IHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91cyBzb3VyY2UgaGFzIHR5cGUgcmVtb3ZlZCBhc3Nl
cnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgZGlkbid0IHJ1biBSZWFjaGVkIHVu
cmVhY2hhYmxlIGNvZGUKLVBBU1Mgc3Jjc2V0IGlzIHNldCB0byBzYW1lIHZhbHVlIAotUEFTUyBz
aXplcyBpcyBzZXQgdG8gc2FtZSB2YWx1ZSAKK1BBU1MgaW5zZXJ0ZWQgaW50byBwaWN0dXJlIAor
UEFTUyByZW1vdmVkIGZyb20gcGljdHVyZSAKK1BBU1MgcGFyZW50IGlzIHBpY3R1cmUsIHByZXZp
b3VzIHNvdXJjZSBpbnNlcnRlZCAKK1BBU1MgcGFyZW50IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNv
dXJjZSByZW1vdmVkIAorUEFTUyBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhh
cyBzcmNzZXQgc2V0IAorUEFTUyBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlvdXMgc291cmNlIGhh
cyBzcmNzZXQgY2hhbmdlZCAKK1BBU1MgcGFyZW50IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNvdXJj
ZSBoYXMgc3Jjc2V0IHJlbW92ZWQgCitQQVNTIHBhcmVudCBpcyBwaWN0dXJlLCBwcmV2aW91cyBz
b3VyY2UgaGFzIHNpemVzIHNldCAKK1BBU1MgcGFyZW50IGlzIHBpY3R1cmUsIHByZXZpb3VzIHNv
dXJjZSBoYXMgc2l6ZXMgY2hhbmdlZCAKK1BBU1MgcGFyZW50IGlzIHBpY3R1cmUsIHByZXZpb3Vz
IHNvdXJjZSBoYXMgc2l6ZXMgcmVtb3ZlZCAKK1BBU1MgcGFyZW50IGlzIHBpY3R1cmUsIHByZXZp
b3VzIHNvdXJjZSBoYXMgbWVkaWEgc2V0IAorUEFTUyBwYXJlbnQgaXMgcGljdHVyZSwgcHJldmlv
dXMgc291cmNlIGhhcyBtZWRpYSBjaGFuZ2VkIAorUEFTUyBwYXJlbnQgaXMgcGljdHVyZSwgcHJl
dmlvdXMgc291cmNlIGhhcyBtZWRpYSByZW1vdmVkIAorUEFTUyBwYXJlbnQgaXMgcGljdHVyZSwg
cHJldmlvdXMgc291cmNlIGhhcyB0eXBlIHNldCAKK1BBU1MgcGFyZW50IGlzIHBpY3R1cmUsIHBy
ZXZpb3VzIHNvdXJjZSBoYXMgdHlwZSBjaGFuZ2VkIAorUEFTUyBwYXJlbnQgaXMgcGljdHVyZSwg
cHJldmlvdXMgc291cmNlIGhhcyB0eXBlIHJlbW92ZWQgCitGQUlMIHNyY3NldCBpcyBzZXQgdG8g
c2FtZSB2YWx1ZSBhc3NlcnRfdW5yZWFjaGVkOiB1cGRhdGUgdGhlIGltYWdlIGRhdGEgd2FzIHJ1
biBSZWFjaGVkIHVucmVhY2hhYmxlIGNvZGUKK0ZBSUwgc2l6ZXMgaXMgc2V0IHRvIHNhbWUgdmFs
dWUgYXNzZXJ0X3VucmVhY2hlZDogdXBkYXRlIHRoZSBpbWFnZSBkYXRhIHdhcyBydW4gUmVhY2hl
ZCB1bnJlYWNoYWJsZSBjb2RlCiBQQVNTIGNyb3Nzb3JpZ2luIHN0YXRlIG5vdCBjaGFuZ2VkOiBh
YnNlbnQsIHJlbW92ZUF0dHJpYnV0ZSAKIFBBU1MgY3Jvc3NvcmlnaW4gc3RhdGUgbm90IGNoYW5n
ZWQ6IGVtcHR5IHRvIGFub255bW91cyAKIFBBU1MgY3Jvc3NvcmlnaW4gc3RhdGUgbm90IGNoYW5n
ZWQ6IGFub255bW91cyB0byBmb29iYXIgCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402476</attachid>
            <date>2020-06-22 08:17:12 -0700</date>
            <delta_ts>2020-06-22 09:09:42 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213335-20200622171710.patch</filename>
            <type>text/plain</type>
            <size>1551</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMzQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWE3MmE1YTlkMzY2OTky
MWU1ZTQ1YjExZWU3MDJkZTRmNDI4YjE3Ni4uYWNhMzQ2MGI0OTBiMmFjMzg2ZDBlMzQ0N2ViYzdh
MmRiOTI2Y2QwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA2LTIyICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgSW1hZ2UgYGNyb3Nzb3JpZ2luYCBt
dXRhdGlvbnMgc2hvdWxkIGJlIGNvbnNpZGVyZWQgInJlbGV2YW50IG11dGF0aW9ucyIKKyAgICAg
ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzMzNQorCisgICAg
ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFzIGZvbGxvdyB1cCB0
byByMjYzMzQ1LCB0aGlzIGNoZWNrIGlzIG5vdCBuZWVkZWQgYWZ0ZXIgYWxsIHNpbmNlIHRoZSBm
b3IgbG9vcAorICAgICAgICBhbHJlYWR5IGRvZXMgdGhlIHNhbWUgY2hlY2suCisKKyAgICAgICAg
KiBodG1sL0hUTUxJbWFnZUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEltYWdl
RWxlbWVudDo6YmVzdEZpdFNvdXJjZUZyb21QaWN0dXJlRWxlbWVudCk6CisKIDIwMjAtMDYtMTAg
IFNlcmdpbyBWaWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+CiAKICAgICAgICAgW1dl
YlhSXSBBZGQgYSBwcmVsaW1pbmFyeSBpbXBsZW1lbnRhdGlvbiBvZiBYUldlYkdMTGF5ZXIKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5jcHAgYi9Tb3Vy
Y2UvV2ViQ29yZS9odG1sL0hUTUxJbWFnZUVsZW1lbnQuY3BwCmluZGV4IDEzNThmYjg5ODNhNmE1
NDcxMWM5N2NmMjQyYWQxZjQ2MmU4ZDVlYzkuLmQ4OTdkYjJiNjY3NWVmOWRhMDg1YWM0Mjg1NmNk
NTgxNTI4ZTk4M2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxl
bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW1hZ2VFbGVtZW50LmNwcApA
QCAtMTY2LDggKzE2Niw2IEBAIEltYWdlQ2FuZGlkYXRlIEhUTUxJbWFnZUVsZW1lbnQ6OmJlc3RG
aXRTb3VyY2VGcm9tUGljdHVyZUVsZW1lbnQoKQogICAgIEltYWdlQ2FuZGlkYXRlIGNhbmRpZGF0
ZTsKIAogICAgIGZvciAoUmVmUHRyPE5vZGU+IGNoaWxkID0gcGljdHVyZS0+Zmlyc3RDaGlsZCgp
OyBjaGlsZCAmJiBjaGlsZCAhPSB0aGlzOyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGluZygpKSB7
Ci0gICAgICAgIGlmIChjaGlsZCA9PSB0aGlzKQotICAgICAgICAgICAgcmV0dXJuIHsgfTsKICAg
ICAgICAgaWYgKCFpczxIVE1MU291cmNlRWxlbWVudD4oKmNoaWxkKSkKICAgICAgICAgICAgIGNv
bnRpbnVlOwogICAgICAgICBhdXRvJiBzb3VyY2UgPSBkb3duY2FzdDxIVE1MU291cmNlRWxlbWVu
dD4oKmNoaWxkKTsK
</data>

          </attachment>
      

    </bug>

</bugzilla>