<?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>213536</bug_id>
          
          <creation_ts>2020-06-23 16:07:08 -0700</creation_ts>
          <short_desc>Cannot delete last line of Mail Message</short_desc>
          <delta_ts>2020-06-25 13:58:04 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>New Bugs</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Megan Gardner">megan_gardner</reporter>
          <assigned_to name="Megan Gardner">megan_gardner</assigned_to>
          <cc>darin</cc>
    
    <cc>dbates</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>mifenton</cc>
    
    <cc>thorton</cc>
    
    <cc>wenson_hsieh</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1665578</commentid>
    <comment_count>0</comment_count>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-06-23 16:07:08 -0700</bug_when>
    <thetext>Cannot delete last line of Mail Message</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1665583</commentid>
    <comment_count>1</comment_count>
      <attachid>402604</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-06-23 16:16:50 -0700</bug_when>
    <thetext>Created attachment 402604
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1665584</commentid>
    <comment_count>2</comment_count>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-06-23 16:18:22 -0700</bug_when>
    <thetext>&lt;rdar://problem/63420928&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1665596</commentid>
    <comment_count>3</comment_count>
      <attachid>402604</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2020-06-23 16:47:02 -0700</bug_when>
    <thetext>Comment on attachment 402604
Patch

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

&gt; Source/WebCore/editing/DeleteSelectionCommand.cpp:211
&gt; +            position = endOfParagraphBeforeStart.deepEquivalent();

This line doesn’t seem like it needs to be in the if statement.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1665598</commentid>
    <comment_count>4</comment_count>
      <attachid>402604</attachid>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2020-06-23 16:48:19 -0700</bug_when>
    <thetext>Comment on attachment 402604
Patch

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

Looks reasonable, but you might need to tweak the test or add different baselines for some of the other platforms.

&gt; Source/WebCore/editing/DeleteSelectionCommand.cpp:215
&gt; +        VisiblePosition endOfParagraphBeforeStart;
&gt; +        Position position;
&gt; +        if (previousPositionIsStartOfContent) {
&gt; +            endOfParagraphBeforeStart = endOfParagraph(VisiblePosition { m_upstreamStart }.previous());
&gt; +            position = endOfParagraphBeforeStart.deepEquivalent();
&gt; +        } else {
&gt; +            endOfParagraphBeforeStart = endOfParagraph(VisiblePosition { m_upstreamStart }.previous().previous());
&gt; +            position = endOfParagraphBeforeStart.deepEquivalent();
&gt; +        }

Nit - I think this could be written a little more succinctly as:

    …
    VisiblePosition positionBeforeUpstreamStart { m_upstreamStart }.previous();
    if (!previousPositionIsStartOfContent)
        positionBeforeUpstreamStart = positionBeforeUpstreamStart.previous();
    auto position = endOfParagraph(positionBeforeUpstreamStart).deepEquivalent();
    …

...or perhaps

    …
    auto positionBeforeUpstreamStart = previousPositionIsStartOfContent ? VisiblePosition { m_upstreamStart }.previous() : VisiblePosition { m_upstreamStart }.previous().previous();
    auto position = endOfParagraph(positionBeforeUpstreamStart).deepEquivalent();
    …

At least, the last line (position = endOfParagraphBeforeStart.deepEquivalent();) could be moved out of the if/else.

&gt; LayoutTests/ChangeLog:8
&gt; +        * editing/deleting/smart-delete-paragraph-001.html:

Nit - this ChangeLog entry looks out of date.

&gt; LayoutTests/editing/deleting/smart-delete-paragraph-005.html:28
&gt; +Test must exist at the top of the file in order to correclty test the original bug.

Nit - correclty =&gt; correctly</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1665612</commentid>
    <comment_count>5</comment_count>
      <attachid>402613</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-06-23 18:00:53 -0700</bug_when>
    <thetext>Created attachment 402613
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1665618</commentid>
    <comment_count>6</comment_count>
      <attachid>402615</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-06-23 19:01:06 -0700</bug_when>
    <thetext>Created attachment 402615
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1665646</commentid>
    <comment_count>7</comment_count>
      <attachid>402622</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-06-23 22:29:26 -0700</bug_when>
    <thetext>Created attachment 402622
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1665809</commentid>
    <comment_count>8</comment_count>
      <attachid>402667</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-06-24 11:59:15 -0700</bug_when>
    <thetext>Created attachment 402667
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1665810</commentid>
    <comment_count>9</comment_count>
      <attachid>402668</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-06-24 12:00:08 -0700</bug_when>
    <thetext>Created attachment 402668
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1665814</commentid>
    <comment_count>10</comment_count>
      <attachid>402668</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2020-06-24 12:05:31 -0700</bug_when>
    <thetext>Comment on attachment 402668
Patch

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

Not that you need to wait for me specifically, but I am planning to review once there’s a patch that passes all EWS.

&gt; Source/WebCore/editing/DeleteSelectionCommand.cpp:191
&gt;      bool endPositonIsBlankParagraph = isBlankParagraph(visibleEnd);

Hey, look at that: &quot;positon&quot;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1665821</commentid>
    <comment_count>11</comment_count>
      <attachid>402672</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-06-24 12:16:13 -0700</bug_when>
    <thetext>Created attachment 402672
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1665871</commentid>
    <comment_count>12</comment_count>
      <attachid>402686</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-06-24 14:33:03 -0700</bug_when>
    <thetext>Created attachment 402686
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1665890</commentid>
    <comment_count>13</comment_count>
      <attachid>402691</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-06-24 15:33:39 -0700</bug_when>
    <thetext>Created attachment 402691
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1665905</commentid>
    <comment_count>14</comment_count>
      <attachid>402695</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-06-24 16:20:06 -0700</bug_when>
    <thetext>Created attachment 402695
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1665915</commentid>
    <comment_count>15</comment_count>
      <attachid>402697</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-06-24 17:14:58 -0700</bug_when>
    <thetext>Created attachment 402697
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1665916</commentid>
    <comment_count>16</comment_count>
    <who name="Darin Adler">darin</who>
    <bug_when>2020-06-24 17:15:41 -0700</bug_when>
    <thetext>(My take: we’ll grep for &quot;ositon&quot; separately and fix all those typos. No need to mix it up in this patch.)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666091</commentid>
    <comment_count>17</comment_count>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2020-06-25 10:56:36 -0700</bug_when>
    <thetext>I agree, I&apos;ll fix it in a different patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666206</commentid>
    <comment_count>18</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-06-25 13:58:03 -0700</bug_when>
    <thetext>Committed r263528: &lt;https://trac.webkit.org/changeset/263528&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 402697.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402604</attachid>
            <date>2020-06-23 16:16:50 -0700</date>
            <delta_ts>2020-06-23 18:00:51 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213536-20200623161650.patch</filename>
            <type>text/plain</type>
            <size>8182</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMjkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDYyODAwYjYyNGI4YTFh
OGNlOWYyZTVlNGExN2ZmODE1YjY0MzIwMC4uYTE5YmY3NDE5ZWJhYWI2YTkxMTU4MTJlNmE4NjY2
MDBkMTVmODIwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTA2LTIzICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQ2Fubm90IGRl
bGV0ZSBsYXN0IGxpbmUgb2YgTWFpbCBNZXNzYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTM1MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP
RFkgKE9PUFMhKS4KKworICAgICAgICBMYXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL3NtYXJ0
LWRlbGV0ZS1wYXJhZ3JhcGgtMDA1Lmh0bWwKKworICAgICAgICBUaGUgc21hcnQgcGFyYWdyYXBo
IGRlbGV0aW9uIGNvZGUgZGlkIG5vdCB0YWtlIGludG8gYWNjb3VudCB0aGF0CisgICAgICAgIHRo
ZSBwcmV2aW91cyBibGFuayBsaW5lIGNvdWxkIGJlIHRoZSBzdGFydCBvZiBlZGl0YWJsZSBjb250
ZW50IHdpdGhvdXQKKyAgICAgICAgYSBwYXJhZ3JhcGggYmVmb3JlIGl0LiBJZiB0aGlzIHdhcyB0
aGUgY2FzZSwgdGhlIGRlbGV0aW9uIGNvZGUgYmFja2VkIHVwCisgICAgICAgIHRvbyBmYXIsIGFu
ZCB0aGUgZGVsZXRlIGNvbW1hbmQgZmFpbGVkLiBUaGlzIGNhc2Ugc2hvdWxkIGJlIGhhbmRsZWQK
KyAgICAgICAgaW4gdGhlIHNhbWUgd2F5IHRoYXQgdGhlIGRlbGV0aW5nIHRoZSBsYXN0IHBhcmFn
cmFwaCBpbiBlZGl0YWJsZSBjb250ZW50IGlzCisgICAgICAgIGhhbmRsZWQsIGJ5IGNoZWNraW5n
IGlmIHdlIGFyZSBhbHJlYWR5IGF0IHRoZSBiZWdpbm5pbmcgb2YgdGhlIGVkaXRhYmxlCisgICAg
ICAgIGNvbnRlbnQgd2hlbiBleHBhbmRpbmcgdGhlIHNlbGVjdGlvbiBmb3Igc21hcnQgcGFyYWdy
YXBoIGRlbGV0aW9uLgorCisgICAgICAgICogZWRpdGluZy9EZWxldGVTZWxlY3Rpb25Db21tYW5k
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRlbGV0ZVNlbGVjdGlvbkNvbW1hbmQ6OnNtYXJ0RGVs
ZXRlUGFyYWdyYXBoU3BhY2Vycyk6CisKIDIwMjAtMDYtMTkgIEFuZHJlcyBHb256YWxleiAgPGFu
ZHJlc2dfMjJAYXBwbGUuY29tPgogCiAgICAgICAgIEFYOiB3ZWIgcHJvY2VzcyBjcmFzaCBpbiBB
WE9iamVjdENhY2hlOjpwb3N0Tm90aWZpY2F0aW9uLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUvZWRpdGluZy9EZWxldGVTZWxlY3Rpb25Db21tYW5kLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Vk
aXRpbmcvRGVsZXRlU2VsZWN0aW9uQ29tbWFuZC5jcHAKaW5kZXggMDBhNTI5NzRmODdhN2IwOTky
NDIxODc2YjJlZDE5ODRlYjJiYjdmYy4uZTM5N2E0MmEzOTU5MGVkM2JiNmM0MzU0NzljYzg5NTcw
MjdkNjFlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9EZWxldGVTZWxlY3Rp
b25Db21tYW5kLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0RlbGV0ZVNlbGVjdGlv
bkNvbW1hbmQuY3BwCkBAIC0xODYsNiArMTg2LDcgQEAgdm9pZCBEZWxldGVTZWxlY3Rpb25Db21t
YW5kOjpzbWFydERlbGV0ZVBhcmFncmFwaFNwYWNlcnMoKQogICAgIGJvb2wgc3RhcnRBbmRFbmRJ
blNhbWVVbnNwbGl0dGFibGVFbGVtZW50ID0gdW5zcGxpdHRhYmxlRWxlbWVudEZvclBvc2l0aW9u
KHZpc2libGVTdGFydC5kZWVwRXF1aXZhbGVudCgpKSA9PSB1bnNwbGl0dGFibGVFbGVtZW50Rm9y
UG9zaXRpb24odmlzaWJsZUVuZC5kZWVwRXF1aXZhbGVudCgpKTsKICAgICB2aXNpYmxlU3RhcnQg
PSB2aXNpYmxlU3RhcnQucHJldmlvdXMoQ2Fubm90Q3Jvc3NFZGl0aW5nQm91bmRhcnkpOwogICAg
IHZpc2libGVFbmQgPSB2aXNpYmxlRW5kLm5leHQoQ2Fubm90Q3Jvc3NFZGl0aW5nQm91bmRhcnkp
OworICAgIGJvb2wgcHJldmlvdXNQb3NpdGlvbklzU3RhcnRPZkNvbnRlbnQgPSBzdGFydE9mRWRp
dGFibGVDb250ZW50KHZpc2libGVTdGFydCkgPT0gdmlzaWJsZVN0YXJ0OwogICAgIGJvb2wgcHJl
dmlvdXNQb3NpdGlvbklzQmxhbmtQYXJhZ3JhcGggPSBpc0JsYW5rUGFyYWdyYXBoKHZpc2libGVT
dGFydCk7CiAgICAgYm9vbCBlbmRQb3NpdG9uSXNCbGFua1BhcmFncmFwaCA9IGlzQmxhbmtQYXJh
Z3JhcGgodmlzaWJsZUVuZCk7CiAgICAgYm9vbCBoYXNCbGFua1BhcmFncmFwaEFmdGVyRW5kT3JJ
c0VuZE9mQ29udGVudCA9ICFzZWxlY3Rpb25FbmRJc0VuZE9mQ29udGVudCAmJiAoZW5kUG9zaXRv
bklzQmxhbmtQYXJhZ3JhcGggfHwgc2VsZWN0aW9uRW5kc0luUGFyYWdyYXBoU2VwZXJhdG9yKTsK
QEAgLTIwMyw4ICsyMDQsMTUgQEAgdm9pZCBEZWxldGVTZWxlY3Rpb25Db21tYW5kOjpzbWFydERl
bGV0ZVBhcmFncmFwaFNwYWNlcnMoKQogICAgIH0KICAgICBpZiAoc3RhcnRBbmRFbmRJblNhbWVV
bnNwbGl0dGFibGVFbGVtZW50ICYmIHNlbGVjdGlvbkVuZElzRW5kT2ZDb250ZW50ICYmIHByZXZp
b3VzUG9zaXRpb25Jc0JsYW5rUGFyYWdyYXBoICYmIHNlbGVjdGlvbkVuZHNJblBhcmFncmFwaFNl
cGVyYXRvcikgewogICAgICAgICBtX25lZWRQbGFjZWhvbGRlciA9IGZhbHNlOwotICAgICAgICBW
aXNpYmxlUG9zaXRpb24gZW5kT2ZQYXJhZ3JhcGhCZWZvcmVTdGFydCA9IGVuZE9mUGFyYWdyYXBo
KFZpc2libGVQb3NpdGlvbiB7IG1fdXBzdHJlYW1TdGFydCB9LnByZXZpb3VzKCkucHJldmlvdXMo
KSk7Ci0gICAgICAgIFBvc2l0aW9uIHBvc2l0aW9uID0gZW5kT2ZQYXJhZ3JhcGhCZWZvcmVTdGFy
dC5kZWVwRXF1aXZhbGVudCgpOworICAgICAgICBWaXNpYmxlUG9zaXRpb24gZW5kT2ZQYXJhZ3Jh
cGhCZWZvcmVTdGFydDsKKyAgICAgICAgUG9zaXRpb24gcG9zaXRpb247CisgICAgICAgIGlmIChw
cmV2aW91c1Bvc2l0aW9uSXNTdGFydE9mQ29udGVudCkgeworICAgICAgICAgICAgZW5kT2ZQYXJh
Z3JhcGhCZWZvcmVTdGFydCA9IGVuZE9mUGFyYWdyYXBoKFZpc2libGVQb3NpdGlvbiB7IG1fdXBz
dHJlYW1TdGFydCB9LnByZXZpb3VzKCkpOworICAgICAgICAgICAgcG9zaXRpb24gPSBlbmRPZlBh
cmFncmFwaEJlZm9yZVN0YXJ0LmRlZXBFcXVpdmFsZW50KCk7CisgICAgICAgIH0gZWxzZSB7Cisg
ICAgICAgICAgICBlbmRPZlBhcmFncmFwaEJlZm9yZVN0YXJ0ID0gZW5kT2ZQYXJhZ3JhcGgoVmlz
aWJsZVBvc2l0aW9uIHsgbV91cHN0cmVhbVN0YXJ0IH0ucHJldmlvdXMoKS5wcmV2aW91cygpKTsK
KyAgICAgICAgICAgIHBvc2l0aW9uID0gZW5kT2ZQYXJhZ3JhcGhCZWZvcmVTdGFydC5kZWVwRXF1
aXZhbGVudCgpOworICAgICAgICB9CiAgICAgICAgIG1fdXBzdHJlYW1TdGFydCA9IHBvc2l0aW9u
LnVwc3RyZWFtKCk7CiAgICAgICAgIG1fZG93bnN0cmVhbVN0YXJ0ID0gcG9zaXRpb24uZG93bnN0
cmVhbSgpOwogICAgICAgICBtX2xlYWRpbmdXaGl0ZXNwYWNlID0gbV91cHN0cmVhbVN0YXJ0Lmxl
YWRpbmdXaGl0ZXNwYWNlUG9zaXRpb24oRE9XTlNUUkVBTSk7CmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMTVjMzJkNTJiMTYz
ZDBhMmQ2YjFmZjNjMjg0YjU0YzMwYjY1NTQzZC4uODBhNzVlZDNlOTUxNjFlMDk4Nzk1MTAzZDMx
NzNjMDIxOGY5MjUwZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh
eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIwLTA2LTIzICBNZWdhbiBH
YXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQ2Fubm90IGRlbGV0
ZSBsYXN0IGxpbmUgb2YgTWFpbCBNZXNzYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0yMTM1MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg
KE9PUFMhKS4KKworICAgICAgICAqIGVkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFn
cmFwaC0wMDEuaHRtbDoKKwogMjAyMC0wNi0xOSAgRGllZ28gUGlubyBHYXJjaWEgIDxkcGlub0Bp
Z2FsaWEuY29tPgogCiAgICAgICAgIFtHTElCXSBVbnJldmlld2VkIHRlc3QgZ2FyZGVuaW5nLiBV
cGRhdGUgdGVzdCBleHBlY3RhdGlvbnMgYWZ0ZXIgcjI2MzI2OC4KZGlmZiAtLWdpdCBhL0xheW91
dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUtZXhwZWN0
ZWQudHh0IGIvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9zbWFydC1kZWxldGUtcGFyYWdy
YXBoLTAwNS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYzVmNTg2MWFkMzA3ZjgyNGFkNTRjNTQ3
ZGNiNjNjODgzNjk3NmUyYwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2VkaXRpbmcv
ZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUtZXhwZWN0ZWQudHh0CkBAIC0wLDAg
KzEsMTYgQEAKK0VESVRJTkcgREVMRUdBVEU6IHNob3VsZEJlZ2luRWRpdGluZ0luRE9NUmFuZ2U6
cmFuZ2UgZnJvbSAwIG9mIERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDIgb2YgRElW
ID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQKK0VESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRC
ZWdpbkVkaXRpbmc6V2ViVmlld0RpZEJlZ2luRWRpdGluZ05vdGlmaWNhdGlvbgorRURJVElORyBE
RUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3RGlkQ2hhbmdlU2VsZWN0
aW9uTm90aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRFOiBzaG91bGRDaGFuZ2VTZWxlY3RlZERP
TVJhbmdlOnJhbmdlIGZyb20gMCBvZiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVu
dCB0byAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvRE9NUmFuZ2U6
cmFuZ2UgZnJvbSAxIG9mICN0ZXh0ID4gRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1l
bnQgdG8gMSBvZiAjdGV4dCA+IERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IGFm
ZmluaXR5Ok5TU2VsZWN0aW9uQWZmaW5pdHlEb3duc3RyZWFtIHN0aWxsU2VsZWN0aW5nOkZBTFNF
CitFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uOldlYlZpZXdEaWRD
aGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRpb24KK0VESVRJTkcgREVMRUdBVEU6IHNob3VsZENoYW5n
ZVNlbGVjdGVkRE9NUmFuZ2U6cmFuZ2UgZnJvbSAxIG9mICN0ZXh0ID4gRElWID4gRElWID4gQk9E
WSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gMSBvZiAjdGV4dCA+IERJViA+IERJViA+IEJPRFkgPiBI
VE1MID4gI2RvY3VtZW50IHRvRE9NUmFuZ2U6cmFuZ2UgZnJvbSAxIG9mICN0ZXh0ID4gRElWID4g
RElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gMSBvZiAjdGV4dCA+IERJViA+IERJViA+
IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IGFmZmluaXR5Ok5TU2VsZWN0aW9uQWZmaW5pdHlEb3du
c3RyZWFtIHN0aWxsU2VsZWN0aW5nOkZBTFNFCitFRElUSU5HIERFTEVHQVRFOiBzaG91bGRDaGFu
Z2VTZWxlY3RlZERPTVJhbmdlOnJhbmdlIGZyb20gMSBvZiAjdGV4dCA+IERJViA+IERJViA+IEJP
RFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDEgb2YgI3RleHQgPiBESVYgPiBESVYgPiBCT0RZID4g
SFRNTCA+ICNkb2N1bWVudCB0b0RPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiAjdGV4dCA+IERJViA+
IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDEgb2YgI3RleHQgPiBESVYgPiBESVYg
PiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCBhZmZpbml0eTpOU1NlbGVjdGlvbkFmZmluaXR5RG93
bnN0cmVhbSBzdGlsbFNlbGVjdGluZzpGQUxTRQorRURJVElORyBERUxFR0FURTogd2ViVmlld0Rp
ZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCitF
RElUSU5HIERFTEVHQVRFOiBzaG91bGREZWxldGVET01SYW5nZTpyYW5nZSBmcm9tIDAgb2YgI3Rl
eHQgPiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0byAxIG9mICN0ZXh0ID4g
RElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQKK0VESVRJTkcgREVMRUdBVEU6IHdl
YlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5vdGlmaWNh
dGlvbgorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZTpXZWJWaWV3RGlkQ2hhbmdl
Tm90aWZpY2F0aW9uCitUZXN0czogCitTbWFydCBkZWxldGUgd2hlbiBkZWxldGluZyBhIGxpbmUg
d2l0aCBvbmx5IGEgYmxhbmsgbGluZSBhYm92ZSBpdC4gVGVzdCBtdXN0IGV4aXN0IGF0IHRoZSB0
b3Agb2YgdGhlIGZpbGUgaW4gb3JkZXIgdG8gY29ycmVjbHR5IHRlc3QgdGhlIG9yaWdpbmFsIGJ1
Zy4KK0V4cGVjdGVkIFJlc3VsdHM6IAorRXZlcnl0aGluZyBzaG91bGQgYmUgZGVsZXRlZC4KKwpk
aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9zbWFydC1kZWxldGUtcGFy
YWdyYXBoLTAwNS5odG1sIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9zbWFydC1kZWxl
dGUtcGFyYWdyYXBoLTAwNS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmZlZWYxZjNlNzU0NTIzNTE0MzEwODFk
NWMxMzdkMjkzNzg0OTZiMDkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9lZGl0aW5n
L2RlbGV0aW5nL3NtYXJ0LWRlbGV0ZS1wYXJhZ3JhcGgtMDA1Lmh0bWwKQEAgLTAsMCArMSw1MCBA
QAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4gCis8aGVhZD4KKzxzdHlsZT4KKy5lZGl0aW5nIHsg
CisgICAgYm9yZGVyOiAycHggc29saWQgcmVkOyAKKyAgICBmb250LXNpemU6IDI0cHg7IAorfQor
LmV4cGxhbmF0aW9uIHsgCisgICAgYm9yZGVyOiAycHggc29saWQgYmx1ZTsgCisgICAgcGFkZGlu
ZzogMTJweDsgCisgICAgZm9udC1zaXplOiAyNHB4OyAKKyAgICBtYXJnaW4tYm90dG9tOiAyNHB4
OworfQorLnNjZW5hcmlvIHsgbWFyZ2luLWJvdHRvbTogMTZweDt9Cisuc2NlbmFyaW86Zmlyc3Qt
bGluZSB7IGZvbnQtd2VpZ2h0OiBib2xkOyBtYXJnaW4tYm90dG9tOiAxNnB4O30KKy5leHBlY3Rl
ZC1yZXN1bHRzOmZpcnN0LWxpbmUgeyBmb250LXdlaWdodDogYm9sZCB9Cis8L3N0eWxlPgorPC9o
ZWFkPiAKKzxib2R5PgorPGRpdiBjb250ZW50ZWRpdGFibGU9InRydWUiIHN0eWxlPSJ3aWR0aDog
MjU2cHg7IGhlaWdodDogMjU2cHg7IGJvcmRlcjogMXB4IHNvbGlkIGJsYWNrIj48YnI+PGRpdiBp
ZD0idGVzdCI+czwvZGl2PjwvZGl2PgorCis8ZGl2IGNsYXNzPSJleHBsYW5hdGlvbiI+Cis8ZGl2
IGNsYXNzPSJzY2VuYXJpbyI+CitUZXN0czogCis8YnI+CitTbWFydCBkZWxldGUgd2hlbiBkZWxl
dGluZyBhIGxpbmUgd2l0aCBvbmx5IGEgYmxhbmsgbGluZSBhYm92ZSBpdC4KK1Rlc3QgbXVzdCBl
eGlzdCBhdCB0aGUgdG9wIG9mIHRoZSBmaWxlIGluIG9yZGVyIHRvIGNvcnJlY2x0eSB0ZXN0IHRo
ZSBvcmlnaW5hbCBidWcuCis8L2Rpdj4KKzxkaXYgY2xhc3M9ImV4cGVjdGVkLXJlc3VsdHMiPgor
RXhwZWN0ZWQgUmVzdWx0czoKKzxicj4KK0V2ZXJ5dGhpbmcgc2hvdWxkIGJlIGRlbGV0ZWQuCis8
L2Rpdj4KKzwvZGl2PgorCis8c2NyaXB0IHNyYz0iLi4vZWRpdGluZy5qcyI+PC9zY3JpcHQ+Cis8
c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL3VpLWhlbHBlci5qcyI+PC9zY3JpcHQ+Cis8c2Ny
aXB0PgorCithc3luYyBmdW5jdGlvbiBlZGl0aW5nVGVzdCgpIHsKKyAgICBpbnRlcm5hbHMuc2V0
dGluZ3Muc2V0RWRpdGluZ0JlaGF2aW9yKCJpb3MiKTsKKyAgICBhd2FpdCBVSUhlbHBlci5zZWxl
Y3RXb3JkQnlEb3VibGVUYXBPckNsaWNrKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0ZXN0Jykp
OworICAgIGN1dENvbW1hbmQoKTsKK30KKworcnVuRHVtcEFzVGV4dEVkaXRpbmdUZXN0KHRydWUp
OworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402613</attachid>
            <date>2020-06-23 18:00:53 -0700</date>
            <delta_ts>2020-06-23 19:01:02 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213536-20200623180052.patch</filename>
            <type>text/plain</type>
            <size>8147</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMjkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDYyODAwYjYyNGI4YTFh
OGNlOWYyZTVlNGExN2ZmODE1YjY0MzIwMC4uMDU5NTVjNjIzMDg4ZGZlNGIyZDQ3Zjk3YWM1MzEx
MzUyMjhhYWIyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA2LTIzICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQ2Fubm90IGRl
bGV0ZSBsYXN0IGxpbmUgb2YgTWFpbCBNZXNzYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTM1MzYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYz
NDIwOTI4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
IExheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUu
aHRtbAorCisgICAgICAgIFRoZSBzbWFydCBwYXJhZ3JhcGggZGVsZXRpb24gY29kZSBkaWQgbm90
IHRha2UgaW50byBhY2NvdW50IHRoYXQKKyAgICAgICAgdGhlIHByZXZpb3VzIGJsYW5rIGxpbmUg
Y291bGQgYmUgdGhlIHN0YXJ0IG9mIGVkaXRhYmxlIGNvbnRlbnQgd2l0aG91dAorICAgICAgICBh
IHBhcmFncmFwaCBiZWZvcmUgaXQuIElmIHRoaXMgd2FzIHRoZSBjYXNlLCB0aGUgZGVsZXRpb24g
Y29kZSBiYWNrZWQgdXAKKyAgICAgICAgdG9vIGZhciwgYW5kIHRoZSBkZWxldGUgY29tbWFuZCBm
YWlsZWQuIFRoaXMgY2FzZSBzaG91bGQgYmUgaGFuZGxlZAorICAgICAgICBpbiB0aGUgc2FtZSB3
YXkgdGhhdCB0aGUgZGVsZXRpbmcgdGhlIGxhc3QgcGFyYWdyYXBoIGluIGVkaXRhYmxlIGNvbnRl
bnQgaXMKKyAgICAgICAgaGFuZGxlZCwgYnkgY2hlY2tpbmcgaWYgd2UgYXJlIGFscmVhZHkgYXQg
dGhlIGJlZ2lubmluZyBvZiB0aGUgZWRpdGFibGUKKyAgICAgICAgY29udGVudCB3aGVuIGV4cGFu
ZGluZyB0aGUgc2VsZWN0aW9uIGZvciBzbWFydCBwYXJhZ3JhcGggZGVsZXRpb24uCisKKyAgICAg
ICAgKiBlZGl0aW5nL0RlbGV0ZVNlbGVjdGlvbkNvbW1hbmQuY3BwOgorICAgICAgICAoV2ViQ29y
ZTo6RGVsZXRlU2VsZWN0aW9uQ29tbWFuZDo6c21hcnREZWxldGVQYXJhZ3JhcGhTcGFjZXJzKToK
KwogMjAyMC0wNi0xOSAgQW5kcmVzIEdvbnphbGV6ICA8YW5kcmVzZ18yMkBhcHBsZS5jb20+CiAK
ICAgICAgICAgQVg6IHdlYiBwcm9jZXNzIGNyYXNoIGluIEFYT2JqZWN0Q2FjaGU6OnBvc3ROb3Rp
ZmljYXRpb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0RlbGV0ZVNlbGVj
dGlvbkNvbW1hbmQuY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9EZWxldGVTZWxlY3Rpb25D
b21tYW5kLmNwcAppbmRleCAwMGE1Mjk3NGY4N2E3YjA5OTI0MjE4NzZiMmVkMTk4NGViMmJiN2Zj
Li5kNWQwYmU2OTJlZjY0YWJkMjMwMmQ4MjM5ZTJmZGY0MTA0YTk4ZGNhIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9lZGl0aW5nL0RlbGV0ZVNlbGVjdGlvbkNvbW1hbmQuY3BwCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL2VkaXRpbmcvRGVsZXRlU2VsZWN0aW9uQ29tbWFuZC5jcHAKQEAgLTE4Niw2
ICsxODYsNyBAQCB2b2lkIERlbGV0ZVNlbGVjdGlvbkNvbW1hbmQ6OnNtYXJ0RGVsZXRlUGFyYWdy
YXBoU3BhY2VycygpCiAgICAgYm9vbCBzdGFydEFuZEVuZEluU2FtZVVuc3BsaXR0YWJsZUVsZW1l
bnQgPSB1bnNwbGl0dGFibGVFbGVtZW50Rm9yUG9zaXRpb24odmlzaWJsZVN0YXJ0LmRlZXBFcXVp
dmFsZW50KCkpID09IHVuc3BsaXR0YWJsZUVsZW1lbnRGb3JQb3NpdGlvbih2aXNpYmxlRW5kLmRl
ZXBFcXVpdmFsZW50KCkpOwogICAgIHZpc2libGVTdGFydCA9IHZpc2libGVTdGFydC5wcmV2aW91
cyhDYW5ub3RDcm9zc0VkaXRpbmdCb3VuZGFyeSk7CiAgICAgdmlzaWJsZUVuZCA9IHZpc2libGVF
bmQubmV4dChDYW5ub3RDcm9zc0VkaXRpbmdCb3VuZGFyeSk7CisgICAgYm9vbCBwcmV2aW91c1Bv
c2l0aW9uSXNTdGFydE9mQ29udGVudCA9IHN0YXJ0T2ZFZGl0YWJsZUNvbnRlbnQodmlzaWJsZVN0
YXJ0KSA9PSB2aXNpYmxlU3RhcnQ7CiAgICAgYm9vbCBwcmV2aW91c1Bvc2l0aW9uSXNCbGFua1Bh
cmFncmFwaCA9IGlzQmxhbmtQYXJhZ3JhcGgodmlzaWJsZVN0YXJ0KTsKICAgICBib29sIGVuZFBv
c2l0b25Jc0JsYW5rUGFyYWdyYXBoID0gaXNCbGFua1BhcmFncmFwaCh2aXNpYmxlRW5kKTsKICAg
ICBib29sIGhhc0JsYW5rUGFyYWdyYXBoQWZ0ZXJFbmRPcklzRW5kT2ZDb250ZW50ID0gIXNlbGVj
dGlvbkVuZElzRW5kT2ZDb250ZW50ICYmIChlbmRQb3NpdG9uSXNCbGFua1BhcmFncmFwaCB8fCBz
ZWxlY3Rpb25FbmRzSW5QYXJhZ3JhcGhTZXBlcmF0b3IpOwpAQCAtMjAzLDggKzIwNCwxMiBAQCB2
b2lkIERlbGV0ZVNlbGVjdGlvbkNvbW1hbmQ6OnNtYXJ0RGVsZXRlUGFyYWdyYXBoU3BhY2Vycygp
CiAgICAgfQogICAgIGlmIChzdGFydEFuZEVuZEluU2FtZVVuc3BsaXR0YWJsZUVsZW1lbnQgJiYg
c2VsZWN0aW9uRW5kSXNFbmRPZkNvbnRlbnQgJiYgcHJldmlvdXNQb3NpdGlvbklzQmxhbmtQYXJh
Z3JhcGggJiYgc2VsZWN0aW9uRW5kc0luUGFyYWdyYXBoU2VwZXJhdG9yKSB7CiAgICAgICAgIG1f
bmVlZFBsYWNlaG9sZGVyID0gZmFsc2U7Ci0gICAgICAgIFZpc2libGVQb3NpdGlvbiBlbmRPZlBh
cmFncmFwaEJlZm9yZVN0YXJ0ID0gZW5kT2ZQYXJhZ3JhcGgoVmlzaWJsZVBvc2l0aW9uIHsgbV91
cHN0cmVhbVN0YXJ0IH0ucHJldmlvdXMoKS5wcmV2aW91cygpKTsKLSAgICAgICAgUG9zaXRpb24g
cG9zaXRpb24gPSBlbmRPZlBhcmFncmFwaEJlZm9yZVN0YXJ0LmRlZXBFcXVpdmFsZW50KCk7Cisg
ICAgICAgIFZpc2libGVQb3NpdGlvbiBlbmRPZlBhcmFncmFwaEJlZm9yZVN0YXJ0OworICAgICAg
ICBpZiAocHJldmlvdXNQb3NpdGlvbklzU3RhcnRPZkNvbnRlbnQpCisgICAgICAgICAgICBlbmRP
ZlBhcmFncmFwaEJlZm9yZVN0YXJ0ID0gZW5kT2ZQYXJhZ3JhcGgoVmlzaWJsZVBvc2l0aW9uIHsg
bV91cHN0cmVhbVN0YXJ0IH0ucHJldmlvdXMoKSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAg
IGVuZE9mUGFyYWdyYXBoQmVmb3JlU3RhcnQgPSBlbmRPZlBhcmFncmFwaChWaXNpYmxlUG9zaXRp
b24geyBtX3Vwc3RyZWFtU3RhcnQgfS5wcmV2aW91cygpLnByZXZpb3VzKCkpOworICAgICAgICBh
dXRvIHBvc2l0aW9uID0gZW5kT2ZQYXJhZ3JhcGhCZWZvcmVTdGFydC5kZWVwRXF1aXZhbGVudCgp
OwogICAgICAgICBtX3Vwc3RyZWFtU3RhcnQgPSBwb3NpdGlvbi51cHN0cmVhbSgpOwogICAgICAg
ICBtX2Rvd25zdHJlYW1TdGFydCA9IHBvc2l0aW9uLmRvd25zdHJlYW0oKTsKICAgICAgICAgbV9s
ZWFkaW5nV2hpdGVzcGFjZSA9IG1fdXBzdHJlYW1TdGFydC5sZWFkaW5nV2hpdGVzcGFjZVBvc2l0
aW9uKERPV05TVFJFQU0pOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5
b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDE1YzMyZDUyYjE2M2QwYTJkNmIxZmYzYzI4NGI1NGMz
MGI2NTU0M2QuLmUyM2RiMjgwODc1M2VkMGJkNTM2NTQ2YjQ1ZjRkMjdiOTBkY2U1MmIgMTAwNjQ0
Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK
QEAgLTEsMyArMSwxMyBAQAorMjAyMC0wNi0yMyAgTWVnYW4gR2FyZG5lciAgPG1lZ2FuX2dhcmRu
ZXJAYXBwbGUuY29tPgorCisgICAgICAgIENhbm5vdCBkZWxldGUgbGFzdCBsaW5lIG9mIE1haWwg
TWVzc2FnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
MjEzNTM2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82MzQyMDkyOD4KKworICAgICAgICBSZXZp
ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGVkaXRpbmcvZGVsZXRpbmcvc21h
cnQtZGVsZXRlLXBhcmFncmFwaC0wMDUuaHRtbDoKKwogMjAyMC0wNi0xOSAgRGllZ28gUGlubyBH
YXJjaWEgIDxkcGlub0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHTElCXSBVbnJldmlld2VkIHRl
c3QgZ2FyZGVuaW5nLiBVcGRhdGUgdGVzdCBleHBlY3RhdGlvbnMgYWZ0ZXIgcjI2MzI2OC4KZGlm
ZiAtLWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFn
cmFwaC0wMDUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9zbWFy
dC1kZWxldGUtcGFyYWdyYXBoLTAwNS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQK
aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYTIzZDg3OTlm
Zjg3MGMzNGI3OWUxNTMyZmU0YzMxNTlkMjRjYjkwYwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91
dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUtZXhwZWN0
ZWQudHh0CkBAIC0wLDAgKzEsMTYgQEAKK0VESVRJTkcgREVMRUdBVEU6IHNob3VsZEJlZ2luRWRp
dGluZ0luRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mIERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3Vt
ZW50IHRvIDIgb2YgRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQKK0VESVRJTkcgREVMRUdB
VEU6IHdlYlZpZXdEaWRCZWdpbkVkaXRpbmc6V2ViVmlld0RpZEJlZ2luRWRpdGluZ05vdGlmaWNh
dGlvbgorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3
RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRFOiBzaG91bGRD
aGFuZ2VTZWxlY3RlZERPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiBESVYgPiBESVYgPiBCT0RZID4g
SFRNTCA+ICNkb2N1bWVudCB0byAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3Vt
ZW50IHRvRE9NUmFuZ2U6cmFuZ2UgZnJvbSAxIG9mICN0ZXh0ID4gRElWID4gRElWID4gQk9EWSA+
IEhUTUwgPiAjZG9jdW1lbnQgdG8gMSBvZiAjdGV4dCA+IERJViA+IERJViA+IEJPRFkgPiBIVE1M
ID4gI2RvY3VtZW50IGFmZmluaXR5Ok5TU2VsZWN0aW9uQWZmaW5pdHlEb3duc3RyZWFtIHN0aWxs
U2VsZWN0aW5nOkZBTFNFCitFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0
aW9uOldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRpb24KK0VESVRJTkcgREVMRUdB
VEU6IHNob3VsZENoYW5nZVNlbGVjdGVkRE9NUmFuZ2U6cmFuZ2UgZnJvbSAxIG9mICN0ZXh0ID4g
RElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gMSBvZiAjdGV4dCA+IERJViA+
IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvRE9NUmFuZ2U6cmFuZ2UgZnJvbSAxIG9m
ICN0ZXh0ID4gRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gMSBvZiAjdGV4
dCA+IERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IGFmZmluaXR5Ok5TU2VsZWN0
aW9uQWZmaW5pdHlEb3duc3RyZWFtIHN0aWxsU2VsZWN0aW5nOkZBTFNFCitFRElUSU5HIERFTEVH
QVRFOiBzaG91bGRDaGFuZ2VTZWxlY3RlZERPTVJhbmdlOnJhbmdlIGZyb20gMSBvZiAjdGV4dCA+
IERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDEgb2YgI3RleHQgPiBESVYg
PiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0b0RPTVJhbmdlOnJhbmdlIGZyb20gMCBv
ZiAjdGV4dCA+IERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDEgb2YgI3Rl
eHQgPiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCBhZmZpbml0eTpOU1NlbGVj
dGlvbkFmZmluaXR5RG93bnN0cmVhbSBzdGlsbFNlbGVjdGluZzpGQUxTRQorRURJVElORyBERUxF
R0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9u
Tm90aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRFOiBzaG91bGREZWxldGVET01SYW5nZTpyYW5n
ZSBmcm9tIDAgb2YgI3RleHQgPiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0
byAxIG9mICN0ZXh0ID4gRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQKK0VESVRJ
TkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNl
bGVjdGlvbk5vdGlmaWNhdGlvbgorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZTpX
ZWJWaWV3RGlkQ2hhbmdlTm90aWZpY2F0aW9uCitUZXN0czogCitTbWFydCBkZWxldGUgd2hlbiBk
ZWxldGluZyBhIGxpbmUgd2l0aCBvbmx5IGEgYmxhbmsgbGluZSBhYm92ZSBpdC4gVGVzdCBtdXN0
IGV4aXN0IGF0IHRoZSB0b3Agb2YgdGhlIGZpbGUgaW4gb3JkZXIgdG8gY29ycmVjdGx5IHRlc3Qg
dGhlIG9yaWdpbmFsIGJ1Zy4KK0V4cGVjdGVkIFJlc3VsdHM6IAorRXZlcnl0aGluZyBzaG91bGQg
YmUgZGVsZXRlZC4KKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9z
bWFydC1kZWxldGUtcGFyYWdyYXBoLTAwNS5odG1sIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxl
dGluZy9zbWFydC1kZWxldGUtcGFyYWdyYXBoLTAwNS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0
CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjBkOWFmYTA5
MDVjMDk5YmY4Y2ZjZWU5ZWVmMGI1MGU1OGFlYTdiYmMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv
dXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL3NtYXJ0LWRlbGV0ZS1wYXJhZ3JhcGgtMDA1Lmh0bWwK
QEAgLTAsMCArMSw1MCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4gCis8aGVhZD4KKzxzdHls
ZT4KKy5lZGl0aW5nIHsgCisgICAgYm9yZGVyOiAycHggc29saWQgcmVkOyAKKyAgICBmb250LXNp
emU6IDI0cHg7IAorfQorLmV4cGxhbmF0aW9uIHsgCisgICAgYm9yZGVyOiAycHggc29saWQgYmx1
ZTsgCisgICAgcGFkZGluZzogMTJweDsgCisgICAgZm9udC1zaXplOiAyNHB4OyAKKyAgICBtYXJn
aW4tYm90dG9tOiAyNHB4OworfQorLnNjZW5hcmlvIHsgbWFyZ2luLWJvdHRvbTogMTZweDt9Cisu
c2NlbmFyaW86Zmlyc3QtbGluZSB7IGZvbnQtd2VpZ2h0OiBib2xkOyBtYXJnaW4tYm90dG9tOiAx
NnB4O30KKy5leHBlY3RlZC1yZXN1bHRzOmZpcnN0LWxpbmUgeyBmb250LXdlaWdodDogYm9sZCB9
Cis8L3N0eWxlPgorPC9oZWFkPiAKKzxib2R5PgorPGRpdiBjb250ZW50ZWRpdGFibGU9InRydWUi
IHN0eWxlPSJ3aWR0aDogMjU2cHg7IGhlaWdodDogMjU2cHg7IGJvcmRlcjogMXB4IHNvbGlkIGJs
YWNrIj48YnI+PGRpdiBpZD0ndGVzdCc+RGVsZXRlTWU8L2Rpdj48L2Rpdj4KKworPGRpdiBjbGFz
cz0iZXhwbGFuYXRpb24iPgorPGRpdiBjbGFzcz0ic2NlbmFyaW8iPgorVGVzdHM6IAorPGJyPgor
U21hcnQgZGVsZXRlIHdoZW4gZGVsZXRpbmcgYSBsaW5lIHdpdGggb25seSBhIGJsYW5rIGxpbmUg
YWJvdmUgaXQuCitUZXN0IG11c3QgZXhpc3QgYXQgdGhlIHRvcCBvZiB0aGUgZmlsZSBpbiBvcmRl
ciB0byBjb3JyZWN0bHkgdGVzdCB0aGUgb3JpZ2luYWwgYnVnLgorPC9kaXY+Cis8ZGl2IGNsYXNz
PSJleHBlY3RlZC1yZXN1bHRzIj4KK0V4cGVjdGVkIFJlc3VsdHM6Cis8YnI+CitFdmVyeXRoaW5n
IHNob3VsZCBiZSBkZWxldGVkLgorPC9kaXY+Cis8L2Rpdj4KKworPHNjcmlwdCBzcmM9Ii4uL2Vk
aXRpbmcuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy91aS1oZWxw
ZXIuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KKworYXN5bmMgZnVuY3Rpb24gZWRpdGluZ1Rlc3Qo
KSB7CisgICAgaW50ZXJuYWxzLnNldHRpbmdzLnNldEVkaXRpbmdCZWhhdmlvcigiaW9zIik7Cisg
ICAgYXdhaXQgVUlIZWxwZXIuc2VsZWN0V29yZEJ5RG91YmxlVGFwT3JDbGljayhkb2N1bWVudC5n
ZXRFbGVtZW50QnlJZCgndGVzdCcpKTsKKyAgICBjdXRDb21tYW5kKCk7Cit9CisKK3J1bkR1bXBB
c1RleHRFZGl0aW5nVGVzdCh0cnVlKTsKKzwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402615</attachid>
            <date>2020-06-23 19:01:06 -0700</date>
            <delta_ts>2020-06-23 22:29:24 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213536-20200623190104.patch</filename>
            <type>text/plain</type>
            <size>8147</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMjkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDYyODAwYjYyNGI4YTFh
OGNlOWYyZTVlNGExN2ZmODE1YjY0MzIwMC4uMDU5NTVjNjIzMDg4ZGZlNGIyZDQ3Zjk3YWM1MzEx
MzUyMjhhYWIyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA2LTIzICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQ2Fubm90IGRl
bGV0ZSBsYXN0IGxpbmUgb2YgTWFpbCBNZXNzYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTM1MzYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYz
NDIwOTI4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
IExheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUu
aHRtbAorCisgICAgICAgIFRoZSBzbWFydCBwYXJhZ3JhcGggZGVsZXRpb24gY29kZSBkaWQgbm90
IHRha2UgaW50byBhY2NvdW50IHRoYXQKKyAgICAgICAgdGhlIHByZXZpb3VzIGJsYW5rIGxpbmUg
Y291bGQgYmUgdGhlIHN0YXJ0IG9mIGVkaXRhYmxlIGNvbnRlbnQgd2l0aG91dAorICAgICAgICBh
IHBhcmFncmFwaCBiZWZvcmUgaXQuIElmIHRoaXMgd2FzIHRoZSBjYXNlLCB0aGUgZGVsZXRpb24g
Y29kZSBiYWNrZWQgdXAKKyAgICAgICAgdG9vIGZhciwgYW5kIHRoZSBkZWxldGUgY29tbWFuZCBm
YWlsZWQuIFRoaXMgY2FzZSBzaG91bGQgYmUgaGFuZGxlZAorICAgICAgICBpbiB0aGUgc2FtZSB3
YXkgdGhhdCB0aGUgZGVsZXRpbmcgdGhlIGxhc3QgcGFyYWdyYXBoIGluIGVkaXRhYmxlIGNvbnRl
bnQgaXMKKyAgICAgICAgaGFuZGxlZCwgYnkgY2hlY2tpbmcgaWYgd2UgYXJlIGFscmVhZHkgYXQg
dGhlIGJlZ2lubmluZyBvZiB0aGUgZWRpdGFibGUKKyAgICAgICAgY29udGVudCB3aGVuIGV4cGFu
ZGluZyB0aGUgc2VsZWN0aW9uIGZvciBzbWFydCBwYXJhZ3JhcGggZGVsZXRpb24uCisKKyAgICAg
ICAgKiBlZGl0aW5nL0RlbGV0ZVNlbGVjdGlvbkNvbW1hbmQuY3BwOgorICAgICAgICAoV2ViQ29y
ZTo6RGVsZXRlU2VsZWN0aW9uQ29tbWFuZDo6c21hcnREZWxldGVQYXJhZ3JhcGhTcGFjZXJzKToK
KwogMjAyMC0wNi0xOSAgQW5kcmVzIEdvbnphbGV6ICA8YW5kcmVzZ18yMkBhcHBsZS5jb20+CiAK
ICAgICAgICAgQVg6IHdlYiBwcm9jZXNzIGNyYXNoIGluIEFYT2JqZWN0Q2FjaGU6OnBvc3ROb3Rp
ZmljYXRpb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0RlbGV0ZVNlbGVj
dGlvbkNvbW1hbmQuY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9EZWxldGVTZWxlY3Rpb25D
b21tYW5kLmNwcAppbmRleCAwMGE1Mjk3NGY4N2E3YjA5OTI0MjE4NzZiMmVkMTk4NGViMmJiN2Zj
Li5kNWQwYmU2OTJlZjY0YWJkMjMwMmQ4MjM5ZTJmZGY0MTA0YTk4ZGNhIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9lZGl0aW5nL0RlbGV0ZVNlbGVjdGlvbkNvbW1hbmQuY3BwCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL2VkaXRpbmcvRGVsZXRlU2VsZWN0aW9uQ29tbWFuZC5jcHAKQEAgLTE4Niw2
ICsxODYsNyBAQCB2b2lkIERlbGV0ZVNlbGVjdGlvbkNvbW1hbmQ6OnNtYXJ0RGVsZXRlUGFyYWdy
YXBoU3BhY2VycygpCiAgICAgYm9vbCBzdGFydEFuZEVuZEluU2FtZVVuc3BsaXR0YWJsZUVsZW1l
bnQgPSB1bnNwbGl0dGFibGVFbGVtZW50Rm9yUG9zaXRpb24odmlzaWJsZVN0YXJ0LmRlZXBFcXVp
dmFsZW50KCkpID09IHVuc3BsaXR0YWJsZUVsZW1lbnRGb3JQb3NpdGlvbih2aXNpYmxlRW5kLmRl
ZXBFcXVpdmFsZW50KCkpOwogICAgIHZpc2libGVTdGFydCA9IHZpc2libGVTdGFydC5wcmV2aW91
cyhDYW5ub3RDcm9zc0VkaXRpbmdCb3VuZGFyeSk7CiAgICAgdmlzaWJsZUVuZCA9IHZpc2libGVF
bmQubmV4dChDYW5ub3RDcm9zc0VkaXRpbmdCb3VuZGFyeSk7CisgICAgYm9vbCBwcmV2aW91c1Bv
c2l0aW9uSXNTdGFydE9mQ29udGVudCA9IHN0YXJ0T2ZFZGl0YWJsZUNvbnRlbnQodmlzaWJsZVN0
YXJ0KSA9PSB2aXNpYmxlU3RhcnQ7CiAgICAgYm9vbCBwcmV2aW91c1Bvc2l0aW9uSXNCbGFua1Bh
cmFncmFwaCA9IGlzQmxhbmtQYXJhZ3JhcGgodmlzaWJsZVN0YXJ0KTsKICAgICBib29sIGVuZFBv
c2l0b25Jc0JsYW5rUGFyYWdyYXBoID0gaXNCbGFua1BhcmFncmFwaCh2aXNpYmxlRW5kKTsKICAg
ICBib29sIGhhc0JsYW5rUGFyYWdyYXBoQWZ0ZXJFbmRPcklzRW5kT2ZDb250ZW50ID0gIXNlbGVj
dGlvbkVuZElzRW5kT2ZDb250ZW50ICYmIChlbmRQb3NpdG9uSXNCbGFua1BhcmFncmFwaCB8fCBz
ZWxlY3Rpb25FbmRzSW5QYXJhZ3JhcGhTZXBlcmF0b3IpOwpAQCAtMjAzLDggKzIwNCwxMiBAQCB2
b2lkIERlbGV0ZVNlbGVjdGlvbkNvbW1hbmQ6OnNtYXJ0RGVsZXRlUGFyYWdyYXBoU3BhY2Vycygp
CiAgICAgfQogICAgIGlmIChzdGFydEFuZEVuZEluU2FtZVVuc3BsaXR0YWJsZUVsZW1lbnQgJiYg
c2VsZWN0aW9uRW5kSXNFbmRPZkNvbnRlbnQgJiYgcHJldmlvdXNQb3NpdGlvbklzQmxhbmtQYXJh
Z3JhcGggJiYgc2VsZWN0aW9uRW5kc0luUGFyYWdyYXBoU2VwZXJhdG9yKSB7CiAgICAgICAgIG1f
bmVlZFBsYWNlaG9sZGVyID0gZmFsc2U7Ci0gICAgICAgIFZpc2libGVQb3NpdGlvbiBlbmRPZlBh
cmFncmFwaEJlZm9yZVN0YXJ0ID0gZW5kT2ZQYXJhZ3JhcGgoVmlzaWJsZVBvc2l0aW9uIHsgbV91
cHN0cmVhbVN0YXJ0IH0ucHJldmlvdXMoKS5wcmV2aW91cygpKTsKLSAgICAgICAgUG9zaXRpb24g
cG9zaXRpb24gPSBlbmRPZlBhcmFncmFwaEJlZm9yZVN0YXJ0LmRlZXBFcXVpdmFsZW50KCk7Cisg
ICAgICAgIFZpc2libGVQb3NpdGlvbiBlbmRPZlBhcmFncmFwaEJlZm9yZVN0YXJ0OworICAgICAg
ICBpZiAocHJldmlvdXNQb3NpdGlvbklzU3RhcnRPZkNvbnRlbnQpCisgICAgICAgICAgICBlbmRP
ZlBhcmFncmFwaEJlZm9yZVN0YXJ0ID0gZW5kT2ZQYXJhZ3JhcGgoVmlzaWJsZVBvc2l0aW9uIHsg
bV91cHN0cmVhbVN0YXJ0IH0ucHJldmlvdXMoKSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAg
IGVuZE9mUGFyYWdyYXBoQmVmb3JlU3RhcnQgPSBlbmRPZlBhcmFncmFwaChWaXNpYmxlUG9zaXRp
b24geyBtX3Vwc3RyZWFtU3RhcnQgfS5wcmV2aW91cygpLnByZXZpb3VzKCkpOworICAgICAgICBh
dXRvIHBvc2l0aW9uID0gZW5kT2ZQYXJhZ3JhcGhCZWZvcmVTdGFydC5kZWVwRXF1aXZhbGVudCgp
OwogICAgICAgICBtX3Vwc3RyZWFtU3RhcnQgPSBwb3NpdGlvbi51cHN0cmVhbSgpOwogICAgICAg
ICBtX2Rvd25zdHJlYW1TdGFydCA9IHBvc2l0aW9uLmRvd25zdHJlYW0oKTsKICAgICAgICAgbV9s
ZWFkaW5nV2hpdGVzcGFjZSA9IG1fdXBzdHJlYW1TdGFydC5sZWFkaW5nV2hpdGVzcGFjZVBvc2l0
aW9uKERPV05TVFJFQU0pOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5
b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDE1YzMyZDUyYjE2M2QwYTJkNmIxZmYzYzI4NGI1NGMz
MGI2NTU0M2QuLmUyM2RiMjgwODc1M2VkMGJkNTM2NTQ2YjQ1ZjRkMjdiOTBkY2U1MmIgMTAwNjQ0
Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK
QEAgLTEsMyArMSwxMyBAQAorMjAyMC0wNi0yMyAgTWVnYW4gR2FyZG5lciAgPG1lZ2FuX2dhcmRu
ZXJAYXBwbGUuY29tPgorCisgICAgICAgIENhbm5vdCBkZWxldGUgbGFzdCBsaW5lIG9mIE1haWwg
TWVzc2FnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
MjEzNTM2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82MzQyMDkyOD4KKworICAgICAgICBSZXZp
ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGVkaXRpbmcvZGVsZXRpbmcvc21h
cnQtZGVsZXRlLXBhcmFncmFwaC0wMDUuaHRtbDoKKwogMjAyMC0wNi0xOSAgRGllZ28gUGlubyBH
YXJjaWEgIDxkcGlub0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHTElCXSBVbnJldmlld2VkIHRl
c3QgZ2FyZGVuaW5nLiBVcGRhdGUgdGVzdCBleHBlY3RhdGlvbnMgYWZ0ZXIgcjI2MzI2OC4KZGlm
ZiAtLWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFn
cmFwaC0wMDUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9zbWFy
dC1kZWxldGUtcGFyYWdyYXBoLTAwNS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQK
aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYTIzZDg3OTlm
Zjg3MGMzNGI3OWUxNTMyZmU0YzMxNTlkMjRjYjkwYwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91
dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUtZXhwZWN0
ZWQudHh0CkBAIC0wLDAgKzEsMTYgQEAKK0VESVRJTkcgREVMRUdBVEU6IHNob3VsZEJlZ2luRWRp
dGluZ0luRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mIERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3Vt
ZW50IHRvIDIgb2YgRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQKK0VESVRJTkcgREVMRUdB
VEU6IHdlYlZpZXdEaWRCZWdpbkVkaXRpbmc6V2ViVmlld0RpZEJlZ2luRWRpdGluZ05vdGlmaWNh
dGlvbgorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3
RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRFOiBzaG91bGRD
aGFuZ2VTZWxlY3RlZERPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiBESVYgPiBESVYgPiBCT0RZID4g
SFRNTCA+ICNkb2N1bWVudCB0byAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3Vt
ZW50IHRvRE9NUmFuZ2U6cmFuZ2UgZnJvbSAxIG9mICN0ZXh0ID4gRElWID4gRElWID4gQk9EWSA+
IEhUTUwgPiAjZG9jdW1lbnQgdG8gMSBvZiAjdGV4dCA+IERJViA+IERJViA+IEJPRFkgPiBIVE1M
ID4gI2RvY3VtZW50IGFmZmluaXR5Ok5TU2VsZWN0aW9uQWZmaW5pdHlEb3duc3RyZWFtIHN0aWxs
U2VsZWN0aW5nOkZBTFNFCitFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0
aW9uOldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRpb24KK0VESVRJTkcgREVMRUdB
VEU6IHNob3VsZENoYW5nZVNlbGVjdGVkRE9NUmFuZ2U6cmFuZ2UgZnJvbSAxIG9mICN0ZXh0ID4g
RElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gMSBvZiAjdGV4dCA+IERJViA+
IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvRE9NUmFuZ2U6cmFuZ2UgZnJvbSAxIG9m
ICN0ZXh0ID4gRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gMSBvZiAjdGV4
dCA+IERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IGFmZmluaXR5Ok5TU2VsZWN0
aW9uQWZmaW5pdHlEb3duc3RyZWFtIHN0aWxsU2VsZWN0aW5nOkZBTFNFCitFRElUSU5HIERFTEVH
QVRFOiBzaG91bGRDaGFuZ2VTZWxlY3RlZERPTVJhbmdlOnJhbmdlIGZyb20gMSBvZiAjdGV4dCA+
IERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDEgb2YgI3RleHQgPiBESVYg
PiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0b0RPTVJhbmdlOnJhbmdlIGZyb20gMCBv
ZiAjdGV4dCA+IERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDEgb2YgI3Rl
eHQgPiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCBhZmZpbml0eTpOU1NlbGVj
dGlvbkFmZmluaXR5RG93bnN0cmVhbSBzdGlsbFNlbGVjdGluZzpGQUxTRQorRURJVElORyBERUxF
R0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9u
Tm90aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRFOiBzaG91bGREZWxldGVET01SYW5nZTpyYW5n
ZSBmcm9tIDAgb2YgI3RleHQgPiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0
byAxIG9mICN0ZXh0ID4gRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQKK0VESVRJ
TkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNl
bGVjdGlvbk5vdGlmaWNhdGlvbgorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZTpX
ZWJWaWV3RGlkQ2hhbmdlTm90aWZpY2F0aW9uCitUZXN0czogCitTbWFydCBkZWxldGUgd2hlbiBk
ZWxldGluZyBhIGxpbmUgd2l0aCBvbmx5IGEgYmxhbmsgbGluZSBhYm92ZSBpdC4gVGVzdCBtdXN0
IGV4aXN0IGF0IHRoZSB0b3Agb2YgdGhlIGZpbGUgaW4gb3JkZXIgdG8gY29ycmVjdGx5IHRlc3Qg
dGhlIG9yaWdpbmFsIGJ1Zy4KK0V4cGVjdGVkIFJlc3VsdHM6IAorRXZlcnl0aGluZyBzaG91bGQg
YmUgZGVsZXRlZC4KKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9z
bWFydC1kZWxldGUtcGFyYWdyYXBoLTAwNS5odG1sIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxl
dGluZy9zbWFydC1kZWxldGUtcGFyYWdyYXBoLTAwNS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0
CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjBkOWFmYTA5
MDVjMDk5YmY4Y2ZjZWU5ZWVmMGI1MGU1OGFlYTdiYmMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv
dXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL3NtYXJ0LWRlbGV0ZS1wYXJhZ3JhcGgtMDA1Lmh0bWwK
QEAgLTAsMCArMSw1MCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4gCis8aGVhZD4KKzxzdHls
ZT4KKy5lZGl0aW5nIHsgCisgICAgYm9yZGVyOiAycHggc29saWQgcmVkOyAKKyAgICBmb250LXNp
emU6IDI0cHg7IAorfQorLmV4cGxhbmF0aW9uIHsgCisgICAgYm9yZGVyOiAycHggc29saWQgYmx1
ZTsgCisgICAgcGFkZGluZzogMTJweDsgCisgICAgZm9udC1zaXplOiAyNHB4OyAKKyAgICBtYXJn
aW4tYm90dG9tOiAyNHB4OworfQorLnNjZW5hcmlvIHsgbWFyZ2luLWJvdHRvbTogMTZweDt9Cisu
c2NlbmFyaW86Zmlyc3QtbGluZSB7IGZvbnQtd2VpZ2h0OiBib2xkOyBtYXJnaW4tYm90dG9tOiAx
NnB4O30KKy5leHBlY3RlZC1yZXN1bHRzOmZpcnN0LWxpbmUgeyBmb250LXdlaWdodDogYm9sZCB9
Cis8L3N0eWxlPgorPC9oZWFkPiAKKzxib2R5PgorPGRpdiBjb250ZW50ZWRpdGFibGU9InRydWUi
IHN0eWxlPSJ3aWR0aDogMjU2cHg7IGhlaWdodDogMjU2cHg7IGJvcmRlcjogMXB4IHNvbGlkIGJs
YWNrIj48YnI+PGRpdiBpZD0ndGVzdCc+RGVsZXRlTWU8L2Rpdj48L2Rpdj4KKworPGRpdiBjbGFz
cz0iZXhwbGFuYXRpb24iPgorPGRpdiBjbGFzcz0ic2NlbmFyaW8iPgorVGVzdHM6IAorPGJyPgor
U21hcnQgZGVsZXRlIHdoZW4gZGVsZXRpbmcgYSBsaW5lIHdpdGggb25seSBhIGJsYW5rIGxpbmUg
YWJvdmUgaXQuCitUZXN0IG11c3QgZXhpc3QgYXQgdGhlIHRvcCBvZiB0aGUgZmlsZSBpbiBvcmRl
ciB0byBjb3JyZWN0bHkgdGVzdCB0aGUgb3JpZ2luYWwgYnVnLgorPC9kaXY+Cis8ZGl2IGNsYXNz
PSJleHBlY3RlZC1yZXN1bHRzIj4KK0V4cGVjdGVkIFJlc3VsdHM6Cis8YnI+CitFdmVyeXRoaW5n
IHNob3VsZCBiZSBkZWxldGVkLgorPC9kaXY+Cis8L2Rpdj4KKworPHNjcmlwdCBzcmM9Ii4uL2Vk
aXRpbmcuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy91aS1oZWxw
ZXIuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KKworYXN5bmMgZnVuY3Rpb24gZWRpdGluZ1Rlc3Qo
KSB7CisgICAgaW50ZXJuYWxzLnNldHRpbmdzLnNldEVkaXRpbmdCZWhhdmlvcigiaW9zIik7Cisg
ICAgYXdhaXQgVUlIZWxwZXIuc2VsZWN0V29yZEJ5RG91YmxlVGFwT3JDbGljayhkb2N1bWVudC5n
ZXRFbGVtZW50QnlJZCgndGVzdCcpKTsKKyAgICBjdXRDb21tYW5kKCk7Cit9CisKK3J1bkR1bXBB
c1RleHRFZGl0aW5nVGVzdCh0cnVlKTsKKzwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402622</attachid>
            <date>2020-06-23 22:29:26 -0700</date>
            <delta_ts>2020-06-24 11:59:14 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213536-20200623222925.patch</filename>
            <type>text/plain</type>
            <size>7687</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMjkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDYyODAwYjYyNGI4YTFh
OGNlOWYyZTVlNGExN2ZmODE1YjY0MzIwMC4uMDU5NTVjNjIzMDg4ZGZlNGIyZDQ3Zjk3YWM1MzEx
MzUyMjhhYWIyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA2LTIzICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQ2Fubm90IGRl
bGV0ZSBsYXN0IGxpbmUgb2YgTWFpbCBNZXNzYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTM1MzYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYz
NDIwOTI4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
IExheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUu
aHRtbAorCisgICAgICAgIFRoZSBzbWFydCBwYXJhZ3JhcGggZGVsZXRpb24gY29kZSBkaWQgbm90
IHRha2UgaW50byBhY2NvdW50IHRoYXQKKyAgICAgICAgdGhlIHByZXZpb3VzIGJsYW5rIGxpbmUg
Y291bGQgYmUgdGhlIHN0YXJ0IG9mIGVkaXRhYmxlIGNvbnRlbnQgd2l0aG91dAorICAgICAgICBh
IHBhcmFncmFwaCBiZWZvcmUgaXQuIElmIHRoaXMgd2FzIHRoZSBjYXNlLCB0aGUgZGVsZXRpb24g
Y29kZSBiYWNrZWQgdXAKKyAgICAgICAgdG9vIGZhciwgYW5kIHRoZSBkZWxldGUgY29tbWFuZCBm
YWlsZWQuIFRoaXMgY2FzZSBzaG91bGQgYmUgaGFuZGxlZAorICAgICAgICBpbiB0aGUgc2FtZSB3
YXkgdGhhdCB0aGUgZGVsZXRpbmcgdGhlIGxhc3QgcGFyYWdyYXBoIGluIGVkaXRhYmxlIGNvbnRl
bnQgaXMKKyAgICAgICAgaGFuZGxlZCwgYnkgY2hlY2tpbmcgaWYgd2UgYXJlIGFscmVhZHkgYXQg
dGhlIGJlZ2lubmluZyBvZiB0aGUgZWRpdGFibGUKKyAgICAgICAgY29udGVudCB3aGVuIGV4cGFu
ZGluZyB0aGUgc2VsZWN0aW9uIGZvciBzbWFydCBwYXJhZ3JhcGggZGVsZXRpb24uCisKKyAgICAg
ICAgKiBlZGl0aW5nL0RlbGV0ZVNlbGVjdGlvbkNvbW1hbmQuY3BwOgorICAgICAgICAoV2ViQ29y
ZTo6RGVsZXRlU2VsZWN0aW9uQ29tbWFuZDo6c21hcnREZWxldGVQYXJhZ3JhcGhTcGFjZXJzKToK
KwogMjAyMC0wNi0xOSAgQW5kcmVzIEdvbnphbGV6ICA8YW5kcmVzZ18yMkBhcHBsZS5jb20+CiAK
ICAgICAgICAgQVg6IHdlYiBwcm9jZXNzIGNyYXNoIGluIEFYT2JqZWN0Q2FjaGU6OnBvc3ROb3Rp
ZmljYXRpb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0RlbGV0ZVNlbGVj
dGlvbkNvbW1hbmQuY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9EZWxldGVTZWxlY3Rpb25D
b21tYW5kLmNwcAppbmRleCAwMGE1Mjk3NGY4N2E3YjA5OTI0MjE4NzZiMmVkMTk4NGViMmJiN2Zj
Li5kNWQwYmU2OTJlZjY0YWJkMjMwMmQ4MjM5ZTJmZGY0MTA0YTk4ZGNhIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9lZGl0aW5nL0RlbGV0ZVNlbGVjdGlvbkNvbW1hbmQuY3BwCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL2VkaXRpbmcvRGVsZXRlU2VsZWN0aW9uQ29tbWFuZC5jcHAKQEAgLTE4Niw2
ICsxODYsNyBAQCB2b2lkIERlbGV0ZVNlbGVjdGlvbkNvbW1hbmQ6OnNtYXJ0RGVsZXRlUGFyYWdy
YXBoU3BhY2VycygpCiAgICAgYm9vbCBzdGFydEFuZEVuZEluU2FtZVVuc3BsaXR0YWJsZUVsZW1l
bnQgPSB1bnNwbGl0dGFibGVFbGVtZW50Rm9yUG9zaXRpb24odmlzaWJsZVN0YXJ0LmRlZXBFcXVp
dmFsZW50KCkpID09IHVuc3BsaXR0YWJsZUVsZW1lbnRGb3JQb3NpdGlvbih2aXNpYmxlRW5kLmRl
ZXBFcXVpdmFsZW50KCkpOwogICAgIHZpc2libGVTdGFydCA9IHZpc2libGVTdGFydC5wcmV2aW91
cyhDYW5ub3RDcm9zc0VkaXRpbmdCb3VuZGFyeSk7CiAgICAgdmlzaWJsZUVuZCA9IHZpc2libGVF
bmQubmV4dChDYW5ub3RDcm9zc0VkaXRpbmdCb3VuZGFyeSk7CisgICAgYm9vbCBwcmV2aW91c1Bv
c2l0aW9uSXNTdGFydE9mQ29udGVudCA9IHN0YXJ0T2ZFZGl0YWJsZUNvbnRlbnQodmlzaWJsZVN0
YXJ0KSA9PSB2aXNpYmxlU3RhcnQ7CiAgICAgYm9vbCBwcmV2aW91c1Bvc2l0aW9uSXNCbGFua1Bh
cmFncmFwaCA9IGlzQmxhbmtQYXJhZ3JhcGgodmlzaWJsZVN0YXJ0KTsKICAgICBib29sIGVuZFBv
c2l0b25Jc0JsYW5rUGFyYWdyYXBoID0gaXNCbGFua1BhcmFncmFwaCh2aXNpYmxlRW5kKTsKICAg
ICBib29sIGhhc0JsYW5rUGFyYWdyYXBoQWZ0ZXJFbmRPcklzRW5kT2ZDb250ZW50ID0gIXNlbGVj
dGlvbkVuZElzRW5kT2ZDb250ZW50ICYmIChlbmRQb3NpdG9uSXNCbGFua1BhcmFncmFwaCB8fCBz
ZWxlY3Rpb25FbmRzSW5QYXJhZ3JhcGhTZXBlcmF0b3IpOwpAQCAtMjAzLDggKzIwNCwxMiBAQCB2
b2lkIERlbGV0ZVNlbGVjdGlvbkNvbW1hbmQ6OnNtYXJ0RGVsZXRlUGFyYWdyYXBoU3BhY2Vycygp
CiAgICAgfQogICAgIGlmIChzdGFydEFuZEVuZEluU2FtZVVuc3BsaXR0YWJsZUVsZW1lbnQgJiYg
c2VsZWN0aW9uRW5kSXNFbmRPZkNvbnRlbnQgJiYgcHJldmlvdXNQb3NpdGlvbklzQmxhbmtQYXJh
Z3JhcGggJiYgc2VsZWN0aW9uRW5kc0luUGFyYWdyYXBoU2VwZXJhdG9yKSB7CiAgICAgICAgIG1f
bmVlZFBsYWNlaG9sZGVyID0gZmFsc2U7Ci0gICAgICAgIFZpc2libGVQb3NpdGlvbiBlbmRPZlBh
cmFncmFwaEJlZm9yZVN0YXJ0ID0gZW5kT2ZQYXJhZ3JhcGgoVmlzaWJsZVBvc2l0aW9uIHsgbV91
cHN0cmVhbVN0YXJ0IH0ucHJldmlvdXMoKS5wcmV2aW91cygpKTsKLSAgICAgICAgUG9zaXRpb24g
cG9zaXRpb24gPSBlbmRPZlBhcmFncmFwaEJlZm9yZVN0YXJ0LmRlZXBFcXVpdmFsZW50KCk7Cisg
ICAgICAgIFZpc2libGVQb3NpdGlvbiBlbmRPZlBhcmFncmFwaEJlZm9yZVN0YXJ0OworICAgICAg
ICBpZiAocHJldmlvdXNQb3NpdGlvbklzU3RhcnRPZkNvbnRlbnQpCisgICAgICAgICAgICBlbmRP
ZlBhcmFncmFwaEJlZm9yZVN0YXJ0ID0gZW5kT2ZQYXJhZ3JhcGgoVmlzaWJsZVBvc2l0aW9uIHsg
bV91cHN0cmVhbVN0YXJ0IH0ucHJldmlvdXMoKSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAg
IGVuZE9mUGFyYWdyYXBoQmVmb3JlU3RhcnQgPSBlbmRPZlBhcmFncmFwaChWaXNpYmxlUG9zaXRp
b24geyBtX3Vwc3RyZWFtU3RhcnQgfS5wcmV2aW91cygpLnByZXZpb3VzKCkpOworICAgICAgICBh
dXRvIHBvc2l0aW9uID0gZW5kT2ZQYXJhZ3JhcGhCZWZvcmVTdGFydC5kZWVwRXF1aXZhbGVudCgp
OwogICAgICAgICBtX3Vwc3RyZWFtU3RhcnQgPSBwb3NpdGlvbi51cHN0cmVhbSgpOwogICAgICAg
ICBtX2Rvd25zdHJlYW1TdGFydCA9IHBvc2l0aW9uLmRvd25zdHJlYW0oKTsKICAgICAgICAgbV9s
ZWFkaW5nV2hpdGVzcGFjZSA9IG1fdXBzdHJlYW1TdGFydC5sZWFkaW5nV2hpdGVzcGFjZVBvc2l0
aW9uKERPV05TVFJFQU0pOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5
b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDE1YzMyZDUyYjE2M2QwYTJkNmIxZmYzYzI4NGI1NGMz
MGI2NTU0M2QuLmUyM2RiMjgwODc1M2VkMGJkNTM2NTQ2YjQ1ZjRkMjdiOTBkY2U1MmIgMTAwNjQ0
Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK
QEAgLTEsMyArMSwxMyBAQAorMjAyMC0wNi0yMyAgTWVnYW4gR2FyZG5lciAgPG1lZ2FuX2dhcmRu
ZXJAYXBwbGUuY29tPgorCisgICAgICAgIENhbm5vdCBkZWxldGUgbGFzdCBsaW5lIG9mIE1haWwg
TWVzc2FnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
MjEzNTM2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82MzQyMDkyOD4KKworICAgICAgICBSZXZp
ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGVkaXRpbmcvZGVsZXRpbmcvc21h
cnQtZGVsZXRlLXBhcmFncmFwaC0wMDUuaHRtbDoKKwogMjAyMC0wNi0xOSAgRGllZ28gUGlubyBH
YXJjaWEgIDxkcGlub0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHTElCXSBVbnJldmlld2VkIHRl
c3QgZ2FyZGVuaW5nLiBVcGRhdGUgdGVzdCBleHBlY3RhdGlvbnMgYWZ0ZXIgcjI2MzI2OC4KZGlm
ZiAtLWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFn
cmFwaC0wMDUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9zbWFy
dC1kZWxldGUtcGFyYWdyYXBoLTAwNS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQK
aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOTI0MTgxMzYw
NGQ4NzQwZjA5Yzc2OTM0M2NmZTY1MDZlOTE0MDJlZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91
dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUtZXhwZWN0
ZWQudHh0CkBAIC0wLDAgKzEsMTMgQEAKK0VESVRJTkcgREVMRUdBVEU6IHNob3VsZEJlZ2luRWRp
dGluZ0luRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mIERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3Vt
ZW50IHRvIDIgb2YgRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQKK0VESVRJTkcgREVMRUdB
VEU6IHdlYlZpZXdEaWRCZWdpbkVkaXRpbmc6V2ViVmlld0RpZEJlZ2luRWRpdGluZ05vdGlmaWNh
dGlvbgorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3
RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRFOiBzaG91bGRD
aGFuZ2VTZWxlY3RlZERPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiBESVYgPiBESVYgPiBCT0RZID4g
SFRNTCA+ICNkb2N1bWVudCB0byAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3Vt
ZW50IHRvRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4g
I2RvY3VtZW50IHRvIDAgb2YgRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgYWZm
aW5pdHk6TlNTZWxlY3Rpb25BZmZpbml0eURvd25zdHJlYW0gc3RpbGxTZWxlY3Rpbmc6RkFMU0UK
K0VESVRJTkcgREVMRUdBVEU6IHNob3VsZENoYW5nZVNlbGVjdGVkRE9NUmFuZ2U6cmFuZ2UgZnJv
bSAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDAgb2YgRElWID4g
RElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG9ET01SYW5nZTpyYW5nZSBmcm9tIDAgb2Yg
I3RleHQgPiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0byA4IG9mICN0ZXh0
ID4gRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgYWZmaW5pdHk6TlNTZWxlY3Rp
b25BZmZpbml0eURvd25zdHJlYW0gc3RpbGxTZWxlY3Rpbmc6RkFMU0UKK0VESVRJTkcgREVMRUdB
VEU6IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5v
dGlmaWNhdGlvbgorRURJVElORyBERUxFR0FURTogc2hvdWxkRGVsZXRlRE9NUmFuZ2U6cmFuZ2Ug
ZnJvbSAwIG9mICN0ZXh0ID4gRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8g
OCBvZiAjdGV4dCA+IERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50CitFRElUSU5H
IERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uOldlYlZpZXdEaWRDaGFuZ2VTZWxl
Y3Rpb25Ob3RpZmljYXRpb24KK0VESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2U6V2Vi
Vmlld0RpZENoYW5nZU5vdGlmaWNhdGlvbgorVGVzdHM6IAorU21hcnQgZGVsZXRlIHdoZW4gZGVs
ZXRpbmcgYSBsaW5lIHdpdGggb25seSBhIGJsYW5rIGxpbmUgYWJvdmUgaXQuIFRlc3QgbXVzdCBl
eGlzdCBhdCB0aGUgdG9wIG9mIHRoZSBmaWxlIGluIG9yZGVyIHRvIGNvcnJlY3RseSB0ZXN0IHRo
ZSBvcmlnaW5hbCBidWcuCitFeHBlY3RlZCBSZXN1bHRzOiAKK0V2ZXJ5dGhpbmcgc2hvdWxkIGJl
IGRlbGV0ZWQuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL3NtYXJ0
LWRlbGV0ZS1wYXJhZ3JhcGgtMDA1Lmh0bWwgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5n
L3NtYXJ0LWRlbGV0ZS1wYXJhZ3JhcGgtMDA1Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k
ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMGQ5YWZhMDkwNWMw
OTliZjhjZmNlZTllZWYwYjUwZTU4YWVhN2JiYwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl
c3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUuaHRtbApAQCAt
MCwwICsxLDUwIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPiAKKzxoZWFkPgorPHN0eWxlPgor
LmVkaXRpbmcgeyAKKyAgICBib3JkZXI6IDJweCBzb2xpZCByZWQ7IAorICAgIGZvbnQtc2l6ZTog
MjRweDsgCit9CisuZXhwbGFuYXRpb24geyAKKyAgICBib3JkZXI6IDJweCBzb2xpZCBibHVlOyAK
KyAgICBwYWRkaW5nOiAxMnB4OyAKKyAgICBmb250LXNpemU6IDI0cHg7IAorICAgIG1hcmdpbi1i
b3R0b206IDI0cHg7Cit9Cisuc2NlbmFyaW8geyBtYXJnaW4tYm90dG9tOiAxNnB4O30KKy5zY2Vu
YXJpbzpmaXJzdC1saW5lIHsgZm9udC13ZWlnaHQ6IGJvbGQ7IG1hcmdpbi1ib3R0b206IDE2cHg7
fQorLmV4cGVjdGVkLXJlc3VsdHM6Zmlyc3QtbGluZSB7IGZvbnQtd2VpZ2h0OiBib2xkIH0KKzwv
c3R5bGU+Cis8L2hlYWQ+IAorPGJvZHk+Cis8ZGl2IGNvbnRlbnRlZGl0YWJsZT0idHJ1ZSIgc3R5
bGU9IndpZHRoOiAyNTZweDsgaGVpZ2h0OiAyNTZweDsgYm9yZGVyOiAxcHggc29saWQgYmxhY2si
Pjxicj48ZGl2IGlkPSd0ZXN0Jz5EZWxldGVNZTwvZGl2PjwvZGl2PgorCis8ZGl2IGNsYXNzPSJl
eHBsYW5hdGlvbiI+Cis8ZGl2IGNsYXNzPSJzY2VuYXJpbyI+CitUZXN0czogCis8YnI+CitTbWFy
dCBkZWxldGUgd2hlbiBkZWxldGluZyBhIGxpbmUgd2l0aCBvbmx5IGEgYmxhbmsgbGluZSBhYm92
ZSBpdC4KK1Rlc3QgbXVzdCBleGlzdCBhdCB0aGUgdG9wIG9mIHRoZSBmaWxlIGluIG9yZGVyIHRv
IGNvcnJlY3RseSB0ZXN0IHRoZSBvcmlnaW5hbCBidWcuCis8L2Rpdj4KKzxkaXYgY2xhc3M9ImV4
cGVjdGVkLXJlc3VsdHMiPgorRXhwZWN0ZWQgUmVzdWx0czoKKzxicj4KK0V2ZXJ5dGhpbmcgc2hv
dWxkIGJlIGRlbGV0ZWQuCis8L2Rpdj4KKzwvZGl2PgorCis8c2NyaXB0IHNyYz0iLi4vZWRpdGlu
Zy5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL3VpLWhlbHBlci5q
cyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorCithc3luYyBmdW5jdGlvbiBlZGl0aW5nVGVzdCgpIHsK
KyAgICBpbnRlcm5hbHMuc2V0dGluZ3Muc2V0RWRpdGluZ0JlaGF2aW9yKCJpb3MiKTsKKyAgICBh
d2FpdCBVSUhlbHBlci5zZWxlY3RXb3JkQnlEb3VibGVUYXBPckNsaWNrKGRvY3VtZW50LmdldEVs
ZW1lbnRCeUlkKCd0ZXN0JykpOworICAgIGN1dENvbW1hbmQoKTsKK30KKworcnVuRHVtcEFzVGV4
dEVkaXRpbmdUZXN0KHRydWUpOworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402667</attachid>
            <date>2020-06-24 11:59:15 -0700</date>
            <delta_ts>2020-06-24 12:00:07 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213536-20200624115915.patch</filename>
            <type>text/plain</type>
            <size>11408</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNDM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzAwZTQ4OTlkMmVmOWM4
YTViOTNhYjEzNmMyMTJmY2UzZThkNGI3Yy4uZDdlYjdiOWIyODA4NzhjM2UzNDM0NDRkZmVmOTFj
OWI5MzRhNTU3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTA2LTI0ICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQ2Fubm90IGRl
bGV0ZSBsYXN0IGxpbmUgb2YgTWFpbCBNZXNzYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTM1MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP
RFkgKE9PUFMhKS4KKworICAgICAgICBMYXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL3NtYXJ0
LWRlbGV0ZS1wYXJhZ3JhcGgtMDA1Lmh0bWwKKworICAgICAgICBUaGUgc21hcnQgcGFyYWdyYXBo
IGRlbGV0aW9uIGNvZGUgZGlkIG5vdCB0YWtlIGludG8gYWNjb3VudCB0aGF0CisgICAgICAgIHRo
ZSBwcmV2aW91cyBibGFuayBsaW5lIGNvdWxkIGJlIHRoZSBzdGFydCBvZiBlZGl0YWJsZSBjb250
ZW50IHdpdGhvdXQKKyAgICAgICAgYSBwYXJhZ3JhcGggYmVmb3JlIGl0LiBJZiB0aGlzIHdhcyB0
aGUgY2FzZSwgdGhlIGRlbGV0aW9uIGNvZGUgYmFja2VkIHVwCisgICAgICAgIHRvbyBmYXIsIGFu
ZCB0aGUgZGVsZXRlIGNvbW1hbmQgZmFpbGVkLiBUaGlzIGNhc2Ugc2hvdWxkIGJlIGhhbmRsZWQK
KyAgICAgICAgaW4gdGhlIHNhbWUgd2F5IHRoYXQgdGhlIGRlbGV0aW5nIHRoZSBsYXN0IHBhcmFn
cmFwaCBpbiBlZGl0YWJsZSBjb250ZW50IGlzCisgICAgICAgIGhhbmRsZWQsIGJ5IGNoZWNraW5n
IGlmIHdlIGFyZSBhbHJlYWR5IGF0IHRoZSBiZWdpbm5pbmcgb2YgdGhlIGVkaXRhYmxlCisgICAg
ICAgIGNvbnRlbnQgd2hlbiBleHBhbmRpbmcgdGhlIHNlbGVjdGlvbiBmb3Igc21hcnQgcGFyYWdy
YXBoIGRlbGV0aW9uLgorCisgICAgICAgICogZWRpdGluZy9EZWxldGVTZWxlY3Rpb25Db21tYW5k
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRlbGV0ZVNlbGVjdGlvbkNvbW1hbmQ6OnNtYXJ0RGVs
ZXRlUGFyYWdyYXBoU3BhY2Vycyk6CisKIDIwMjAtMDYtMDEgIFNpbW9uIEZyYXNlciAgPHNpbW9u
LmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIEVOQUJMRShXSEVFTF9FVkVOVF9SRUdJ
T05TKSwgZW5hYmxlZCBvbiBtYWNPUyB3aGljaCBpcyB0aGUgb25seSBwbGF0Zm9ybSB0aGF0IG5l
ZWRzIHdoZWVsIGV2ZW50IHJlZ2lvbnMgZm9yIHNjcm9sbGluZyB0aHJlYWQgaGl0LXRlc3RpbmcK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRGVsZXRlU2VsZWN0aW9uQ29tbWFu
ZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0RlbGV0ZVNlbGVjdGlvbkNvbW1hbmQuY3Bw
CmluZGV4IGI0YWU4YmU1NmM3MWRkMGJiZjY3ZTAyNThiNjkzYTE0MDJkOGYwM2UuLjAzNmQzNGQ5
OWRiZDFhNjFiZDEyZWRiN2UwMTUxMjA2YjVjMTNkMjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL2VkaXRpbmcvRGVsZXRlU2VsZWN0aW9uQ29tbWFuZC5jcHAKKysrIGIvU291cmNlL1dlYkNv
cmUvZWRpdGluZy9EZWxldGVTZWxlY3Rpb25Db21tYW5kLmNwcApAQCAtMTg2LDE2ICsxODYsMTgg
QEAgdm9pZCBEZWxldGVTZWxlY3Rpb25Db21tYW5kOjpzbWFydERlbGV0ZVBhcmFncmFwaFNwYWNl
cnMoKQogICAgIGJvb2wgc3RhcnRBbmRFbmRJblNhbWVVbnNwbGl0dGFibGVFbGVtZW50ID0gdW5z
cGxpdHRhYmxlRWxlbWVudEZvclBvc2l0aW9uKHZpc2libGVTdGFydC5kZWVwRXF1aXZhbGVudCgp
KSA9PSB1bnNwbGl0dGFibGVFbGVtZW50Rm9yUG9zaXRpb24odmlzaWJsZUVuZC5kZWVwRXF1aXZh
bGVudCgpKTsKICAgICB2aXNpYmxlU3RhcnQgPSB2aXNpYmxlU3RhcnQucHJldmlvdXMoQ2Fubm90
Q3Jvc3NFZGl0aW5nQm91bmRhcnkpOwogICAgIHZpc2libGVFbmQgPSB2aXNpYmxlRW5kLm5leHQo
Q2Fubm90Q3Jvc3NFZGl0aW5nQm91bmRhcnkpOworICAgIGJvb2wgcHJldmlvdXNQb3NpdGlvbklz
U3RhcnRPZkNvbnRlbnQgPSBzdGFydE9mRWRpdGFibGVDb250ZW50KHZpc2libGVTdGFydCkgPT0g
dmlzaWJsZVN0YXJ0OwogICAgIGJvb2wgcHJldmlvdXNQb3NpdGlvbklzQmxhbmtQYXJhZ3JhcGgg
PSBpc0JsYW5rUGFyYWdyYXBoKHZpc2libGVTdGFydCk7CiAgICAgYm9vbCBlbmRQb3NpdG9uSXNC
bGFua1BhcmFncmFwaCA9IGlzQmxhbmtQYXJhZ3JhcGgodmlzaWJsZUVuZCk7CiAgICAgYm9vbCBo
YXNCbGFua1BhcmFncmFwaEFmdGVyRW5kT3JJc0VuZE9mQ29udGVudCA9ICFzZWxlY3Rpb25FbmRJ
c0VuZE9mQ29udGVudCAmJiAoZW5kUG9zaXRvbklzQmxhbmtQYXJhZ3JhcGggfHwgc2VsZWN0aW9u
RW5kc0luUGFyYWdyYXBoU2VwZXJhdG9yKTsKICAgICBpZiAoc3RhcnRBbmRFbmRJblNhbWVVbnNw
bGl0dGFibGVFbGVtZW50ICYmIHByZXZpb3VzUG9zaXRpb25Jc0JsYW5rUGFyYWdyYXBoICYmIGhh
c0JsYW5rUGFyYWdyYXBoQWZ0ZXJFbmRPcklzRW5kT2ZDb250ZW50KSB7CiAgICAgICAgIG1fbmVl
ZFBsYWNlaG9sZGVyID0gZmFsc2U7Ci0gICAgICAgIFBvc2l0aW9uIHBvc2l0aW9uOwotICAgICAg
ICBpZiAoZW5kUG9zaXRvbklzQmxhbmtQYXJhZ3JhcGgpCi0gICAgICAgICAgICBwb3NpdGlvbiA9
IHN0YXJ0T2ZOZXh0UGFyYWdyYXBoKHN0YXJ0T2ZOZXh0UGFyYWdyYXBoKG1fZG93bnN0cmVhbUVu
ZCkpLmRlZXBFcXVpdmFsZW50KCk7CisgICAgICAgIFZpc2libGVQb3NpdGlvbiBlbmRPZlBhcmFn
cmFwaEJlZm9yZVN0YXJ0OworICAgICAgICBpZiAocHJldmlvdXNQb3NpdGlvbklzU3RhcnRPZkNv
bnRlbnQpCisgICAgICAgICAgICBlbmRPZlBhcmFncmFwaEJlZm9yZVN0YXJ0ID0gZW5kT2ZQYXJh
Z3JhcGgoVmlzaWJsZVBvc2l0aW9uIHsgbV91cHN0cmVhbVN0YXJ0IH0ucHJldmlvdXMoKSk7CiAg
ICAgICAgIGVsc2UKLSAgICAgICAgICAgIHBvc2l0aW9uID0gVmlzaWJsZVBvc2l0aW9uKG1fZG93
bnN0cmVhbUVuZCkubmV4dCgpLmRlZXBFcXVpdmFsZW50KCk7CisgICAgICAgICAgICBlbmRPZlBh
cmFncmFwaEJlZm9yZVN0YXJ0ID0gZW5kT2ZQYXJhZ3JhcGgoVmlzaWJsZVBvc2l0aW9uIHsgbV91
cHN0cmVhbVN0YXJ0IH0ucHJldmlvdXMoKS5wcmV2aW91cygpKTsKKyAgICAgICAgYXV0byBwb3Np
dGlvbiA9IGVuZE9mUGFyYWdyYXBoQmVmb3JlU3RhcnQuZGVlcEVxdWl2YWxlbnQoKTsKICAgICAg
ICAgbV91cHN0cmVhbUVuZCA9IHBvc2l0aW9uLnVwc3RyZWFtKCk7CiAgICAgICAgIG1fZG93bnN0
cmVhbUVuZCA9IHBvc2l0aW9uLmRvd25zdHJlYW0oKTsKICAgICAgICAgbV90cmFpbGluZ1doaXRl
c3BhY2UgPSBtX2Rvd25zdHJlYW1FbmQudHJhaWxpbmdXaGl0ZXNwYWNlUG9zaXRpb24oVlBfREVG
QVVMVF9BRkZJTklUWSk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlv
dXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNDIyYmE3ZmU2Nzc2M2NhYzNmMzY3NTQ3NDY2NzhiZGNi
ZTVkZDNkNC4uMWYzOTY3MWYyNjdmZWQ0NDI0MTY1ZTkxYTNkNmE0ZGM1MzNlM2RiYSAxMDA2NDQK
LS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpA
QCAtMSwzICsxLDEzIEBACisyMDIwLTA2LTI0ICBNZWdhbiBHYXJkbmVyICA8bWVnYW5fZ2FyZG5l
ckBhcHBsZS5jb20+CisKKyAgICAgICAgQ2Fubm90IGRlbGV0ZSBsYXN0IGxpbmUgb2YgTWFpbCBN
ZXNzYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y
MTM1MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq
IGVkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUtZXhwZWN0ZWQudHh0
OiBBZGRlZC4KKyAgICAgICAgKiBlZGl0aW5nL2RlbGV0aW5nL3NtYXJ0LWRlbGV0ZS1wYXJhZ3Jh
cGgtMDA1Lmh0bWw6IEFkZGVkLgorCiAyMDIwLTA2LTAyICBKYWNvYiBVcGhvZmYgIDxqYWNvYl91
cGhvZmZAYXBwbGUuY29tPgogCiAgICAgICAgIExhbmRpbmcgZXhwZWN0YXRpb25zIGZvciB0ZXN0
cyB0aGF0IHdlcmUgcmVjZW50bHkgaW1wb3J0ZWQgYnV0IGRpZCBub3QgaGF2ZSB0aGVtCmRpZmYg
LS1naXQgYS9MYXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL3NtYXJ0LWRlbGV0ZS1wYXJhZ3Jh
cGgtMDA1LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQt
ZGVsZXRlLXBhcmFncmFwaC0wMDUtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu
ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjBmNjJkYTMzZjE2
NjFiMWQ3N2VhYTRiZTZlOGRlMTAyMTkyOTJjOTUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRU
ZXN0cy9lZGl0aW5nL2RlbGV0aW5nL3NtYXJ0LWRlbGV0ZS1wYXJhZ3JhcGgtMDA1LWV4cGVjdGVk
LnR4dApAQCAtMCwwICsxLDEyIEBACitFRElUSU5HIERFTEVHQVRFOiBzaG91bGRCZWdpbkVkaXRp
bmdJbkRPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVu
dCB0byAyIG9mIERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50CitFRElUSU5HIERFTEVHQVRF
OiB3ZWJWaWV3RGlkQmVnaW5FZGl0aW5nOldlYlZpZXdEaWRCZWdpbkVkaXRpbmdOb3RpZmljYXRp
b24KK0VESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246V2ViVmlld0Rp
ZENoYW5nZVNlbGVjdGlvbk5vdGlmaWNhdGlvbgorRURJVElORyBERUxFR0FURTogc2hvdWxkQ2hh
bmdlU2VsZWN0ZWRET01SYW5nZTpyYW5nZSBmcm9tIDAgb2YgRElWID4gRElWID4gQk9EWSA+IEhU
TUwgPiAjZG9jdW1lbnQgdG8gMCBvZiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVu
dCB0b0RPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiAjdGV4dCA+IERJViA+IERJViA+IEJPRFkgPiBI
VE1MID4gI2RvY3VtZW50IHRvIDggb2YgI3RleHQgPiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+
ICNkb2N1bWVudCBhZmZpbml0eTpOU1NlbGVjdGlvbkFmZmluaXR5RG93bnN0cmVhbSBzdGlsbFNl
bGVjdGluZzpGQUxTRQorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlv
bjpXZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRF
OiBzaG91bGREZWxldGVET01SYW5nZTpyYW5nZSBmcm9tIDAgb2YgI3RleHQgPiBESVYgPiBESVYg
PiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0byA4IG9mICN0ZXh0ID4gRElWID4gRElWID4gQk9E
WSA+IEhUTUwgPiAjZG9jdW1lbnQKK0VESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2VT
ZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5vdGlmaWNhdGlvbgorRURJVElORyBE
RUxFR0FURTogd2ViVmlld0RpZENoYW5nZTpXZWJWaWV3RGlkQ2hhbmdlTm90aWZpY2F0aW9uCitU
ZXN0czogCitTbWFydCBkZWxldGUgd2hlbiBkZWxldGluZyBhIGxpbmUgd2l0aCBvbmx5IGEgYmxh
bmsgbGluZSBhYm92ZSBpdC4gVGVzdCBtdXN0IGV4aXN0IGF0IHRoZSB0b3Agb2YgdGhlIGZpbGUg
aW4gb3JkZXIgdG8gY29ycmVjdGx5IHRlc3QgdGhlIG9yaWdpbmFsIGJ1Zy4KK0V4cGVjdGVkIFJl
c3VsdHM6IAorRXZlcnl0aGluZyBzaG91bGQgYmUgZGVsZXRlZC4KZGlmZiAtLWdpdCBhL0xheW91
dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUuaHRtbCBi
L0xheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUu
aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwLi4xMTlhNTYzZGQxMzA4M2E3OTY5MWFjZTQxZTgyOTAzZjg0OWY3ODQx
Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9zbWFydC1k
ZWxldGUtcGFyYWdyYXBoLTAwNS5odG1sCkBAIC0wLDAgKzEsNTAgQEAKKzwhRE9DVFlQRSBodG1s
PgorPGh0bWw+IAorPGhlYWQ+Cis8c3R5bGU+CisuZWRpdGluZyB7IAorICAgIGJvcmRlcjogMnB4
IHNvbGlkIHJlZDsgCisgICAgZm9udC1zaXplOiAyNHB4OyAKK30KKy5leHBsYW5hdGlvbiB7IAor
ICAgIGJvcmRlcjogMnB4IHNvbGlkIGJsdWU7IAorICAgIHBhZGRpbmc6IDEycHg7IAorICAgIGZv
bnQtc2l6ZTogMjRweDsgCisgICAgbWFyZ2luLWJvdHRvbTogMjRweDsKK30KKy5zY2VuYXJpbyB7
IG1hcmdpbi1ib3R0b206IDE2cHg7fQorLnNjZW5hcmlvOmZpcnN0LWxpbmUgeyBmb250LXdlaWdo
dDogYm9sZDsgbWFyZ2luLWJvdHRvbTogMTZweDt9CisuZXhwZWN0ZWQtcmVzdWx0czpmaXJzdC1s
aW5lIHsgZm9udC13ZWlnaHQ6IGJvbGQgfQorPC9zdHlsZT4KKzwvaGVhZD4gCis8Ym9keT4KKzxk
aXYgY29udGVudGVkaXRhYmxlPSJ0cnVlIiBzdHlsZT0id2lkdGg6IDI1NnB4OyBoZWlnaHQ6IDI1
NnB4OyBib3JkZXI6IDFweCBzb2xpZCBibGFjayI+PGJyPjxkaXYgaWQ9J3Rlc3QnPkRlbGV0ZU1l
PC9kaXY+PC9kaXY+CisKKzxkaXYgY2xhc3M9ImV4cGxhbmF0aW9uIj4KKzxkaXYgY2xhc3M9InNj
ZW5hcmlvIj4KK1Rlc3RzOiAKKzxicj4KK1NtYXJ0IGRlbGV0ZSB3aGVuIGRlbGV0aW5nIGEgbGlu
ZSB3aXRoIG9ubHkgYSBibGFuayBsaW5lIGFib3ZlIGl0LgorVGVzdCBtdXN0IGV4aXN0IGF0IHRo
ZSB0b3Agb2YgdGhlIGZpbGUgaW4gb3JkZXIgdG8gY29ycmVjdGx5IHRlc3QgdGhlIG9yaWdpbmFs
IGJ1Zy4KKzwvZGl2PgorPGRpdiBjbGFzcz0iZXhwZWN0ZWQtcmVzdWx0cyI+CitFeHBlY3RlZCBS
ZXN1bHRzOgorPGJyPgorRXZlcnl0aGluZyBzaG91bGQgYmUgZGVsZXRlZC4KKzwvZGl2PgorPC9k
aXY+CisKKzxzY3JpcHQgc3JjPSIuLi9lZGl0aW5nLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3Jj
PSIuLi8uLi9yZXNvdXJjZXMvdWktaGVscGVyLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+CisKK2Fz
eW5jIGZ1bmN0aW9uIGVkaXRpbmdUZXN0KCkgeworICAgIGludGVybmFscy5zZXR0aW5ncy5zZXRF
ZGl0aW5nQmVoYXZpb3IoImlvcyIpOworICAgIGF3YWl0IFVJSGVscGVyLnNlbGVjdFdvcmRCeURv
dWJsZVRhcE9yQ2xpY2soZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3QnKSk7CisgICAgY3V0
Q29tbWFuZCgpOworfQorCitydW5EdW1wQXNUZXh0RWRpdGluZ1Rlc3QodHJ1ZSk7Cis8L3Njcmlw
dD4KKzwvYm9keT4KKzwvaHRtbD4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1n
aXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvZWRpdGluZy9kZWxldGluZy9zbWFydC1kZWxl
dGUtcGFyYWdyYXBoLTAwNS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mv
ZWRpdGluZy9kZWxldGluZy9zbWFydC1kZWxldGUtcGFyYWdyYXBoLTAwNS1leHBlY3RlZC50eHQK
bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMC4uOTI0MTgxMzYwNGQ4NzQwZjA5Yzc2OTM0M2NmZTY1MDZlOTE0MDJlZgotLS0g
L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9lZGl0aW5nL2RlbGV0aW5n
L3NtYXJ0LWRlbGV0ZS1wYXJhZ3JhcGgtMDA1LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDEzIEBA
CitFRElUSU5HIERFTEVHQVRFOiBzaG91bGRCZWdpbkVkaXRpbmdJbkRPTVJhbmdlOnJhbmdlIGZy
b20gMCBvZiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0byAyIG9mIERJViA+IEJPRFkg
PiBIVE1MID4gI2RvY3VtZW50CitFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQmVnaW5FZGl0
aW5nOldlYlZpZXdEaWRCZWdpbkVkaXRpbmdOb3RpZmljYXRpb24KK0VESVRJTkcgREVMRUdBVEU6
IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5vdGlm
aWNhdGlvbgorRURJVElORyBERUxFR0FURTogc2hvdWxkQ2hhbmdlU2VsZWN0ZWRET01SYW5nZTpy
YW5nZSBmcm9tIDAgb2YgRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gMCBv
ZiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0b0RPTVJhbmdlOnJhbmdlIGZy
b20gMCBvZiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0byAwIG9mIERJViA+
IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IGFmZmluaXR5Ok5TU2VsZWN0aW9uQWZmaW5p
dHlEb3duc3RyZWFtIHN0aWxsU2VsZWN0aW5nOkZBTFNFCitFRElUSU5HIERFTEVHQVRFOiBzaG91
bGRDaGFuZ2VTZWxlY3RlZERPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiBESVYgPiBESVYgPiBCT0RZ
ID4gSFRNTCA+ICNkb2N1bWVudCB0byAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2Rv
Y3VtZW50IHRvRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mICN0ZXh0ID4gRElWID4gRElWID4gQk9E
WSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gOCBvZiAjdGV4dCA+IERJViA+IERJViA+IEJPRFkgPiBI
VE1MID4gI2RvY3VtZW50IGFmZmluaXR5Ok5TU2VsZWN0aW9uQWZmaW5pdHlEb3duc3RyZWFtIHN0
aWxsU2VsZWN0aW5nOkZBTFNFCitFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlU2Vs
ZWN0aW9uOldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRpb24KK0VESVRJTkcgREVM
RUdBVEU6IHNob3VsZERlbGV0ZURPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiAjdGV4dCA+IERJViA+
IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDggb2YgI3RleHQgPiBESVYgPiBESVYg
PiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudAorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENo
YW5nZVNlbGVjdGlvbjpXZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCitFRElU
SU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlOldlYlZpZXdEaWRDaGFuZ2VOb3RpZmljYXRp
b24KK1Rlc3RzOiAKK1NtYXJ0IGRlbGV0ZSB3aGVuIGRlbGV0aW5nIGEgbGluZSB3aXRoIG9ubHkg
YSBibGFuayBsaW5lIGFib3ZlIGl0LiBUZXN0IG11c3QgZXhpc3QgYXQgdGhlIHRvcCBvZiB0aGUg
ZmlsZSBpbiBvcmRlciB0byBjb3JyZWN0bHkgdGVzdCB0aGUgb3JpZ2luYWwgYnVnLgorRXhwZWN0
ZWQgUmVzdWx0czogCitFdmVyeXRoaW5nIHNob3VsZCBiZSBkZWxldGVkLgpkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBh
cmFncmFwaC0wMDUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL2VkaXRp
bmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUtZXhwZWN0ZWQudHh0Cm5ldyBm
aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAuLjQyMTQzMTkwMDc0ZDAzY2ZiY2JmNmVlMDExZjE3ZDg4ZjVjNDQ1OWQKLS0tIC9kZXYv
bnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vZWRpdGluZy9kZWxldGluZy9zbWFy
dC1kZWxldGUtcGFyYWdyYXBoLTAwNS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxNCBAQAorRURJ
VElORyBERUxFR0FURTogc2hvdWxkQmVnaW5FZGl0aW5nSW5ET01SYW5nZTpyYW5nZSBmcm9tIDAg
b2YgRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gMiBvZiBESVYgPiBCT0RZID4gSFRN
TCA+ICNkb2N1bWVudAorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZEJlZ2luRWRpdGluZzpX
ZWJWaWV3RGlkQmVnaW5FZGl0aW5nTm90aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRFOiB3ZWJW
aWV3RGlkQ2hhbmdlU2VsZWN0aW9uOldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRp
b24KK0VESVRJTkcgREVMRUdBVEU6IHNob3VsZENoYW5nZVNlbGVjdGVkRE9NUmFuZ2U6cmFuZ2Ug
ZnJvbSAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDAgb2YgRElW
ID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG9ET01SYW5nZTpyYW5nZSBmcm9tIDAg
b2YgRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gMCBvZiBESVYgPiBESVYg
PiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCBhZmZpbml0eTpOU1NlbGVjdGlvbkFmZmluaXR5RG93
bnN0cmVhbSBzdGlsbFNlbGVjdGluZzpGQUxTRQorRURJVElORyBERUxFR0FURTogd2ViVmlld0Rp
ZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCitF
RElUSU5HIERFTEVHQVRFOiBzaG91bGRDaGFuZ2VTZWxlY3RlZERPTVJhbmdlOnJhbmdlIGZyb20g
MCBvZiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0byAwIG9mIERJViA+IERJ
ViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mICN0
ZXh0ID4gRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gOCBvZiAjdGV4dCA+
IERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IGFmZmluaXR5Ok5TU2VsZWN0aW9u
QWZmaW5pdHlEb3duc3RyZWFtIHN0aWxsU2VsZWN0aW5nOkZBTFNFCitFRElUSU5HIERFTEVHQVRF
OiB3ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uOldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3Rp
ZmljYXRpb24KK0VESVRJTkcgREVMRUdBVEU6IHNob3VsZERlbGV0ZURPTVJhbmdlOnJhbmdlIGZy
b20gMCBvZiAjdGV4dCA+IERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDgg
b2YgI3RleHQgPiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudAorRURJVElORyBE
RUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3RGlkQ2hhbmdlU2VsZWN0
aW9uTm90aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlOldlYlZp
ZXdEaWRDaGFuZ2VOb3RpZmljYXRpb24KK1Rlc3RzOiAKK1NtYXJ0IGRlbGV0ZSB3aGVuIGRlbGV0
aW5nIGEgbGluZSB3aXRoIG9ubHkgYSBibGFuayBsaW5lIGFib3ZlIGl0LiBUZXN0IG11c3QgZXhp
c3QgYXQgdGhlIHRvcCBvZiB0aGUgZmlsZSBpbiBvcmRlciB0byBjb3JyZWN0bHkgdGVzdCB0aGUg
b3JpZ2luYWwgYnVnLgorRXhwZWN0ZWQgUmVzdWx0czogCitFdmVyeXRoaW5nIHNob3VsZCBiZSBk
ZWxldGVkLgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402668</attachid>
            <date>2020-06-24 12:00:08 -0700</date>
            <delta_ts>2020-06-24 12:16:12 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213536-20200624120007.patch</filename>
            <type>text/plain</type>
            <size>11478</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNDM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzAwZTQ4OTlkMmVmOWM4
YTViOTNhYjEzNmMyMTJmY2UzZThkNGI3Yy4uOWM1Y2U2NDBkNGUyYjE0OTViYjdmMTYxYzU1OGZh
NWExZTE1MDc2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA2LTI0ICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQ2Fubm90IGRl
bGV0ZSBsYXN0IGxpbmUgb2YgTWFpbCBNZXNzYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTM1MzYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYz
NDIwOTI4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
IExheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUu
aHRtbAorCisgICAgICAgIFRoZSBzbWFydCBwYXJhZ3JhcGggZGVsZXRpb24gY29kZSBkaWQgbm90
IHRha2UgaW50byBhY2NvdW50IHRoYXQKKyAgICAgICAgdGhlIHByZXZpb3VzIGJsYW5rIGxpbmUg
Y291bGQgYmUgdGhlIHN0YXJ0IG9mIGVkaXRhYmxlIGNvbnRlbnQgd2l0aG91dAorICAgICAgICBh
IHBhcmFncmFwaCBiZWZvcmUgaXQuIElmIHRoaXMgd2FzIHRoZSBjYXNlLCB0aGUgZGVsZXRpb24g
Y29kZSBiYWNrZWQgdXAKKyAgICAgICAgdG9vIGZhciwgYW5kIHRoZSBkZWxldGUgY29tbWFuZCBm
YWlsZWQuIFRoaXMgY2FzZSBzaG91bGQgYmUgaGFuZGxlZAorICAgICAgICBpbiB0aGUgc2FtZSB3
YXkgdGhhdCB0aGUgZGVsZXRpbmcgdGhlIGxhc3QgcGFyYWdyYXBoIGluIGVkaXRhYmxlIGNvbnRl
bnQgaXMKKyAgICAgICAgaGFuZGxlZCwgYnkgY2hlY2tpbmcgaWYgd2UgYXJlIGFscmVhZHkgYXQg
dGhlIGJlZ2lubmluZyBvZiB0aGUgZWRpdGFibGUKKyAgICAgICAgY29udGVudCB3aGVuIGV4cGFu
ZGluZyB0aGUgc2VsZWN0aW9uIGZvciBzbWFydCBwYXJhZ3JhcGggZGVsZXRpb24uCisKKyAgICAg
ICAgKiBlZGl0aW5nL0RlbGV0ZVNlbGVjdGlvbkNvbW1hbmQuY3BwOgorICAgICAgICAoV2ViQ29y
ZTo6RGVsZXRlU2VsZWN0aW9uQ29tbWFuZDo6c21hcnREZWxldGVQYXJhZ3JhcGhTcGFjZXJzKToK
KwogMjAyMC0wNi0wMSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAog
ICAgICAgICBBZGQgRU5BQkxFKFdIRUVMX0VWRU5UX1JFR0lPTlMpLCBlbmFibGVkIG9uIG1hY09T
IHdoaWNoIGlzIHRoZSBvbmx5IHBsYXRmb3JtIHRoYXQgbmVlZHMgd2hlZWwgZXZlbnQgcmVnaW9u
cyBmb3Igc2Nyb2xsaW5nIHRocmVhZCBoaXQtdGVzdGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvZWRpdGluZy9EZWxldGVTZWxlY3Rpb25Db21tYW5kLmNwcCBiL1NvdXJjZS9XZWJDb3Jl
L2VkaXRpbmcvRGVsZXRlU2VsZWN0aW9uQ29tbWFuZC5jcHAKaW5kZXggYjRhZThiZTU2YzcxZGQw
YmJmNjdlMDI1OGI2OTNhMTQwMmQ4ZjAzZS4uMDM2ZDM0ZDk5ZGJkMWE2MWJkMTJlZGI3ZTAxNTEy
MDZiNWMxM2QyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9EZWxldGVTZWxl
Y3Rpb25Db21tYW5kLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0RlbGV0ZVNlbGVj
dGlvbkNvbW1hbmQuY3BwCkBAIC0xODYsMTYgKzE4NiwxOCBAQCB2b2lkIERlbGV0ZVNlbGVjdGlv
bkNvbW1hbmQ6OnNtYXJ0RGVsZXRlUGFyYWdyYXBoU3BhY2VycygpCiAgICAgYm9vbCBzdGFydEFu
ZEVuZEluU2FtZVVuc3BsaXR0YWJsZUVsZW1lbnQgPSB1bnNwbGl0dGFibGVFbGVtZW50Rm9yUG9z
aXRpb24odmlzaWJsZVN0YXJ0LmRlZXBFcXVpdmFsZW50KCkpID09IHVuc3BsaXR0YWJsZUVsZW1l
bnRGb3JQb3NpdGlvbih2aXNpYmxlRW5kLmRlZXBFcXVpdmFsZW50KCkpOwogICAgIHZpc2libGVT
dGFydCA9IHZpc2libGVTdGFydC5wcmV2aW91cyhDYW5ub3RDcm9zc0VkaXRpbmdCb3VuZGFyeSk7
CiAgICAgdmlzaWJsZUVuZCA9IHZpc2libGVFbmQubmV4dChDYW5ub3RDcm9zc0VkaXRpbmdCb3Vu
ZGFyeSk7CisgICAgYm9vbCBwcmV2aW91c1Bvc2l0aW9uSXNTdGFydE9mQ29udGVudCA9IHN0YXJ0
T2ZFZGl0YWJsZUNvbnRlbnQodmlzaWJsZVN0YXJ0KSA9PSB2aXNpYmxlU3RhcnQ7CiAgICAgYm9v
bCBwcmV2aW91c1Bvc2l0aW9uSXNCbGFua1BhcmFncmFwaCA9IGlzQmxhbmtQYXJhZ3JhcGgodmlz
aWJsZVN0YXJ0KTsKICAgICBib29sIGVuZFBvc2l0b25Jc0JsYW5rUGFyYWdyYXBoID0gaXNCbGFu
a1BhcmFncmFwaCh2aXNpYmxlRW5kKTsKICAgICBib29sIGhhc0JsYW5rUGFyYWdyYXBoQWZ0ZXJF
bmRPcklzRW5kT2ZDb250ZW50ID0gIXNlbGVjdGlvbkVuZElzRW5kT2ZDb250ZW50ICYmIChlbmRQ
b3NpdG9uSXNCbGFua1BhcmFncmFwaCB8fCBzZWxlY3Rpb25FbmRzSW5QYXJhZ3JhcGhTZXBlcmF0
b3IpOwogICAgIGlmIChzdGFydEFuZEVuZEluU2FtZVVuc3BsaXR0YWJsZUVsZW1lbnQgJiYgcHJl
dmlvdXNQb3NpdGlvbklzQmxhbmtQYXJhZ3JhcGggJiYgaGFzQmxhbmtQYXJhZ3JhcGhBZnRlckVu
ZE9ySXNFbmRPZkNvbnRlbnQpIHsKICAgICAgICAgbV9uZWVkUGxhY2Vob2xkZXIgPSBmYWxzZTsK
LSAgICAgICAgUG9zaXRpb24gcG9zaXRpb247Ci0gICAgICAgIGlmIChlbmRQb3NpdG9uSXNCbGFu
a1BhcmFncmFwaCkKLSAgICAgICAgICAgIHBvc2l0aW9uID0gc3RhcnRPZk5leHRQYXJhZ3JhcGgo
c3RhcnRPZk5leHRQYXJhZ3JhcGgobV9kb3duc3RyZWFtRW5kKSkuZGVlcEVxdWl2YWxlbnQoKTsK
KyAgICAgICAgVmlzaWJsZVBvc2l0aW9uIGVuZE9mUGFyYWdyYXBoQmVmb3JlU3RhcnQ7CisgICAg
ICAgIGlmIChwcmV2aW91c1Bvc2l0aW9uSXNTdGFydE9mQ29udGVudCkKKyAgICAgICAgICAgIGVu
ZE9mUGFyYWdyYXBoQmVmb3JlU3RhcnQgPSBlbmRPZlBhcmFncmFwaChWaXNpYmxlUG9zaXRpb24g
eyBtX3Vwc3RyZWFtU3RhcnQgfS5wcmV2aW91cygpKTsKICAgICAgICAgZWxzZQotICAgICAgICAg
ICAgcG9zaXRpb24gPSBWaXNpYmxlUG9zaXRpb24obV9kb3duc3RyZWFtRW5kKS5uZXh0KCkuZGVl
cEVxdWl2YWxlbnQoKTsKKyAgICAgICAgICAgIGVuZE9mUGFyYWdyYXBoQmVmb3JlU3RhcnQgPSBl
bmRPZlBhcmFncmFwaChWaXNpYmxlUG9zaXRpb24geyBtX3Vwc3RyZWFtU3RhcnQgfS5wcmV2aW91
cygpLnByZXZpb3VzKCkpOworICAgICAgICBhdXRvIHBvc2l0aW9uID0gZW5kT2ZQYXJhZ3JhcGhC
ZWZvcmVTdGFydC5kZWVwRXF1aXZhbGVudCgpOwogICAgICAgICBtX3Vwc3RyZWFtRW5kID0gcG9z
aXRpb24udXBzdHJlYW0oKTsKICAgICAgICAgbV9kb3duc3RyZWFtRW5kID0gcG9zaXRpb24uZG93
bnN0cmVhbSgpOwogICAgICAgICBtX3RyYWlsaW5nV2hpdGVzcGFjZSA9IG1fZG93bnN0cmVhbUVu
ZC50cmFpbGluZ1doaXRlc3BhY2VQb3NpdGlvbihWUF9ERUZBVUxUX0FGRklOSVRZKTsKZGlmZiAt
LWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRl
eCA0MjJiYTdmZTY3NzYzY2FjM2YzNjc1NDc0NjY3OGJkY2JlNWRkM2Q0Li5iZjM0NjFlNmNkYTlm
YjI2ZDgyMDk1YzAyNmIwNjRmZjU3NGQxYjE4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAt
MDYtMjQgIE1lZ2FuIEdhcmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAg
ICBDYW5ub3QgZGVsZXRlIGxhc3QgbGluZSBvZiBNYWlsIE1lc3NhZ2UKKyAgICAgICAgaHR0cHM6
Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzUzNgorICAgICAgICA8cmRhcjov
L3Byb2JsZW0vNjM0MjA5Mjg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgKiBlZGl0aW5nL2RlbGV0aW5nL3NtYXJ0LWRlbGV0ZS1wYXJhZ3JhcGgtMDA1
LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZWRpdGluZy9kZWxldGluZy9zbWFydC1k
ZWxldGUtcGFyYWdyYXBoLTAwNS5odG1sOiBBZGRlZC4KKwogMjAyMC0wNi0wMiAgSmFjb2IgVXBo
b2ZmICA8amFjb2JfdXBob2ZmQGFwcGxlLmNvbT4KIAogICAgICAgICBMYW5kaW5nIGV4cGVjdGF0
aW9ucyBmb3IgdGVzdHMgdGhhdCB3ZXJlIHJlY2VudGx5IGltcG9ydGVkIGJ1dCBkaWQgbm90IGhh
dmUgdGhlbQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9zbWFydC1k
ZWxldGUtcGFyYWdyYXBoLTAwNS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL2Rl
bGV0aW5nL3NtYXJ0LWRlbGV0ZS1wYXJhZ3JhcGgtMDA1LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBt
b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
Li4wZjYyZGEzM2YxNjYxYjFkNzdlYWE0YmU2ZThkZTEwMjE5MjkyYzk1Ci0tLSAvZGV2L251bGwK
KysrIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9zbWFydC1kZWxldGUtcGFyYWdyYXBo
LTAwNS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxMiBAQAorRURJVElORyBERUxFR0FURTogc2hv
dWxkQmVnaW5FZGl0aW5nSW5ET01SYW5nZTpyYW5nZSBmcm9tIDAgb2YgRElWID4gQk9EWSA+IEhU
TUwgPiAjZG9jdW1lbnQgdG8gMiBvZiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudAorRURJ
VElORyBERUxFR0FURTogd2ViVmlld0RpZEJlZ2luRWRpdGluZzpXZWJWaWV3RGlkQmVnaW5FZGl0
aW5nTm90aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0
aW9uOldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRpb24KK0VESVRJTkcgREVMRUdB
VEU6IHNob3VsZENoYW5nZVNlbGVjdGVkRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mIERJViA+IERJ
ViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDAgb2YgRElWID4gRElWID4gQk9EWSA+IEhU
TUwgPiAjZG9jdW1lbnQgdG9ET01SYW5nZTpyYW5nZSBmcm9tIDAgb2YgI3RleHQgPiBESVYgPiBE
SVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0byA4IG9mICN0ZXh0ID4gRElWID4gRElWID4g
Qk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgYWZmaW5pdHk6TlNTZWxlY3Rpb25BZmZpbml0eURvd25z
dHJlYW0gc3RpbGxTZWxlY3Rpbmc6RkFMU0UKK0VESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRD
aGFuZ2VTZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5vdGlmaWNhdGlvbgorRURJ
VElORyBERUxFR0FURTogc2hvdWxkRGVsZXRlRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mICN0ZXh0
ID4gRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gOCBvZiAjdGV4dCA+IERJ
ViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50CitFRElUSU5HIERFTEVHQVRFOiB3ZWJW
aWV3RGlkQ2hhbmdlU2VsZWN0aW9uOldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRp
b24KK0VESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2U6V2ViVmlld0RpZENoYW5nZU5v
dGlmaWNhdGlvbgorVGVzdHM6IAorU21hcnQgZGVsZXRlIHdoZW4gZGVsZXRpbmcgYSBsaW5lIHdp
dGggb25seSBhIGJsYW5rIGxpbmUgYWJvdmUgaXQuIFRlc3QgbXVzdCBleGlzdCBhdCB0aGUgdG9w
IG9mIHRoZSBmaWxlIGluIG9yZGVyIHRvIGNvcnJlY3RseSB0ZXN0IHRoZSBvcmlnaW5hbCBidWcu
CitFeHBlY3RlZCBSZXN1bHRzOiAKK0V2ZXJ5dGhpbmcgc2hvdWxkIGJlIGRlbGV0ZWQuCmRpZmYg
LS1naXQgYS9MYXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL3NtYXJ0LWRlbGV0ZS1wYXJhZ3Jh
cGgtMDA1Lmh0bWwgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL3NtYXJ0LWRlbGV0ZS1w
YXJhZ3JhcGgtMDA1Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMTE5YTU2M2RkMTMwODNhNzk2OTFhY2U0MWU4
MjkwM2Y4NDlmNzg0MQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2VkaXRpbmcvZGVs
ZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUuaHRtbApAQCAtMCwwICsxLDUwIEBACis8
IURPQ1RZUEUgaHRtbD4KKzxodG1sPiAKKzxoZWFkPgorPHN0eWxlPgorLmVkaXRpbmcgeyAKKyAg
ICBib3JkZXI6IDJweCBzb2xpZCByZWQ7IAorICAgIGZvbnQtc2l6ZTogMjRweDsgCit9CisuZXhw
bGFuYXRpb24geyAKKyAgICBib3JkZXI6IDJweCBzb2xpZCBibHVlOyAKKyAgICBwYWRkaW5nOiAx
MnB4OyAKKyAgICBmb250LXNpemU6IDI0cHg7IAorICAgIG1hcmdpbi1ib3R0b206IDI0cHg7Cit9
Cisuc2NlbmFyaW8geyBtYXJnaW4tYm90dG9tOiAxNnB4O30KKy5zY2VuYXJpbzpmaXJzdC1saW5l
IHsgZm9udC13ZWlnaHQ6IGJvbGQ7IG1hcmdpbi1ib3R0b206IDE2cHg7fQorLmV4cGVjdGVkLXJl
c3VsdHM6Zmlyc3QtbGluZSB7IGZvbnQtd2VpZ2h0OiBib2xkIH0KKzwvc3R5bGU+Cis8L2hlYWQ+
IAorPGJvZHk+Cis8ZGl2IGNvbnRlbnRlZGl0YWJsZT0idHJ1ZSIgc3R5bGU9IndpZHRoOiAyNTZw
eDsgaGVpZ2h0OiAyNTZweDsgYm9yZGVyOiAxcHggc29saWQgYmxhY2siPjxicj48ZGl2IGlkPSd0
ZXN0Jz5EZWxldGVNZTwvZGl2PjwvZGl2PgorCis8ZGl2IGNsYXNzPSJleHBsYW5hdGlvbiI+Cis8
ZGl2IGNsYXNzPSJzY2VuYXJpbyI+CitUZXN0czogCis8YnI+CitTbWFydCBkZWxldGUgd2hlbiBk
ZWxldGluZyBhIGxpbmUgd2l0aCBvbmx5IGEgYmxhbmsgbGluZSBhYm92ZSBpdC4KK1Rlc3QgbXVz
dCBleGlzdCBhdCB0aGUgdG9wIG9mIHRoZSBmaWxlIGluIG9yZGVyIHRvIGNvcnJlY3RseSB0ZXN0
IHRoZSBvcmlnaW5hbCBidWcuCis8L2Rpdj4KKzxkaXYgY2xhc3M9ImV4cGVjdGVkLXJlc3VsdHMi
PgorRXhwZWN0ZWQgUmVzdWx0czoKKzxicj4KK0V2ZXJ5dGhpbmcgc2hvdWxkIGJlIGRlbGV0ZWQu
Cis8L2Rpdj4KKzwvZGl2PgorCis8c2NyaXB0IHNyYz0iLi4vZWRpdGluZy5qcyI+PC9zY3JpcHQ+
Cis8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL3VpLWhlbHBlci5qcyI+PC9zY3JpcHQ+Cis8
c2NyaXB0PgorCithc3luYyBmdW5jdGlvbiBlZGl0aW5nVGVzdCgpIHsKKyAgICBpbnRlcm5hbHMu
c2V0dGluZ3Muc2V0RWRpdGluZ0JlaGF2aW9yKCJpb3MiKTsKKyAgICBhd2FpdCBVSUhlbHBlci5z
ZWxlY3RXb3JkQnlEb3VibGVUYXBPckNsaWNrKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0ZXN0
JykpOworICAgIGN1dENvbW1hbmQoKTsKK30KKworcnVuRHVtcEFzVGV4dEVkaXRpbmdUZXN0KHRy
dWUpOworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2Yg
ZmlsZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zL2VkaXRpbmcvZGVsZXRp
bmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMv
cGxhdGZvcm0vaW9zL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUt
ZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjkyNDE4MTM2MDRkODc0MGYwOWM3NjkzNDNjZmU2NTA2
ZTkxNDAyZWYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvZWRp
dGluZy9kZWxldGluZy9zbWFydC1kZWxldGUtcGFyYWdyYXBoLTAwNS1leHBlY3RlZC50eHQKQEAg
LTAsMCArMSwxMyBAQAorRURJVElORyBERUxFR0FURTogc2hvdWxkQmVnaW5FZGl0aW5nSW5ET01S
YW5nZTpyYW5nZSBmcm9tIDAgb2YgRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gMiBv
ZiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudAorRURJVElORyBERUxFR0FURTogd2ViVmll
d0RpZEJlZ2luRWRpdGluZzpXZWJWaWV3RGlkQmVnaW5FZGl0aW5nTm90aWZpY2F0aW9uCitFRElU
SU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uOldlYlZpZXdEaWRDaGFuZ2VT
ZWxlY3Rpb25Ob3RpZmljYXRpb24KK0VESVRJTkcgREVMRUdBVEU6IHNob3VsZENoYW5nZVNlbGVj
dGVkRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2Rv
Y3VtZW50IHRvIDAgb2YgRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG9ET01S
YW5nZTpyYW5nZSBmcm9tIDAgb2YgRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQg
dG8gMCBvZiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCBhZmZpbml0eTpOU1Nl
bGVjdGlvbkFmZmluaXR5RG93bnN0cmVhbSBzdGlsbFNlbGVjdGluZzpGQUxTRQorRURJVElORyBE
RUxFR0FURTogc2hvdWxkQ2hhbmdlU2VsZWN0ZWRET01SYW5nZTpyYW5nZSBmcm9tIDAgb2YgRElW
ID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gMCBvZiBESVYgPiBESVYgPiBCT0RZ
ID4gSFRNTCA+ICNkb2N1bWVudCB0b0RPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiAjdGV4dCA+IERJ
ViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDggb2YgI3RleHQgPiBESVYgPiBE
SVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCBhZmZpbml0eTpOU1NlbGVjdGlvbkFmZmluaXR5
RG93bnN0cmVhbSBzdGlsbFNlbGVjdGluZzpGQUxTRQorRURJVElORyBERUxFR0FURTogd2ViVmll
d0RpZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9u
CitFRElUSU5HIERFTEVHQVRFOiBzaG91bGREZWxldGVET01SYW5nZTpyYW5nZSBmcm9tIDAgb2Yg
I3RleHQgPiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0byA4IG9mICN0ZXh0
ID4gRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQKK0VESVRJTkcgREVMRUdBVEU6
IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5vdGlm
aWNhdGlvbgorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZTpXZWJWaWV3RGlkQ2hh
bmdlTm90aWZpY2F0aW9uCitUZXN0czogCitTbWFydCBkZWxldGUgd2hlbiBkZWxldGluZyBhIGxp
bmUgd2l0aCBvbmx5IGEgYmxhbmsgbGluZSBhYm92ZSBpdC4gVGVzdCBtdXN0IGV4aXN0IGF0IHRo
ZSB0b3Agb2YgdGhlIGZpbGUgaW4gb3JkZXIgdG8gY29ycmVjdGx5IHRlc3QgdGhlIG9yaWdpbmFs
IGJ1Zy4KK0V4cGVjdGVkIFJlc3VsdHM6IAorRXZlcnl0aGluZyBzaG91bGQgYmUgZGVsZXRlZC4K
ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9lZGl0aW5nL2RlbGV0aW5nL3Nt
YXJ0LWRlbGV0ZS1wYXJhZ3JhcGgtMDA1LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRm
b3JtL3dpbi9lZGl0aW5nL2RlbGV0aW5nL3NtYXJ0LWRlbGV0ZS1wYXJhZ3JhcGgtMDA1LWV4cGVj
dGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwLi40MjE0MzE5MDA3NGQwM2NmYmNiZjZlZTAxMWYxN2Q4OGY1YzQ0
NTlkCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL2VkaXRpbmcv
ZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUtZXhwZWN0ZWQudHh0CkBAIC0wLDAg
KzEsMTQgQEAKK0VESVRJTkcgREVMRUdBVEU6IHNob3VsZEJlZ2luRWRpdGluZ0luRE9NUmFuZ2U6
cmFuZ2UgZnJvbSAwIG9mIERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDIgb2YgRElW
ID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQKK0VESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRC
ZWdpbkVkaXRpbmc6V2ViVmlld0RpZEJlZ2luRWRpdGluZ05vdGlmaWNhdGlvbgorRURJVElORyBE
RUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3RGlkQ2hhbmdlU2VsZWN0
aW9uTm90aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRFOiBzaG91bGRDaGFuZ2VTZWxlY3RlZERP
TVJhbmdlOnJhbmdlIGZyb20gMCBvZiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVu
dCB0byAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvRE9NUmFuZ2U6
cmFuZ2UgZnJvbSAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDAg
b2YgRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgYWZmaW5pdHk6TlNTZWxlY3Rp
b25BZmZpbml0eURvd25zdHJlYW0gc3RpbGxTZWxlY3Rpbmc6RkFMU0UKK0VESVRJTkcgREVMRUdB
VEU6IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5v
dGlmaWNhdGlvbgorRURJVElORyBERUxFR0FURTogc2hvdWxkQ2hhbmdlU2VsZWN0ZWRET01SYW5n
ZTpyYW5nZSBmcm9tIDAgb2YgRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8g
MCBvZiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0b0RPTVJhbmdlOnJhbmdl
IGZyb20gMCBvZiAjdGV4dCA+IERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRv
IDggb2YgI3RleHQgPiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCBhZmZpbml0
eTpOU1NlbGVjdGlvbkFmZmluaXR5RG93bnN0cmVhbSBzdGlsbFNlbGVjdGluZzpGQUxTRQorRURJ
VElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3RGlkQ2hhbmdl
U2VsZWN0aW9uTm90aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRFOiBzaG91bGREZWxldGVET01S
YW5nZTpyYW5nZSBmcm9tIDAgb2YgI3RleHQgPiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNk
b2N1bWVudCB0byA4IG9mICN0ZXh0ID4gRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1l
bnQKK0VESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246V2ViVmlld0Rp
ZENoYW5nZVNlbGVjdGlvbk5vdGlmaWNhdGlvbgorRURJVElORyBERUxFR0FURTogd2ViVmlld0Rp
ZENoYW5nZTpXZWJWaWV3RGlkQ2hhbmdlTm90aWZpY2F0aW9uCitUZXN0czogCitTbWFydCBkZWxl
dGUgd2hlbiBkZWxldGluZyBhIGxpbmUgd2l0aCBvbmx5IGEgYmxhbmsgbGluZSBhYm92ZSBpdC4g
VGVzdCBtdXN0IGV4aXN0IGF0IHRoZSB0b3Agb2YgdGhlIGZpbGUgaW4gb3JkZXIgdG8gY29ycmVj
dGx5IHRlc3QgdGhlIG9yaWdpbmFsIGJ1Zy4KK0V4cGVjdGVkIFJlc3VsdHM6IAorRXZlcnl0aGlu
ZyBzaG91bGQgYmUgZGVsZXRlZC4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402672</attachid>
            <date>2020-06-24 12:16:13 -0700</date>
            <delta_ts>2020-06-24 14:33:01 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213536-20200624121612.patch</filename>
            <type>text/plain</type>
            <size>11701</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNDM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzAwZTQ4OTlkMmVmOWM4
YTViOTNhYjEzNmMyMTJmY2UzZThkNGI3Yy4uOWM1Y2U2NDBkNGUyYjE0OTViYjdmMTYxYzU1OGZh
NWExZTE1MDc2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA2LTI0ICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQ2Fubm90IGRl
bGV0ZSBsYXN0IGxpbmUgb2YgTWFpbCBNZXNzYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTM1MzYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYz
NDIwOTI4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
IExheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUu
aHRtbAorCisgICAgICAgIFRoZSBzbWFydCBwYXJhZ3JhcGggZGVsZXRpb24gY29kZSBkaWQgbm90
IHRha2UgaW50byBhY2NvdW50IHRoYXQKKyAgICAgICAgdGhlIHByZXZpb3VzIGJsYW5rIGxpbmUg
Y291bGQgYmUgdGhlIHN0YXJ0IG9mIGVkaXRhYmxlIGNvbnRlbnQgd2l0aG91dAorICAgICAgICBh
IHBhcmFncmFwaCBiZWZvcmUgaXQuIElmIHRoaXMgd2FzIHRoZSBjYXNlLCB0aGUgZGVsZXRpb24g
Y29kZSBiYWNrZWQgdXAKKyAgICAgICAgdG9vIGZhciwgYW5kIHRoZSBkZWxldGUgY29tbWFuZCBm
YWlsZWQuIFRoaXMgY2FzZSBzaG91bGQgYmUgaGFuZGxlZAorICAgICAgICBpbiB0aGUgc2FtZSB3
YXkgdGhhdCB0aGUgZGVsZXRpbmcgdGhlIGxhc3QgcGFyYWdyYXBoIGluIGVkaXRhYmxlIGNvbnRl
bnQgaXMKKyAgICAgICAgaGFuZGxlZCwgYnkgY2hlY2tpbmcgaWYgd2UgYXJlIGFscmVhZHkgYXQg
dGhlIGJlZ2lubmluZyBvZiB0aGUgZWRpdGFibGUKKyAgICAgICAgY29udGVudCB3aGVuIGV4cGFu
ZGluZyB0aGUgc2VsZWN0aW9uIGZvciBzbWFydCBwYXJhZ3JhcGggZGVsZXRpb24uCisKKyAgICAg
ICAgKiBlZGl0aW5nL0RlbGV0ZVNlbGVjdGlvbkNvbW1hbmQuY3BwOgorICAgICAgICAoV2ViQ29y
ZTo6RGVsZXRlU2VsZWN0aW9uQ29tbWFuZDo6c21hcnREZWxldGVQYXJhZ3JhcGhTcGFjZXJzKToK
KwogMjAyMC0wNi0wMSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAog
ICAgICAgICBBZGQgRU5BQkxFKFdIRUVMX0VWRU5UX1JFR0lPTlMpLCBlbmFibGVkIG9uIG1hY09T
IHdoaWNoIGlzIHRoZSBvbmx5IHBsYXRmb3JtIHRoYXQgbmVlZHMgd2hlZWwgZXZlbnQgcmVnaW9u
cyBmb3Igc2Nyb2xsaW5nIHRocmVhZCBoaXQtdGVzdGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvZWRpdGluZy9EZWxldGVTZWxlY3Rpb25Db21tYW5kLmNwcCBiL1NvdXJjZS9XZWJDb3Jl
L2VkaXRpbmcvRGVsZXRlU2VsZWN0aW9uQ29tbWFuZC5jcHAKaW5kZXggYjRhZThiZTU2YzcxZGQw
YmJmNjdlMDI1OGI2OTNhMTQwMmQ4ZjAzZS4uYmFmYTJiMzQxYzk2MGQ1Y2M1YzMwY2E4ZDc0ODY0
ZjdlZmIzMWZmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9EZWxldGVTZWxl
Y3Rpb25Db21tYW5kLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0RlbGV0ZVNlbGVj
dGlvbkNvbW1hbmQuY3BwCkBAIC0xODYsMTYgKzE4NiwxOCBAQCB2b2lkIERlbGV0ZVNlbGVjdGlv
bkNvbW1hbmQ6OnNtYXJ0RGVsZXRlUGFyYWdyYXBoU3BhY2VycygpCiAgICAgYm9vbCBzdGFydEFu
ZEVuZEluU2FtZVVuc3BsaXR0YWJsZUVsZW1lbnQgPSB1bnNwbGl0dGFibGVFbGVtZW50Rm9yUG9z
aXRpb24odmlzaWJsZVN0YXJ0LmRlZXBFcXVpdmFsZW50KCkpID09IHVuc3BsaXR0YWJsZUVsZW1l
bnRGb3JQb3NpdGlvbih2aXNpYmxlRW5kLmRlZXBFcXVpdmFsZW50KCkpOwogICAgIHZpc2libGVT
dGFydCA9IHZpc2libGVTdGFydC5wcmV2aW91cyhDYW5ub3RDcm9zc0VkaXRpbmdCb3VuZGFyeSk7
CiAgICAgdmlzaWJsZUVuZCA9IHZpc2libGVFbmQubmV4dChDYW5ub3RDcm9zc0VkaXRpbmdCb3Vu
ZGFyeSk7CisgICAgYm9vbCBwcmV2aW91c1Bvc2l0aW9uSXNTdGFydE9mQ29udGVudCA9IHN0YXJ0
T2ZFZGl0YWJsZUNvbnRlbnQodmlzaWJsZVN0YXJ0KSA9PSB2aXNpYmxlU3RhcnQ7CiAgICAgYm9v
bCBwcmV2aW91c1Bvc2l0aW9uSXNCbGFua1BhcmFncmFwaCA9IGlzQmxhbmtQYXJhZ3JhcGgodmlz
aWJsZVN0YXJ0KTsKLSAgICBib29sIGVuZFBvc2l0b25Jc0JsYW5rUGFyYWdyYXBoID0gaXNCbGFu
a1BhcmFncmFwaCh2aXNpYmxlRW5kKTsKLSAgICBib29sIGhhc0JsYW5rUGFyYWdyYXBoQWZ0ZXJF
bmRPcklzRW5kT2ZDb250ZW50ID0gIXNlbGVjdGlvbkVuZElzRW5kT2ZDb250ZW50ICYmIChlbmRQ
b3NpdG9uSXNCbGFua1BhcmFncmFwaCB8fCBzZWxlY3Rpb25FbmRzSW5QYXJhZ3JhcGhTZXBlcmF0
b3IpOworICAgIGJvb2wgZW5kUG9zaXRpb25Jc0JsYW5rUGFyYWdyYXBoID0gaXNCbGFua1BhcmFn
cmFwaCh2aXNpYmxlRW5kKTsKKyAgICBib29sIGhhc0JsYW5rUGFyYWdyYXBoQWZ0ZXJFbmRPcklz
RW5kT2ZDb250ZW50ID0gIXNlbGVjdGlvbkVuZElzRW5kT2ZDb250ZW50ICYmIChlbmRQb3NpdGlv
bklzQmxhbmtQYXJhZ3JhcGggfHwgc2VsZWN0aW9uRW5kc0luUGFyYWdyYXBoU2VwZXJhdG9yKTsK
ICAgICBpZiAoc3RhcnRBbmRFbmRJblNhbWVVbnNwbGl0dGFibGVFbGVtZW50ICYmIHByZXZpb3Vz
UG9zaXRpb25Jc0JsYW5rUGFyYWdyYXBoICYmIGhhc0JsYW5rUGFyYWdyYXBoQWZ0ZXJFbmRPcklz
RW5kT2ZDb250ZW50KSB7CiAgICAgICAgIG1fbmVlZFBsYWNlaG9sZGVyID0gZmFsc2U7Ci0gICAg
ICAgIFBvc2l0aW9uIHBvc2l0aW9uOwotICAgICAgICBpZiAoZW5kUG9zaXRvbklzQmxhbmtQYXJh
Z3JhcGgpCi0gICAgICAgICAgICBwb3NpdGlvbiA9IHN0YXJ0T2ZOZXh0UGFyYWdyYXBoKHN0YXJ0
T2ZOZXh0UGFyYWdyYXBoKG1fZG93bnN0cmVhbUVuZCkpLmRlZXBFcXVpdmFsZW50KCk7CisgICAg
ICAgIFZpc2libGVQb3NpdGlvbiBlbmRPZlBhcmFncmFwaEJlZm9yZVN0YXJ0OworICAgICAgICBp
ZiAocHJldmlvdXNQb3NpdGlvbklzU3RhcnRPZkNvbnRlbnQpCisgICAgICAgICAgICBlbmRPZlBh
cmFncmFwaEJlZm9yZVN0YXJ0ID0gZW5kT2ZQYXJhZ3JhcGgoVmlzaWJsZVBvc2l0aW9uIHsgbV91
cHN0cmVhbVN0YXJ0IH0ucHJldmlvdXMoKSk7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIHBv
c2l0aW9uID0gVmlzaWJsZVBvc2l0aW9uKG1fZG93bnN0cmVhbUVuZCkubmV4dCgpLmRlZXBFcXVp
dmFsZW50KCk7CisgICAgICAgICAgICBlbmRPZlBhcmFncmFwaEJlZm9yZVN0YXJ0ID0gZW5kT2ZQ
YXJhZ3JhcGgoVmlzaWJsZVBvc2l0aW9uIHsgbV91cHN0cmVhbVN0YXJ0IH0ucHJldmlvdXMoKS5w
cmV2aW91cygpKTsKKyAgICAgICAgYXV0byBwb3NpdGlvbiA9IGVuZE9mUGFyYWdyYXBoQmVmb3Jl
U3RhcnQuZGVlcEVxdWl2YWxlbnQoKTsKICAgICAgICAgbV91cHN0cmVhbUVuZCA9IHBvc2l0aW9u
LnVwc3RyZWFtKCk7CiAgICAgICAgIG1fZG93bnN0cmVhbUVuZCA9IHBvc2l0aW9uLmRvd25zdHJl
YW0oKTsKICAgICAgICAgbV90cmFpbGluZ1doaXRlc3BhY2UgPSBtX2Rvd25zdHJlYW1FbmQudHJh
aWxpbmdXaGl0ZXNwYWNlUG9zaXRpb24oVlBfREVGQVVMVF9BRkZJTklUWSk7CmRpZmYgLS1naXQg
YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNDIy
YmE3ZmU2Nzc2M2NhYzNmMzY3NTQ3NDY2NzhiZGNiZTVkZDNkNC4uYmYzNDYxZTZjZGE5ZmIyNmQ4
MjA5NWMwMjZiMDY0ZmY1NzRkMWIxOCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n
CisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIwLTA2LTI0
ICBNZWdhbiBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQ2Fu
bm90IGRlbGV0ZSBsYXN0IGxpbmUgb2YgTWFpbCBNZXNzYWdlCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTM1MzYKKyAgICAgICAgPHJkYXI6Ly9wcm9i
bGVtLzYzNDIwOTI4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg
ICAgICAgICogZWRpdGluZy9kZWxldGluZy9zbWFydC1kZWxldGUtcGFyYWdyYXBoLTAwNS1leHBl
Y3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGVkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRl
LXBhcmFncmFwaC0wMDUuaHRtbDogQWRkZWQuCisKIDIwMjAtMDYtMDIgIEphY29iIFVwaG9mZiAg
PGphY29iX3VwaG9mZkBhcHBsZS5jb20+CiAKICAgICAgICAgTGFuZGluZyBleHBlY3RhdGlvbnMg
Zm9yIHRlc3RzIHRoYXQgd2VyZSByZWNlbnRseSBpbXBvcnRlZCBidXQgZGlkIG5vdCBoYXZlIHRo
ZW0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRl
LXBhcmFncmFwaC0wMDUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGlu
Zy9zbWFydC1kZWxldGUtcGFyYWdyYXBoLTAwNS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAx
MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMGY2
MmRhMzNmMTY2MWIxZDc3ZWFhNGJlNmU4ZGUxMDIxOTI5MmM5NQotLS0gL2Rldi9udWxsCisrKyBi
L0xheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUt
ZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTIgQEAKK0VESVRJTkcgREVMRUdBVEU6IHNob3VsZEJl
Z2luRWRpdGluZ0luRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mIERJViA+IEJPRFkgPiBIVE1MID4g
I2RvY3VtZW50IHRvIDIgb2YgRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQKK0VESVRJTkcg
REVMRUdBVEU6IHdlYlZpZXdEaWRCZWdpbkVkaXRpbmc6V2ViVmlld0RpZEJlZ2luRWRpdGluZ05v
dGlmaWNhdGlvbgorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpX
ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRFOiBz
aG91bGRDaGFuZ2VTZWxlY3RlZERPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiBESVYgPiBESVYgPiBC
T0RZID4gSFRNTCA+ICNkb2N1bWVudCB0byAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4g
I2RvY3VtZW50IHRvRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mICN0ZXh0ID4gRElWID4gRElWID4g
Qk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gOCBvZiAjdGV4dCA+IERJViA+IERJViA+IEJPRFkg
PiBIVE1MID4gI2RvY3VtZW50IGFmZmluaXR5Ok5TU2VsZWN0aW9uQWZmaW5pdHlEb3duc3RyZWFt
IHN0aWxsU2VsZWN0aW5nOkZBTFNFCitFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdl
U2VsZWN0aW9uOldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRpb24KK0VESVRJTkcg
REVMRUdBVEU6IHNob3VsZERlbGV0ZURPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiAjdGV4dCA+IERJ
ViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDggb2YgI3RleHQgPiBESVYgPiBE
SVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudAorRURJVElORyBERUxFR0FURTogd2ViVmlld0Rp
ZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCitF
RElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlOldlYlZpZXdEaWRDaGFuZ2VOb3RpZmlj
YXRpb24KK1Rlc3RzOiAKK1NtYXJ0IGRlbGV0ZSB3aGVuIGRlbGV0aW5nIGEgbGluZSB3aXRoIG9u
bHkgYSBibGFuayBsaW5lIGFib3ZlIGl0LiBUZXN0IG11c3QgZXhpc3QgYXQgdGhlIHRvcCBvZiB0
aGUgZmlsZSBpbiBvcmRlciB0byBjb3JyZWN0bHkgdGVzdCB0aGUgb3JpZ2luYWwgYnVnLgorRXhw
ZWN0ZWQgUmVzdWx0czogCitFdmVyeXRoaW5nIHNob3VsZCBiZSBkZWxldGVkLgpkaWZmIC0tZ2l0
IGEvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9zbWFydC1kZWxldGUtcGFyYWdyYXBoLTAw
NS5odG1sIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9zbWFydC1kZWxldGUtcGFyYWdy
YXBoLTAwNS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjExOWE1NjNkZDEzMDgzYTc5NjkxYWNlNDFlODI5MDNm
ODQ5Zjc4NDEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5n
L3NtYXJ0LWRlbGV0ZS1wYXJhZ3JhcGgtMDA1Lmh0bWwKQEAgLTAsMCArMSw1MCBAQAorPCFET0NU
WVBFIGh0bWw+Cis8aHRtbD4gCis8aGVhZD4KKzxzdHlsZT4KKy5lZGl0aW5nIHsgCisgICAgYm9y
ZGVyOiAycHggc29saWQgcmVkOyAKKyAgICBmb250LXNpemU6IDI0cHg7IAorfQorLmV4cGxhbmF0
aW9uIHsgCisgICAgYm9yZGVyOiAycHggc29saWQgYmx1ZTsgCisgICAgcGFkZGluZzogMTJweDsg
CisgICAgZm9udC1zaXplOiAyNHB4OyAKKyAgICBtYXJnaW4tYm90dG9tOiAyNHB4OworfQorLnNj
ZW5hcmlvIHsgbWFyZ2luLWJvdHRvbTogMTZweDt9Cisuc2NlbmFyaW86Zmlyc3QtbGluZSB7IGZv
bnQtd2VpZ2h0OiBib2xkOyBtYXJnaW4tYm90dG9tOiAxNnB4O30KKy5leHBlY3RlZC1yZXN1bHRz
OmZpcnN0LWxpbmUgeyBmb250LXdlaWdodDogYm9sZCB9Cis8L3N0eWxlPgorPC9oZWFkPiAKKzxi
b2R5PgorPGRpdiBjb250ZW50ZWRpdGFibGU9InRydWUiIHN0eWxlPSJ3aWR0aDogMjU2cHg7IGhl
aWdodDogMjU2cHg7IGJvcmRlcjogMXB4IHNvbGlkIGJsYWNrIj48YnI+PGRpdiBpZD0ndGVzdCc+
RGVsZXRlTWU8L2Rpdj48L2Rpdj4KKworPGRpdiBjbGFzcz0iZXhwbGFuYXRpb24iPgorPGRpdiBj
bGFzcz0ic2NlbmFyaW8iPgorVGVzdHM6IAorPGJyPgorU21hcnQgZGVsZXRlIHdoZW4gZGVsZXRp
bmcgYSBsaW5lIHdpdGggb25seSBhIGJsYW5rIGxpbmUgYWJvdmUgaXQuCitUZXN0IG11c3QgZXhp
c3QgYXQgdGhlIHRvcCBvZiB0aGUgZmlsZSBpbiBvcmRlciB0byBjb3JyZWN0bHkgdGVzdCB0aGUg
b3JpZ2luYWwgYnVnLgorPC9kaXY+Cis8ZGl2IGNsYXNzPSJleHBlY3RlZC1yZXN1bHRzIj4KK0V4
cGVjdGVkIFJlc3VsdHM6Cis8YnI+CitFdmVyeXRoaW5nIHNob3VsZCBiZSBkZWxldGVkLgorPC9k
aXY+Cis8L2Rpdj4KKworPHNjcmlwdCBzcmM9Ii4uL2VkaXRpbmcuanMiPjwvc2NyaXB0PgorPHNj
cmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy91aS1oZWxwZXIuanMiPjwvc2NyaXB0PgorPHNjcmlw
dD4KKworYXN5bmMgZnVuY3Rpb24gZWRpdGluZ1Rlc3QoKSB7CisgICAgaW50ZXJuYWxzLnNldHRp
bmdzLnNldEVkaXRpbmdCZWhhdmlvcigiaW9zIik7CisgICAgYXdhaXQgVUlIZWxwZXIuc2VsZWN0
V29yZEJ5RG91YmxlVGFwT3JDbGljayhkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGVzdCcpKTsK
KyAgICBjdXRDb21tYW5kKCk7Cit9CisKK3J1bkR1bXBBc1RleHRFZGl0aW5nVGVzdCh0cnVlKTsK
Kzwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUK
ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9lZGl0aW5nL2RlbGV0aW5nL3Nt
YXJ0LWRlbGV0ZS1wYXJhZ3JhcGgtMDA1LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRm
b3JtL2lvcy9lZGl0aW5nL2RlbGV0aW5nL3NtYXJ0LWRlbGV0ZS1wYXJhZ3JhcGgtMDA1LWV4cGVj
dGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwLi45MjQxODEzNjA0ZDg3NDBmMDljNzY5MzQzY2ZlNjUwNmU5MTQw
MmVmCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zL2VkaXRpbmcv
ZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUtZXhwZWN0ZWQudHh0CkBAIC0wLDAg
KzEsMTMgQEAKK0VESVRJTkcgREVMRUdBVEU6IHNob3VsZEJlZ2luRWRpdGluZ0luRE9NUmFuZ2U6
cmFuZ2UgZnJvbSAwIG9mIERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDIgb2YgRElW
ID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQKK0VESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRC
ZWdpbkVkaXRpbmc6V2ViVmlld0RpZEJlZ2luRWRpdGluZ05vdGlmaWNhdGlvbgorRURJVElORyBE
RUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3RGlkQ2hhbmdlU2VsZWN0
aW9uTm90aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRFOiBzaG91bGRDaGFuZ2VTZWxlY3RlZERP
TVJhbmdlOnJhbmdlIGZyb20gMCBvZiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVu
dCB0byAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvRE9NUmFuZ2U6
cmFuZ2UgZnJvbSAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDAg
b2YgRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgYWZmaW5pdHk6TlNTZWxlY3Rp
b25BZmZpbml0eURvd25zdHJlYW0gc3RpbGxTZWxlY3Rpbmc6RkFMU0UKK0VESVRJTkcgREVMRUdB
VEU6IHNob3VsZENoYW5nZVNlbGVjdGVkRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mIERJViA+IERJ
ViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDAgb2YgRElWID4gRElWID4gQk9EWSA+IEhU
TUwgPiAjZG9jdW1lbnQgdG9ET01SYW5nZTpyYW5nZSBmcm9tIDAgb2YgI3RleHQgPiBESVYgPiBE
SVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0byA4IG9mICN0ZXh0ID4gRElWID4gRElWID4g
Qk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgYWZmaW5pdHk6TlNTZWxlY3Rpb25BZmZpbml0eURvd25z
dHJlYW0gc3RpbGxTZWxlY3Rpbmc6RkFMU0UKK0VESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRD
aGFuZ2VTZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5vdGlmaWNhdGlvbgorRURJ
VElORyBERUxFR0FURTogc2hvdWxkRGVsZXRlRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mICN0ZXh0
ID4gRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gOCBvZiAjdGV4dCA+IERJ
ViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50CitFRElUSU5HIERFTEVHQVRFOiB3ZWJW
aWV3RGlkQ2hhbmdlU2VsZWN0aW9uOldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRp
b24KK0VESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2U6V2ViVmlld0RpZENoYW5nZU5v
dGlmaWNhdGlvbgorVGVzdHM6IAorU21hcnQgZGVsZXRlIHdoZW4gZGVsZXRpbmcgYSBsaW5lIHdp
dGggb25seSBhIGJsYW5rIGxpbmUgYWJvdmUgaXQuIFRlc3QgbXVzdCBleGlzdCBhdCB0aGUgdG9w
IG9mIHRoZSBmaWxlIGluIG9yZGVyIHRvIGNvcnJlY3RseSB0ZXN0IHRoZSBvcmlnaW5hbCBidWcu
CitFeHBlY3RlZCBSZXN1bHRzOiAKK0V2ZXJ5dGhpbmcgc2hvdWxkIGJlIGRlbGV0ZWQuCmRpZmYg
LS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vZWRpdGluZy9kZWxldGluZy9zbWFydC1k
ZWxldGUtcGFyYWdyYXBoLTAwNS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93
aW4vZWRpdGluZy9kZWxldGluZy9zbWFydC1kZWxldGUtcGFyYWdyYXBoLTAwNS1leHBlY3RlZC50
eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMC4uNDIxNDMxOTAwNzRkMDNjZmJjYmY2ZWUwMTFmMTdkODhmNWM0NDU5ZAot
LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9lZGl0aW5nL2RlbGV0
aW5nL3NtYXJ0LWRlbGV0ZS1wYXJhZ3JhcGgtMDA1LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDE0
IEBACitFRElUSU5HIERFTEVHQVRFOiBzaG91bGRCZWdpbkVkaXRpbmdJbkRPTVJhbmdlOnJhbmdl
IGZyb20gMCBvZiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0byAyIG9mIERJViA+IEJP
RFkgPiBIVE1MID4gI2RvY3VtZW50CitFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQmVnaW5F
ZGl0aW5nOldlYlZpZXdEaWRCZWdpbkVkaXRpbmdOb3RpZmljYXRpb24KK0VESVRJTkcgREVMRUdB
VEU6IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5v
dGlmaWNhdGlvbgorRURJVElORyBERUxFR0FURTogc2hvdWxkQ2hhbmdlU2VsZWN0ZWRET01SYW5n
ZTpyYW5nZSBmcm9tIDAgb2YgRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8g
MCBvZiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0b0RPTVJhbmdlOnJhbmdl
IGZyb20gMCBvZiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0byAwIG9mIERJ
ViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IGFmZmluaXR5Ok5TU2VsZWN0aW9uQWZm
aW5pdHlEb3duc3RyZWFtIHN0aWxsU2VsZWN0aW5nOkZBTFNFCitFRElUSU5HIERFTEVHQVRFOiB3
ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uOldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmlj
YXRpb24KK0VESVRJTkcgREVMRUdBVEU6IHNob3VsZENoYW5nZVNlbGVjdGVkRE9NUmFuZ2U6cmFu
Z2UgZnJvbSAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDAgb2Yg
RElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG9ET01SYW5nZTpyYW5nZSBmcm9t
IDAgb2YgI3RleHQgPiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0byA4IG9m
ICN0ZXh0ID4gRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgYWZmaW5pdHk6TlNT
ZWxlY3Rpb25BZmZpbml0eURvd25zdHJlYW0gc3RpbGxTZWxlY3Rpbmc6RkFMU0UKK0VESVRJTkcg
REVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNlbGVj
dGlvbk5vdGlmaWNhdGlvbgorRURJVElORyBERUxFR0FURTogc2hvdWxkRGVsZXRlRE9NUmFuZ2U6
cmFuZ2UgZnJvbSAwIG9mICN0ZXh0ID4gRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1l
bnQgdG8gOCBvZiAjdGV4dCA+IERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50CitF
RElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uOldlYlZpZXdEaWRDaGFu
Z2VTZWxlY3Rpb25Ob3RpZmljYXRpb24KK0VESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFu
Z2U6V2ViVmlld0RpZENoYW5nZU5vdGlmaWNhdGlvbgorVGVzdHM6IAorU21hcnQgZGVsZXRlIHdo
ZW4gZGVsZXRpbmcgYSBsaW5lIHdpdGggb25seSBhIGJsYW5rIGxpbmUgYWJvdmUgaXQuIFRlc3Qg
bXVzdCBleGlzdCBhdCB0aGUgdG9wIG9mIHRoZSBmaWxlIGluIG9yZGVyIHRvIGNvcnJlY3RseSB0
ZXN0IHRoZSBvcmlnaW5hbCBidWcuCitFeHBlY3RlZCBSZXN1bHRzOiAKK0V2ZXJ5dGhpbmcgc2hv
dWxkIGJlIGRlbGV0ZWQuCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402686</attachid>
            <date>2020-06-24 14:33:03 -0700</date>
            <delta_ts>2020-06-24 15:33:35 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213536-20200624143303.patch</filename>
            <type>text/plain</type>
            <size>11636</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMjkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDYyODAwYjYyNGI4YTFh
OGNlOWYyZTVlNGExN2ZmODE1YjY0MzIwMC4uMDU5NTVjNjIzMDg4ZGZlNGIyZDQ3Zjk3YWM1MzEx
MzUyMjhhYWIyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA2LTIzICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQ2Fubm90IGRl
bGV0ZSBsYXN0IGxpbmUgb2YgTWFpbCBNZXNzYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTM1MzYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYz
NDIwOTI4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
IExheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUu
aHRtbAorCisgICAgICAgIFRoZSBzbWFydCBwYXJhZ3JhcGggZGVsZXRpb24gY29kZSBkaWQgbm90
IHRha2UgaW50byBhY2NvdW50IHRoYXQKKyAgICAgICAgdGhlIHByZXZpb3VzIGJsYW5rIGxpbmUg
Y291bGQgYmUgdGhlIHN0YXJ0IG9mIGVkaXRhYmxlIGNvbnRlbnQgd2l0aG91dAorICAgICAgICBh
IHBhcmFncmFwaCBiZWZvcmUgaXQuIElmIHRoaXMgd2FzIHRoZSBjYXNlLCB0aGUgZGVsZXRpb24g
Y29kZSBiYWNrZWQgdXAKKyAgICAgICAgdG9vIGZhciwgYW5kIHRoZSBkZWxldGUgY29tbWFuZCBm
YWlsZWQuIFRoaXMgY2FzZSBzaG91bGQgYmUgaGFuZGxlZAorICAgICAgICBpbiB0aGUgc2FtZSB3
YXkgdGhhdCB0aGUgZGVsZXRpbmcgdGhlIGxhc3QgcGFyYWdyYXBoIGluIGVkaXRhYmxlIGNvbnRl
bnQgaXMKKyAgICAgICAgaGFuZGxlZCwgYnkgY2hlY2tpbmcgaWYgd2UgYXJlIGFscmVhZHkgYXQg
dGhlIGJlZ2lubmluZyBvZiB0aGUgZWRpdGFibGUKKyAgICAgICAgY29udGVudCB3aGVuIGV4cGFu
ZGluZyB0aGUgc2VsZWN0aW9uIGZvciBzbWFydCBwYXJhZ3JhcGggZGVsZXRpb24uCisKKyAgICAg
ICAgKiBlZGl0aW5nL0RlbGV0ZVNlbGVjdGlvbkNvbW1hbmQuY3BwOgorICAgICAgICAoV2ViQ29y
ZTo6RGVsZXRlU2VsZWN0aW9uQ29tbWFuZDo6c21hcnREZWxldGVQYXJhZ3JhcGhTcGFjZXJzKToK
KwogMjAyMC0wNi0xOSAgQW5kcmVzIEdvbnphbGV6ICA8YW5kcmVzZ18yMkBhcHBsZS5jb20+CiAK
ICAgICAgICAgQVg6IHdlYiBwcm9jZXNzIGNyYXNoIGluIEFYT2JqZWN0Q2FjaGU6OnBvc3ROb3Rp
ZmljYXRpb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0RlbGV0ZVNlbGVj
dGlvbkNvbW1hbmQuY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9EZWxldGVTZWxlY3Rpb25D
b21tYW5kLmNwcAppbmRleCAwMGE1Mjk3NGY4N2E3YjA5OTI0MjE4NzZiMmVkMTk4NGViMmJiN2Zj
Li5kNWQwYmU2OTJlZjY0YWJkMjMwMmQ4MjM5ZTJmZGY0MTA0YTk4ZGNhIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9lZGl0aW5nL0RlbGV0ZVNlbGVjdGlvbkNvbW1hbmQuY3BwCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL2VkaXRpbmcvRGVsZXRlU2VsZWN0aW9uQ29tbWFuZC5jcHAKQEAgLTE4Niw2
ICsxODYsNyBAQCB2b2lkIERlbGV0ZVNlbGVjdGlvbkNvbW1hbmQ6OnNtYXJ0RGVsZXRlUGFyYWdy
YXBoU3BhY2VycygpCiAgICAgYm9vbCBzdGFydEFuZEVuZEluU2FtZVVuc3BsaXR0YWJsZUVsZW1l
bnQgPSB1bnNwbGl0dGFibGVFbGVtZW50Rm9yUG9zaXRpb24odmlzaWJsZVN0YXJ0LmRlZXBFcXVp
dmFsZW50KCkpID09IHVuc3BsaXR0YWJsZUVsZW1lbnRGb3JQb3NpdGlvbih2aXNpYmxlRW5kLmRl
ZXBFcXVpdmFsZW50KCkpOwogICAgIHZpc2libGVTdGFydCA9IHZpc2libGVTdGFydC5wcmV2aW91
cyhDYW5ub3RDcm9zc0VkaXRpbmdCb3VuZGFyeSk7CiAgICAgdmlzaWJsZUVuZCA9IHZpc2libGVF
bmQubmV4dChDYW5ub3RDcm9zc0VkaXRpbmdCb3VuZGFyeSk7CisgICAgYm9vbCBwcmV2aW91c1Bv
c2l0aW9uSXNTdGFydE9mQ29udGVudCA9IHN0YXJ0T2ZFZGl0YWJsZUNvbnRlbnQodmlzaWJsZVN0
YXJ0KSA9PSB2aXNpYmxlU3RhcnQ7CiAgICAgYm9vbCBwcmV2aW91c1Bvc2l0aW9uSXNCbGFua1Bh
cmFncmFwaCA9IGlzQmxhbmtQYXJhZ3JhcGgodmlzaWJsZVN0YXJ0KTsKICAgICBib29sIGVuZFBv
c2l0b25Jc0JsYW5rUGFyYWdyYXBoID0gaXNCbGFua1BhcmFncmFwaCh2aXNpYmxlRW5kKTsKICAg
ICBib29sIGhhc0JsYW5rUGFyYWdyYXBoQWZ0ZXJFbmRPcklzRW5kT2ZDb250ZW50ID0gIXNlbGVj
dGlvbkVuZElzRW5kT2ZDb250ZW50ICYmIChlbmRQb3NpdG9uSXNCbGFua1BhcmFncmFwaCB8fCBz
ZWxlY3Rpb25FbmRzSW5QYXJhZ3JhcGhTZXBlcmF0b3IpOwpAQCAtMjAzLDggKzIwNCwxMiBAQCB2
b2lkIERlbGV0ZVNlbGVjdGlvbkNvbW1hbmQ6OnNtYXJ0RGVsZXRlUGFyYWdyYXBoU3BhY2Vycygp
CiAgICAgfQogICAgIGlmIChzdGFydEFuZEVuZEluU2FtZVVuc3BsaXR0YWJsZUVsZW1lbnQgJiYg
c2VsZWN0aW9uRW5kSXNFbmRPZkNvbnRlbnQgJiYgcHJldmlvdXNQb3NpdGlvbklzQmxhbmtQYXJh
Z3JhcGggJiYgc2VsZWN0aW9uRW5kc0luUGFyYWdyYXBoU2VwZXJhdG9yKSB7CiAgICAgICAgIG1f
bmVlZFBsYWNlaG9sZGVyID0gZmFsc2U7Ci0gICAgICAgIFZpc2libGVQb3NpdGlvbiBlbmRPZlBh
cmFncmFwaEJlZm9yZVN0YXJ0ID0gZW5kT2ZQYXJhZ3JhcGgoVmlzaWJsZVBvc2l0aW9uIHsgbV91
cHN0cmVhbVN0YXJ0IH0ucHJldmlvdXMoKS5wcmV2aW91cygpKTsKLSAgICAgICAgUG9zaXRpb24g
cG9zaXRpb24gPSBlbmRPZlBhcmFncmFwaEJlZm9yZVN0YXJ0LmRlZXBFcXVpdmFsZW50KCk7Cisg
ICAgICAgIFZpc2libGVQb3NpdGlvbiBlbmRPZlBhcmFncmFwaEJlZm9yZVN0YXJ0OworICAgICAg
ICBpZiAocHJldmlvdXNQb3NpdGlvbklzU3RhcnRPZkNvbnRlbnQpCisgICAgICAgICAgICBlbmRP
ZlBhcmFncmFwaEJlZm9yZVN0YXJ0ID0gZW5kT2ZQYXJhZ3JhcGgoVmlzaWJsZVBvc2l0aW9uIHsg
bV91cHN0cmVhbVN0YXJ0IH0ucHJldmlvdXMoKSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAg
IGVuZE9mUGFyYWdyYXBoQmVmb3JlU3RhcnQgPSBlbmRPZlBhcmFncmFwaChWaXNpYmxlUG9zaXRp
b24geyBtX3Vwc3RyZWFtU3RhcnQgfS5wcmV2aW91cygpLnByZXZpb3VzKCkpOworICAgICAgICBh
dXRvIHBvc2l0aW9uID0gZW5kT2ZQYXJhZ3JhcGhCZWZvcmVTdGFydC5kZWVwRXF1aXZhbGVudCgp
OwogICAgICAgICBtX3Vwc3RyZWFtU3RhcnQgPSBwb3NpdGlvbi51cHN0cmVhbSgpOwogICAgICAg
ICBtX2Rvd25zdHJlYW1TdGFydCA9IHBvc2l0aW9uLmRvd25zdHJlYW0oKTsKICAgICAgICAgbV9s
ZWFkaW5nV2hpdGVzcGFjZSA9IG1fdXBzdHJlYW1TdGFydC5sZWFkaW5nV2hpdGVzcGFjZVBvc2l0
aW9uKERPV05TVFJFQU0pOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5
b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDE1YzMyZDUyYjE2M2QwYTJkNmIxZmYzYzI4NGI1NGMz
MGI2NTU0M2QuLmUyM2RiMjgwODc1M2VkMGJkNTM2NTQ2YjQ1ZjRkMjdiOTBkY2U1MmIgMTAwNjQ0
Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK
QEAgLTEsMyArMSwxMyBAQAorMjAyMC0wNi0yMyAgTWVnYW4gR2FyZG5lciAgPG1lZ2FuX2dhcmRu
ZXJAYXBwbGUuY29tPgorCisgICAgICAgIENhbm5vdCBkZWxldGUgbGFzdCBsaW5lIG9mIE1haWwg
TWVzc2FnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
MjEzNTM2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82MzQyMDkyOD4KKworICAgICAgICBSZXZp
ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGVkaXRpbmcvZGVsZXRpbmcvc21h
cnQtZGVsZXRlLXBhcmFncmFwaC0wMDUuaHRtbDoKKwogMjAyMC0wNi0xOSAgRGllZ28gUGlubyBH
YXJjaWEgIDxkcGlub0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHTElCXSBVbnJldmlld2VkIHRl
c3QgZ2FyZGVuaW5nLiBVcGRhdGUgdGVzdCBleHBlY3RhdGlvbnMgYWZ0ZXIgcjI2MzI2OC4KZGlm
ZiAtLWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFn
cmFwaC0wMDUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9zbWFy
dC1kZWxldGUtcGFyYWdyYXBoLTAwNS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQK
aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOTI0MTgxMzYw
NGQ4NzQwZjA5Yzc2OTM0M2NmZTY1MDZlOTE0MDJlZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91
dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUtZXhwZWN0
ZWQudHh0CkBAIC0wLDAgKzEsMTMgQEAKK0VESVRJTkcgREVMRUdBVEU6IHNob3VsZEJlZ2luRWRp
dGluZ0luRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mIERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3Vt
ZW50IHRvIDIgb2YgRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQKK0VESVRJTkcgREVMRUdB
VEU6IHdlYlZpZXdEaWRCZWdpbkVkaXRpbmc6V2ViVmlld0RpZEJlZ2luRWRpdGluZ05vdGlmaWNh
dGlvbgorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3
RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRFOiBzaG91bGRD
aGFuZ2VTZWxlY3RlZERPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiBESVYgPiBESVYgPiBCT0RZID4g
SFRNTCA+ICNkb2N1bWVudCB0byAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3Vt
ZW50IHRvRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4g
I2RvY3VtZW50IHRvIDAgb2YgRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgYWZm
aW5pdHk6TlNTZWxlY3Rpb25BZmZpbml0eURvd25zdHJlYW0gc3RpbGxTZWxlY3Rpbmc6RkFMU0UK
K0VESVRJTkcgREVMRUdBVEU6IHNob3VsZENoYW5nZVNlbGVjdGVkRE9NUmFuZ2U6cmFuZ2UgZnJv
bSAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDAgb2YgRElWID4g
RElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG9ET01SYW5nZTpyYW5nZSBmcm9tIDAgb2Yg
I3RleHQgPiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0byA4IG9mICN0ZXh0
ID4gRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgYWZmaW5pdHk6TlNTZWxlY3Rp
b25BZmZpbml0eURvd25zdHJlYW0gc3RpbGxTZWxlY3Rpbmc6RkFMU0UKK0VESVRJTkcgREVMRUdB
VEU6IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5v
dGlmaWNhdGlvbgorRURJVElORyBERUxFR0FURTogc2hvdWxkRGVsZXRlRE9NUmFuZ2U6cmFuZ2Ug
ZnJvbSAwIG9mICN0ZXh0ID4gRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8g
OCBvZiAjdGV4dCA+IERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50CitFRElUSU5H
IERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uOldlYlZpZXdEaWRDaGFuZ2VTZWxl
Y3Rpb25Ob3RpZmljYXRpb24KK0VESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2U6V2Vi
Vmlld0RpZENoYW5nZU5vdGlmaWNhdGlvbgorVGVzdHM6IAorU21hcnQgZGVsZXRlIHdoZW4gZGVs
ZXRpbmcgYSBsaW5lIHdpdGggb25seSBhIGJsYW5rIGxpbmUgYWJvdmUgaXQuIFRlc3QgbXVzdCBl
eGlzdCBhdCB0aGUgdG9wIG9mIHRoZSBmaWxlIGluIG9yZGVyIHRvIGNvcnJlY3RseSB0ZXN0IHRo
ZSBvcmlnaW5hbCBidWcuCitFeHBlY3RlZCBSZXN1bHRzOiAKK0V2ZXJ5dGhpbmcgc2hvdWxkIGJl
IGRlbGV0ZWQuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL3NtYXJ0
LWRlbGV0ZS1wYXJhZ3JhcGgtMDA1Lmh0bWwgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5n
L3NtYXJ0LWRlbGV0ZS1wYXJhZ3JhcGgtMDA1Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k
ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMGQ5YWZhMDkwNWMw
OTliZjhjZmNlZTllZWYwYjUwZTU4YWVhN2JiYwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl
c3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUuaHRtbApAQCAt
MCwwICsxLDUwIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPiAKKzxoZWFkPgorPHN0eWxlPgor
LmVkaXRpbmcgeyAKKyAgICBib3JkZXI6IDJweCBzb2xpZCByZWQ7IAorICAgIGZvbnQtc2l6ZTog
MjRweDsgCit9CisuZXhwbGFuYXRpb24geyAKKyAgICBib3JkZXI6IDJweCBzb2xpZCBibHVlOyAK
KyAgICBwYWRkaW5nOiAxMnB4OyAKKyAgICBmb250LXNpemU6IDI0cHg7IAorICAgIG1hcmdpbi1i
b3R0b206IDI0cHg7Cit9Cisuc2NlbmFyaW8geyBtYXJnaW4tYm90dG9tOiAxNnB4O30KKy5zY2Vu
YXJpbzpmaXJzdC1saW5lIHsgZm9udC13ZWlnaHQ6IGJvbGQ7IG1hcmdpbi1ib3R0b206IDE2cHg7
fQorLmV4cGVjdGVkLXJlc3VsdHM6Zmlyc3QtbGluZSB7IGZvbnQtd2VpZ2h0OiBib2xkIH0KKzwv
c3R5bGU+Cis8L2hlYWQ+IAorPGJvZHk+Cis8ZGl2IGNvbnRlbnRlZGl0YWJsZT0idHJ1ZSIgc3R5
bGU9IndpZHRoOiAyNTZweDsgaGVpZ2h0OiAyNTZweDsgYm9yZGVyOiAxcHggc29saWQgYmxhY2si
Pjxicj48ZGl2IGlkPSd0ZXN0Jz5EZWxldGVNZTwvZGl2PjwvZGl2PgorCis8ZGl2IGNsYXNzPSJl
eHBsYW5hdGlvbiI+Cis8ZGl2IGNsYXNzPSJzY2VuYXJpbyI+CitUZXN0czogCis8YnI+CitTbWFy
dCBkZWxldGUgd2hlbiBkZWxldGluZyBhIGxpbmUgd2l0aCBvbmx5IGEgYmxhbmsgbGluZSBhYm92
ZSBpdC4KK1Rlc3QgbXVzdCBleGlzdCBhdCB0aGUgdG9wIG9mIHRoZSBmaWxlIGluIG9yZGVyIHRv
IGNvcnJlY3RseSB0ZXN0IHRoZSBvcmlnaW5hbCBidWcuCis8L2Rpdj4KKzxkaXYgY2xhc3M9ImV4
cGVjdGVkLXJlc3VsdHMiPgorRXhwZWN0ZWQgUmVzdWx0czoKKzxicj4KK0V2ZXJ5dGhpbmcgc2hv
dWxkIGJlIGRlbGV0ZWQuCis8L2Rpdj4KKzwvZGl2PgorCis8c2NyaXB0IHNyYz0iLi4vZWRpdGlu
Zy5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL3VpLWhlbHBlci5q
cyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorCithc3luYyBmdW5jdGlvbiBlZGl0aW5nVGVzdCgpIHsK
KyAgICBpbnRlcm5hbHMuc2V0dGluZ3Muc2V0RWRpdGluZ0JlaGF2aW9yKCJpb3MiKTsKKyAgICBh
d2FpdCBVSUhlbHBlci5zZWxlY3RXb3JkQnlEb3VibGVUYXBPckNsaWNrKGRvY3VtZW50LmdldEVs
ZW1lbnRCeUlkKCd0ZXN0JykpOworICAgIGN1dENvbW1hbmQoKTsKK30KKworcnVuRHVtcEFzVGV4
dEVkaXRpbmdUZXN0KHRydWUpOworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1n
aXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvZWRpdGluZy9kZWxldGluZy9zbWFydC1kZWxl
dGUtcGFyYWdyYXBoLTAwNS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mv
ZWRpdGluZy9kZWxldGluZy9zbWFydC1kZWxldGUtcGFyYWdyYXBoLTAwNS1leHBlY3RlZC50eHQK
bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMC4uOTI0MTgxMzYwNGQ4NzQwZjA5Yzc2OTM0M2NmZTY1MDZlOTE0MDJlZgotLS0g
L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9lZGl0aW5nL2RlbGV0aW5n
L3NtYXJ0LWRlbGV0ZS1wYXJhZ3JhcGgtMDA1LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDEzIEBA
CitFRElUSU5HIERFTEVHQVRFOiBzaG91bGRCZWdpbkVkaXRpbmdJbkRPTVJhbmdlOnJhbmdlIGZy
b20gMCBvZiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0byAyIG9mIERJViA+IEJPRFkg
PiBIVE1MID4gI2RvY3VtZW50CitFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQmVnaW5FZGl0
aW5nOldlYlZpZXdEaWRCZWdpbkVkaXRpbmdOb3RpZmljYXRpb24KK0VESVRJTkcgREVMRUdBVEU6
IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5vdGlm
aWNhdGlvbgorRURJVElORyBERUxFR0FURTogc2hvdWxkQ2hhbmdlU2VsZWN0ZWRET01SYW5nZTpy
YW5nZSBmcm9tIDAgb2YgRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gMCBv
ZiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0b0RPTVJhbmdlOnJhbmdlIGZy
b20gMCBvZiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0byAwIG9mIERJViA+
IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IGFmZmluaXR5Ok5TU2VsZWN0aW9uQWZmaW5p
dHlEb3duc3RyZWFtIHN0aWxsU2VsZWN0aW5nOkZBTFNFCitFRElUSU5HIERFTEVHQVRFOiBzaG91
bGRDaGFuZ2VTZWxlY3RlZERPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiBESVYgPiBESVYgPiBCT0RZ
ID4gSFRNTCA+ICNkb2N1bWVudCB0byAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2Rv
Y3VtZW50IHRvRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mICN0ZXh0ID4gRElWID4gRElWID4gQk9E
WSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gOCBvZiAjdGV4dCA+IERJViA+IERJViA+IEJPRFkgPiBI
VE1MID4gI2RvY3VtZW50IGFmZmluaXR5Ok5TU2VsZWN0aW9uQWZmaW5pdHlEb3duc3RyZWFtIHN0
aWxsU2VsZWN0aW5nOkZBTFNFCitFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlU2Vs
ZWN0aW9uOldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRpb24KK0VESVRJTkcgREVM
RUdBVEU6IHNob3VsZERlbGV0ZURPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiAjdGV4dCA+IERJViA+
IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDggb2YgI3RleHQgPiBESVYgPiBESVYg
PiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudAorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENo
YW5nZVNlbGVjdGlvbjpXZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCitFRElU
SU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlOldlYlZpZXdEaWRDaGFuZ2VOb3RpZmljYXRp
b24KK1Rlc3RzOiAKK1NtYXJ0IGRlbGV0ZSB3aGVuIGRlbGV0aW5nIGEgbGluZSB3aXRoIG9ubHkg
YSBibGFuayBsaW5lIGFib3ZlIGl0LiBUZXN0IG11c3QgZXhpc3QgYXQgdGhlIHRvcCBvZiB0aGUg
ZmlsZSBpbiBvcmRlciB0byBjb3JyZWN0bHkgdGVzdCB0aGUgb3JpZ2luYWwgYnVnLgorRXhwZWN0
ZWQgUmVzdWx0czogCitFdmVyeXRoaW5nIHNob3VsZCBiZSBkZWxldGVkLgpkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBh
cmFncmFwaC0wMDUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL2VkaXRp
bmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUtZXhwZWN0ZWQudHh0Cm5ldyBm
aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAuLjQyMTQzMTkwMDc0ZDAzY2ZiY2JmNmVlMDExZjE3ZDg4ZjVjNDQ1OWQKLS0tIC9kZXYv
bnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vZWRpdGluZy9kZWxldGluZy9zbWFy
dC1kZWxldGUtcGFyYWdyYXBoLTAwNS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxNCBAQAorRURJ
VElORyBERUxFR0FURTogc2hvdWxkQmVnaW5FZGl0aW5nSW5ET01SYW5nZTpyYW5nZSBmcm9tIDAg
b2YgRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gMiBvZiBESVYgPiBCT0RZID4gSFRN
TCA+ICNkb2N1bWVudAorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZEJlZ2luRWRpdGluZzpX
ZWJWaWV3RGlkQmVnaW5FZGl0aW5nTm90aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRFOiB3ZWJW
aWV3RGlkQ2hhbmdlU2VsZWN0aW9uOldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRp
b24KK0VESVRJTkcgREVMRUdBVEU6IHNob3VsZENoYW5nZVNlbGVjdGVkRE9NUmFuZ2U6cmFuZ2Ug
ZnJvbSAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDAgb2YgRElW
ID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG9ET01SYW5nZTpyYW5nZSBmcm9tIDAg
b2YgRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gMCBvZiBESVYgPiBESVYg
PiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCBhZmZpbml0eTpOU1NlbGVjdGlvbkFmZmluaXR5RG93
bnN0cmVhbSBzdGlsbFNlbGVjdGluZzpGQUxTRQorRURJVElORyBERUxFR0FURTogd2ViVmlld0Rp
ZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCitF
RElUSU5HIERFTEVHQVRFOiBzaG91bGRDaGFuZ2VTZWxlY3RlZERPTVJhbmdlOnJhbmdlIGZyb20g
MCBvZiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0byAwIG9mIERJViA+IERJ
ViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mICN0
ZXh0ID4gRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gOCBvZiAjdGV4dCA+
IERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IGFmZmluaXR5Ok5TU2VsZWN0aW9u
QWZmaW5pdHlEb3duc3RyZWFtIHN0aWxsU2VsZWN0aW5nOkZBTFNFCitFRElUSU5HIERFTEVHQVRF
OiB3ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uOldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3Rp
ZmljYXRpb24KK0VESVRJTkcgREVMRUdBVEU6IHNob3VsZERlbGV0ZURPTVJhbmdlOnJhbmdlIGZy
b20gMCBvZiAjdGV4dCA+IERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDgg
b2YgI3RleHQgPiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudAorRURJVElORyBE
RUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3RGlkQ2hhbmdlU2VsZWN0
aW9uTm90aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlOldlYlZp
ZXdEaWRDaGFuZ2VOb3RpZmljYXRpb24KK1Rlc3RzOiAKK1NtYXJ0IGRlbGV0ZSB3aGVuIGRlbGV0
aW5nIGEgbGluZSB3aXRoIG9ubHkgYSBibGFuayBsaW5lIGFib3ZlIGl0LiBUZXN0IG11c3QgZXhp
c3QgYXQgdGhlIHRvcCBvZiB0aGUgZmlsZSBpbiBvcmRlciB0byBjb3JyZWN0bHkgdGVzdCB0aGUg
b3JpZ2luYWwgYnVnLgorRXhwZWN0ZWQgUmVzdWx0czogCitFdmVyeXRoaW5nIHNob3VsZCBiZSBk
ZWxldGVkLgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402691</attachid>
            <date>2020-06-24 15:33:39 -0700</date>
            <delta_ts>2020-06-24 16:20:05 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213536-20200624153338.patch</filename>
            <type>text/plain</type>
            <size>11325</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMjkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDYyODAwYjYyNGI4YTFh
OGNlOWYyZTVlNGExN2ZmODE1YjY0MzIwMC4uMDU5NTVjNjIzMDg4ZGZlNGIyZDQ3Zjk3YWM1MzEx
MzUyMjhhYWIyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA2LTIzICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQ2Fubm90IGRl
bGV0ZSBsYXN0IGxpbmUgb2YgTWFpbCBNZXNzYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTM1MzYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYz
NDIwOTI4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
IExheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUu
aHRtbAorCisgICAgICAgIFRoZSBzbWFydCBwYXJhZ3JhcGggZGVsZXRpb24gY29kZSBkaWQgbm90
IHRha2UgaW50byBhY2NvdW50IHRoYXQKKyAgICAgICAgdGhlIHByZXZpb3VzIGJsYW5rIGxpbmUg
Y291bGQgYmUgdGhlIHN0YXJ0IG9mIGVkaXRhYmxlIGNvbnRlbnQgd2l0aG91dAorICAgICAgICBh
IHBhcmFncmFwaCBiZWZvcmUgaXQuIElmIHRoaXMgd2FzIHRoZSBjYXNlLCB0aGUgZGVsZXRpb24g
Y29kZSBiYWNrZWQgdXAKKyAgICAgICAgdG9vIGZhciwgYW5kIHRoZSBkZWxldGUgY29tbWFuZCBm
YWlsZWQuIFRoaXMgY2FzZSBzaG91bGQgYmUgaGFuZGxlZAorICAgICAgICBpbiB0aGUgc2FtZSB3
YXkgdGhhdCB0aGUgZGVsZXRpbmcgdGhlIGxhc3QgcGFyYWdyYXBoIGluIGVkaXRhYmxlIGNvbnRl
bnQgaXMKKyAgICAgICAgaGFuZGxlZCwgYnkgY2hlY2tpbmcgaWYgd2UgYXJlIGFscmVhZHkgYXQg
dGhlIGJlZ2lubmluZyBvZiB0aGUgZWRpdGFibGUKKyAgICAgICAgY29udGVudCB3aGVuIGV4cGFu
ZGluZyB0aGUgc2VsZWN0aW9uIGZvciBzbWFydCBwYXJhZ3JhcGggZGVsZXRpb24uCisKKyAgICAg
ICAgKiBlZGl0aW5nL0RlbGV0ZVNlbGVjdGlvbkNvbW1hbmQuY3BwOgorICAgICAgICAoV2ViQ29y
ZTo6RGVsZXRlU2VsZWN0aW9uQ29tbWFuZDo6c21hcnREZWxldGVQYXJhZ3JhcGhTcGFjZXJzKToK
KwogMjAyMC0wNi0xOSAgQW5kcmVzIEdvbnphbGV6ICA8YW5kcmVzZ18yMkBhcHBsZS5jb20+CiAK
ICAgICAgICAgQVg6IHdlYiBwcm9jZXNzIGNyYXNoIGluIEFYT2JqZWN0Q2FjaGU6OnBvc3ROb3Rp
ZmljYXRpb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0RlbGV0ZVNlbGVj
dGlvbkNvbW1hbmQuY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9EZWxldGVTZWxlY3Rpb25D
b21tYW5kLmNwcAppbmRleCAwMGE1Mjk3NGY4N2E3YjA5OTI0MjE4NzZiMmVkMTk4NGViMmJiN2Zj
Li5kNWQwYmU2OTJlZjY0YWJkMjMwMmQ4MjM5ZTJmZGY0MTA0YTk4ZGNhIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9lZGl0aW5nL0RlbGV0ZVNlbGVjdGlvbkNvbW1hbmQuY3BwCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL2VkaXRpbmcvRGVsZXRlU2VsZWN0aW9uQ29tbWFuZC5jcHAKQEAgLTE4Niw2
ICsxODYsNyBAQCB2b2lkIERlbGV0ZVNlbGVjdGlvbkNvbW1hbmQ6OnNtYXJ0RGVsZXRlUGFyYWdy
YXBoU3BhY2VycygpCiAgICAgYm9vbCBzdGFydEFuZEVuZEluU2FtZVVuc3BsaXR0YWJsZUVsZW1l
bnQgPSB1bnNwbGl0dGFibGVFbGVtZW50Rm9yUG9zaXRpb24odmlzaWJsZVN0YXJ0LmRlZXBFcXVp
dmFsZW50KCkpID09IHVuc3BsaXR0YWJsZUVsZW1lbnRGb3JQb3NpdGlvbih2aXNpYmxlRW5kLmRl
ZXBFcXVpdmFsZW50KCkpOwogICAgIHZpc2libGVTdGFydCA9IHZpc2libGVTdGFydC5wcmV2aW91
cyhDYW5ub3RDcm9zc0VkaXRpbmdCb3VuZGFyeSk7CiAgICAgdmlzaWJsZUVuZCA9IHZpc2libGVF
bmQubmV4dChDYW5ub3RDcm9zc0VkaXRpbmdCb3VuZGFyeSk7CisgICAgYm9vbCBwcmV2aW91c1Bv
c2l0aW9uSXNTdGFydE9mQ29udGVudCA9IHN0YXJ0T2ZFZGl0YWJsZUNvbnRlbnQodmlzaWJsZVN0
YXJ0KSA9PSB2aXNpYmxlU3RhcnQ7CiAgICAgYm9vbCBwcmV2aW91c1Bvc2l0aW9uSXNCbGFua1Bh
cmFncmFwaCA9IGlzQmxhbmtQYXJhZ3JhcGgodmlzaWJsZVN0YXJ0KTsKICAgICBib29sIGVuZFBv
c2l0b25Jc0JsYW5rUGFyYWdyYXBoID0gaXNCbGFua1BhcmFncmFwaCh2aXNpYmxlRW5kKTsKICAg
ICBib29sIGhhc0JsYW5rUGFyYWdyYXBoQWZ0ZXJFbmRPcklzRW5kT2ZDb250ZW50ID0gIXNlbGVj
dGlvbkVuZElzRW5kT2ZDb250ZW50ICYmIChlbmRQb3NpdG9uSXNCbGFua1BhcmFncmFwaCB8fCBz
ZWxlY3Rpb25FbmRzSW5QYXJhZ3JhcGhTZXBlcmF0b3IpOwpAQCAtMjAzLDggKzIwNCwxMiBAQCB2
b2lkIERlbGV0ZVNlbGVjdGlvbkNvbW1hbmQ6OnNtYXJ0RGVsZXRlUGFyYWdyYXBoU3BhY2Vycygp
CiAgICAgfQogICAgIGlmIChzdGFydEFuZEVuZEluU2FtZVVuc3BsaXR0YWJsZUVsZW1lbnQgJiYg
c2VsZWN0aW9uRW5kSXNFbmRPZkNvbnRlbnQgJiYgcHJldmlvdXNQb3NpdGlvbklzQmxhbmtQYXJh
Z3JhcGggJiYgc2VsZWN0aW9uRW5kc0luUGFyYWdyYXBoU2VwZXJhdG9yKSB7CiAgICAgICAgIG1f
bmVlZFBsYWNlaG9sZGVyID0gZmFsc2U7Ci0gICAgICAgIFZpc2libGVQb3NpdGlvbiBlbmRPZlBh
cmFncmFwaEJlZm9yZVN0YXJ0ID0gZW5kT2ZQYXJhZ3JhcGgoVmlzaWJsZVBvc2l0aW9uIHsgbV91
cHN0cmVhbVN0YXJ0IH0ucHJldmlvdXMoKS5wcmV2aW91cygpKTsKLSAgICAgICAgUG9zaXRpb24g
cG9zaXRpb24gPSBlbmRPZlBhcmFncmFwaEJlZm9yZVN0YXJ0LmRlZXBFcXVpdmFsZW50KCk7Cisg
ICAgICAgIFZpc2libGVQb3NpdGlvbiBlbmRPZlBhcmFncmFwaEJlZm9yZVN0YXJ0OworICAgICAg
ICBpZiAocHJldmlvdXNQb3NpdGlvbklzU3RhcnRPZkNvbnRlbnQpCisgICAgICAgICAgICBlbmRP
ZlBhcmFncmFwaEJlZm9yZVN0YXJ0ID0gZW5kT2ZQYXJhZ3JhcGgoVmlzaWJsZVBvc2l0aW9uIHsg
bV91cHN0cmVhbVN0YXJ0IH0ucHJldmlvdXMoKSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAg
IGVuZE9mUGFyYWdyYXBoQmVmb3JlU3RhcnQgPSBlbmRPZlBhcmFncmFwaChWaXNpYmxlUG9zaXRp
b24geyBtX3Vwc3RyZWFtU3RhcnQgfS5wcmV2aW91cygpLnByZXZpb3VzKCkpOworICAgICAgICBh
dXRvIHBvc2l0aW9uID0gZW5kT2ZQYXJhZ3JhcGhCZWZvcmVTdGFydC5kZWVwRXF1aXZhbGVudCgp
OwogICAgICAgICBtX3Vwc3RyZWFtU3RhcnQgPSBwb3NpdGlvbi51cHN0cmVhbSgpOwogICAgICAg
ICBtX2Rvd25zdHJlYW1TdGFydCA9IHBvc2l0aW9uLmRvd25zdHJlYW0oKTsKICAgICAgICAgbV9s
ZWFkaW5nV2hpdGVzcGFjZSA9IG1fdXBzdHJlYW1TdGFydC5sZWFkaW5nV2hpdGVzcGFjZVBvc2l0
aW9uKERPV05TVFJFQU0pOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5
b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDE1YzMyZDUyYjE2M2QwYTJkNmIxZmYzYzI4NGI1NGMz
MGI2NTU0M2QuLmUyM2RiMjgwODc1M2VkMGJkNTM2NTQ2YjQ1ZjRkMjdiOTBkY2U1MmIgMTAwNjQ0
Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK
QEAgLTEsMyArMSwxMyBAQAorMjAyMC0wNi0yMyAgTWVnYW4gR2FyZG5lciAgPG1lZ2FuX2dhcmRu
ZXJAYXBwbGUuY29tPgorCisgICAgICAgIENhbm5vdCBkZWxldGUgbGFzdCBsaW5lIG9mIE1haWwg
TWVzc2FnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
MjEzNTM2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82MzQyMDkyOD4KKworICAgICAgICBSZXZp
ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGVkaXRpbmcvZGVsZXRpbmcvc21h
cnQtZGVsZXRlLXBhcmFncmFwaC0wMDUuaHRtbDoKKwogMjAyMC0wNi0xOSAgRGllZ28gUGlubyBH
YXJjaWEgIDxkcGlub0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHTElCXSBVbnJldmlld2VkIHRl
c3QgZ2FyZGVuaW5nLiBVcGRhdGUgdGVzdCBleHBlY3RhdGlvbnMgYWZ0ZXIgcjI2MzI2OC4KZGlm
ZiAtLWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFn
cmFwaC0wMDUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9zbWFy
dC1kZWxldGUtcGFyYWdyYXBoLTAwNS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQK
aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMGY2MmRhMzNm
MTY2MWIxZDc3ZWFhNGJlNmU4ZGUxMDIxOTI5MmM5NQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91
dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUtZXhwZWN0
ZWQudHh0CkBAIC0wLDAgKzEsMTIgQEAKK0VESVRJTkcgREVMRUdBVEU6IHNob3VsZEJlZ2luRWRp
dGluZ0luRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mIERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3Vt
ZW50IHRvIDIgb2YgRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQKK0VESVRJTkcgREVMRUdB
VEU6IHdlYlZpZXdEaWRCZWdpbkVkaXRpbmc6V2ViVmlld0RpZEJlZ2luRWRpdGluZ05vdGlmaWNh
dGlvbgorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3
RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRFOiBzaG91bGRD
aGFuZ2VTZWxlY3RlZERPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiBESVYgPiBESVYgPiBCT0RZID4g
SFRNTCA+ICNkb2N1bWVudCB0byAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3Vt
ZW50IHRvRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mICN0ZXh0ID4gRElWID4gRElWID4gQk9EWSA+
IEhUTUwgPiAjZG9jdW1lbnQgdG8gOCBvZiAjdGV4dCA+IERJViA+IERJViA+IEJPRFkgPiBIVE1M
ID4gI2RvY3VtZW50IGFmZmluaXR5Ok5TU2VsZWN0aW9uQWZmaW5pdHlEb3duc3RyZWFtIHN0aWxs
U2VsZWN0aW5nOkZBTFNFCitFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0
aW9uOldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRpb24KK0VESVRJTkcgREVMRUdB
VEU6IHNob3VsZERlbGV0ZURPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiAjdGV4dCA+IERJViA+IERJ
ViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDggb2YgI3RleHQgPiBESVYgPiBESVYgPiBC
T0RZID4gSFRNTCA+ICNkb2N1bWVudAorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5n
ZVNlbGVjdGlvbjpXZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCitFRElUSU5H
IERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlOldlYlZpZXdEaWRDaGFuZ2VOb3RpZmljYXRpb24K
K1Rlc3RzOiAKK1NtYXJ0IGRlbGV0ZSB3aGVuIGRlbGV0aW5nIGEgbGluZSB3aXRoIG9ubHkgYSBi
bGFuayBsaW5lIGFib3ZlIGl0LiBUZXN0IG11c3QgZXhpc3QgYXQgdGhlIHRvcCBvZiB0aGUgZmls
ZSBpbiBvcmRlciB0byBjb3JyZWN0bHkgdGVzdCB0aGUgb3JpZ2luYWwgYnVnLgorRXhwZWN0ZWQg
UmVzdWx0czogCitFdmVyeXRoaW5nIHNob3VsZCBiZSBkZWxldGVkLgpkaWZmIC0tZ2l0IGEvTGF5
b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9zbWFydC1kZWxldGUtcGFyYWdyYXBoLTAwNS5odG1s
IGIvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9zbWFydC1kZWxldGUtcGFyYWdyYXBoLTAw
NS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAuLjBkOWFmYTA5MDVjMDk5YmY4Y2ZjZWU5ZWVmMGI1MGU1OGFlYTdi
YmMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL3NtYXJ0
LWRlbGV0ZS1wYXJhZ3JhcGgtMDA1Lmh0bWwKQEAgLTAsMCArMSw1MCBAQAorPCFET0NUWVBFIGh0
bWw+Cis8aHRtbD4gCis8aGVhZD4KKzxzdHlsZT4KKy5lZGl0aW5nIHsgCisgICAgYm9yZGVyOiAy
cHggc29saWQgcmVkOyAKKyAgICBmb250LXNpemU6IDI0cHg7IAorfQorLmV4cGxhbmF0aW9uIHsg
CisgICAgYm9yZGVyOiAycHggc29saWQgYmx1ZTsgCisgICAgcGFkZGluZzogMTJweDsgCisgICAg
Zm9udC1zaXplOiAyNHB4OyAKKyAgICBtYXJnaW4tYm90dG9tOiAyNHB4OworfQorLnNjZW5hcmlv
IHsgbWFyZ2luLWJvdHRvbTogMTZweDt9Cisuc2NlbmFyaW86Zmlyc3QtbGluZSB7IGZvbnQtd2Vp
Z2h0OiBib2xkOyBtYXJnaW4tYm90dG9tOiAxNnB4O30KKy5leHBlY3RlZC1yZXN1bHRzOmZpcnN0
LWxpbmUgeyBmb250LXdlaWdodDogYm9sZCB9Cis8L3N0eWxlPgorPC9oZWFkPiAKKzxib2R5Pgor
PGRpdiBjb250ZW50ZWRpdGFibGU9InRydWUiIHN0eWxlPSJ3aWR0aDogMjU2cHg7IGhlaWdodDog
MjU2cHg7IGJvcmRlcjogMXB4IHNvbGlkIGJsYWNrIj48YnI+PGRpdiBpZD0ndGVzdCc+RGVsZXRl
TWU8L2Rpdj48L2Rpdj4KKworPGRpdiBjbGFzcz0iZXhwbGFuYXRpb24iPgorPGRpdiBjbGFzcz0i
c2NlbmFyaW8iPgorVGVzdHM6IAorPGJyPgorU21hcnQgZGVsZXRlIHdoZW4gZGVsZXRpbmcgYSBs
aW5lIHdpdGggb25seSBhIGJsYW5rIGxpbmUgYWJvdmUgaXQuCitUZXN0IG11c3QgZXhpc3QgYXQg
dGhlIHRvcCBvZiB0aGUgZmlsZSBpbiBvcmRlciB0byBjb3JyZWN0bHkgdGVzdCB0aGUgb3JpZ2lu
YWwgYnVnLgorPC9kaXY+Cis8ZGl2IGNsYXNzPSJleHBlY3RlZC1yZXN1bHRzIj4KK0V4cGVjdGVk
IFJlc3VsdHM6Cis8YnI+CitFdmVyeXRoaW5nIHNob3VsZCBiZSBkZWxldGVkLgorPC9kaXY+Cis8
L2Rpdj4KKworPHNjcmlwdCBzcmM9Ii4uL2VkaXRpbmcuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBz
cmM9Ii4uLy4uL3Jlc291cmNlcy91aS1oZWxwZXIuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KKwor
YXN5bmMgZnVuY3Rpb24gZWRpdGluZ1Rlc3QoKSB7CisgICAgaW50ZXJuYWxzLnNldHRpbmdzLnNl
dEVkaXRpbmdCZWhhdmlvcigiaW9zIik7CisgICAgYXdhaXQgVUlIZWxwZXIuc2VsZWN0V29yZEJ5
RG91YmxlVGFwT3JDbGljayhkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGVzdCcpKTsKKyAgICBj
dXRDb21tYW5kKCk7Cit9CisKK3J1bkR1bXBBc1RleHRFZGl0aW5nVGVzdCh0cnVlKTsKKzwvc2Ny
aXB0PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0v
aW9zL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUtZXhwZWN0ZWQu
dHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVs
ZXRlLXBhcmFncmFwaC0wMDUtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4
IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjkyNDE4MTM2MDRkODc0
MGYwOWM3NjkzNDNjZmU2NTA2ZTkxNDAyZWYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0
cy9wbGF0Zm9ybS9pb3MvZWRpdGluZy9kZWxldGluZy9zbWFydC1kZWxldGUtcGFyYWdyYXBoLTAw
NS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxMyBAQAorRURJVElORyBERUxFR0FURTogc2hvdWxk
QmVnaW5FZGl0aW5nSW5ET01SYW5nZTpyYW5nZSBmcm9tIDAgb2YgRElWID4gQk9EWSA+IEhUTUwg
PiAjZG9jdW1lbnQgdG8gMiBvZiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudAorRURJVElO
RyBERUxFR0FURTogd2ViVmlld0RpZEJlZ2luRWRpdGluZzpXZWJWaWV3RGlkQmVnaW5FZGl0aW5n
Tm90aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9u
OldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRpb24KK0VESVRJTkcgREVMRUdBVEU6
IHNob3VsZENoYW5nZVNlbGVjdGVkRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mIERJViA+IERJViA+
IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDAgb2YgRElWID4gRElWID4gQk9EWSA+IEhUTUwg
PiAjZG9jdW1lbnQgdG9ET01SYW5nZTpyYW5nZSBmcm9tIDAgb2YgRElWID4gRElWID4gQk9EWSA+
IEhUTUwgPiAjZG9jdW1lbnQgdG8gMCBvZiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1
bWVudCBhZmZpbml0eTpOU1NlbGVjdGlvbkFmZmluaXR5RG93bnN0cmVhbSBzdGlsbFNlbGVjdGlu
ZzpGQUxTRQorRURJVElORyBERUxFR0FURTogc2hvdWxkQ2hhbmdlU2VsZWN0ZWRET01SYW5nZTpy
YW5nZSBmcm9tIDAgb2YgRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gMCBv
ZiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0b0RPTVJhbmdlOnJhbmdlIGZy
b20gMCBvZiAjdGV4dCA+IERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDgg
b2YgI3RleHQgPiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCBhZmZpbml0eTpO
U1NlbGVjdGlvbkFmZmluaXR5RG93bnN0cmVhbSBzdGlsbFNlbGVjdGluZzpGQUxTRQorRURJVElO
RyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3RGlkQ2hhbmdlU2Vs
ZWN0aW9uTm90aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRFOiBzaG91bGREZWxldGVET01SYW5n
ZTpyYW5nZSBmcm9tIDAgb2YgI3RleHQgPiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1
bWVudCB0byA4IG9mICN0ZXh0ID4gRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQK
K0VESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246V2ViVmlld0RpZENo
YW5nZVNlbGVjdGlvbk5vdGlmaWNhdGlvbgorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENo
YW5nZTpXZWJWaWV3RGlkQ2hhbmdlTm90aWZpY2F0aW9uCitUZXN0czogCitTbWFydCBkZWxldGUg
d2hlbiBkZWxldGluZyBhIGxpbmUgd2l0aCBvbmx5IGEgYmxhbmsgbGluZSBhYm92ZSBpdC4gVGVz
dCBtdXN0IGV4aXN0IGF0IHRoZSB0b3Agb2YgdGhlIGZpbGUgaW4gb3JkZXIgdG8gY29ycmVjdGx5
IHRlc3QgdGhlIG9yaWdpbmFsIGJ1Zy4KK0V4cGVjdGVkIFJlc3VsdHM6IAorRXZlcnl0aGluZyBz
aG91bGQgYmUgZGVsZXRlZC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9l
ZGl0aW5nL2RlbGV0aW5nL3NtYXJ0LWRlbGV0ZS1wYXJhZ3JhcGgtMDA1LWV4cGVjdGVkLnR4dCBi
L0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9lZGl0aW5nL2RlbGV0aW5nL3NtYXJ0LWRlbGV0ZS1w
YXJhZ3JhcGgtMDA1LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40MjE0MzE5MDA3NGQwM2NmYmNi
ZjZlZTAxMWYxN2Q4OGY1YzQ0NTlkCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvcGxh
dGZvcm0vd2luL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUtZXhw
ZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTQgQEAKK0VESVRJTkcgREVMRUdBVEU6IHNob3VsZEJlZ2lu
RWRpdGluZ0luRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mIERJViA+IEJPRFkgPiBIVE1MID4gI2Rv
Y3VtZW50IHRvIDIgb2YgRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQKK0VESVRJTkcgREVM
RUdBVEU6IHdlYlZpZXdEaWRCZWdpbkVkaXRpbmc6V2ViVmlld0RpZEJlZ2luRWRpdGluZ05vdGlm
aWNhdGlvbgorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpXZWJW
aWV3RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRFOiBzaG91
bGRDaGFuZ2VTZWxlY3RlZERPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiBESVYgPiBESVYgPiBCT0RZ
ID4gSFRNTCA+ICNkb2N1bWVudCB0byAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2Rv
Y3VtZW50IHRvRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1M
ID4gI2RvY3VtZW50IHRvIDAgb2YgRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQg
YWZmaW5pdHk6TlNTZWxlY3Rpb25BZmZpbml0eURvd25zdHJlYW0gc3RpbGxTZWxlY3Rpbmc6RkFM
U0UKK0VESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246V2ViVmlld0Rp
ZENoYW5nZVNlbGVjdGlvbk5vdGlmaWNhdGlvbgorRURJVElORyBERUxFR0FURTogc2hvdWxkQ2hh
bmdlU2VsZWN0ZWRET01SYW5nZTpyYW5nZSBmcm9tIDAgb2YgRElWID4gRElWID4gQk9EWSA+IEhU
TUwgPiAjZG9jdW1lbnQgdG8gMCBvZiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVu
dCB0b0RPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiAjdGV4dCA+IERJViA+IERJViA+IEJPRFkgPiBI
VE1MID4gI2RvY3VtZW50IHRvIDggb2YgI3RleHQgPiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+
ICNkb2N1bWVudCBhZmZpbml0eTpOU1NlbGVjdGlvbkFmZmluaXR5RG93bnN0cmVhbSBzdGlsbFNl
bGVjdGluZzpGQUxTRQorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlv
bjpXZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRF
OiBzaG91bGREZWxldGVET01SYW5nZTpyYW5nZSBmcm9tIDAgb2YgI3RleHQgPiBESVYgPiBESVYg
PiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0byA4IG9mICN0ZXh0ID4gRElWID4gRElWID4gQk9E
WSA+IEhUTUwgPiAjZG9jdW1lbnQKK0VESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2VT
ZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5vdGlmaWNhdGlvbgorRURJVElORyBE
RUxFR0FURTogd2ViVmlld0RpZENoYW5nZTpXZWJWaWV3RGlkQ2hhbmdlTm90aWZpY2F0aW9uCitU
ZXN0czogCitTbWFydCBkZWxldGUgd2hlbiBkZWxldGluZyBhIGxpbmUgd2l0aCBvbmx5IGEgYmxh
bmsgbGluZSBhYm92ZSBpdC4gVGVzdCBtdXN0IGV4aXN0IGF0IHRoZSB0b3Agb2YgdGhlIGZpbGUg
aW4gb3JkZXIgdG8gY29ycmVjdGx5IHRlc3QgdGhlIG9yaWdpbmFsIGJ1Zy4KK0V4cGVjdGVkIFJl
c3VsdHM6IAorRXZlcnl0aGluZyBzaG91bGQgYmUgZGVsZXRlZC4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402695</attachid>
            <date>2020-06-24 16:20:06 -0700</date>
            <delta_ts>2020-06-24 17:14:56 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213536-20200624162006.patch</filename>
            <type>text/plain</type>
            <size>11409</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMjkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDYyODAwYjYyNGI4YTFh
OGNlOWYyZTVlNGExN2ZmODE1YjY0MzIwMC4uMDU5NTVjNjIzMDg4ZGZlNGIyZDQ3Zjk3YWM1MzEx
MzUyMjhhYWIyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA2LTIzICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQ2Fubm90IGRl
bGV0ZSBsYXN0IGxpbmUgb2YgTWFpbCBNZXNzYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTM1MzYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYz
NDIwOTI4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
IExheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUu
aHRtbAorCisgICAgICAgIFRoZSBzbWFydCBwYXJhZ3JhcGggZGVsZXRpb24gY29kZSBkaWQgbm90
IHRha2UgaW50byBhY2NvdW50IHRoYXQKKyAgICAgICAgdGhlIHByZXZpb3VzIGJsYW5rIGxpbmUg
Y291bGQgYmUgdGhlIHN0YXJ0IG9mIGVkaXRhYmxlIGNvbnRlbnQgd2l0aG91dAorICAgICAgICBh
IHBhcmFncmFwaCBiZWZvcmUgaXQuIElmIHRoaXMgd2FzIHRoZSBjYXNlLCB0aGUgZGVsZXRpb24g
Y29kZSBiYWNrZWQgdXAKKyAgICAgICAgdG9vIGZhciwgYW5kIHRoZSBkZWxldGUgY29tbWFuZCBm
YWlsZWQuIFRoaXMgY2FzZSBzaG91bGQgYmUgaGFuZGxlZAorICAgICAgICBpbiB0aGUgc2FtZSB3
YXkgdGhhdCB0aGUgZGVsZXRpbmcgdGhlIGxhc3QgcGFyYWdyYXBoIGluIGVkaXRhYmxlIGNvbnRl
bnQgaXMKKyAgICAgICAgaGFuZGxlZCwgYnkgY2hlY2tpbmcgaWYgd2UgYXJlIGFscmVhZHkgYXQg
dGhlIGJlZ2lubmluZyBvZiB0aGUgZWRpdGFibGUKKyAgICAgICAgY29udGVudCB3aGVuIGV4cGFu
ZGluZyB0aGUgc2VsZWN0aW9uIGZvciBzbWFydCBwYXJhZ3JhcGggZGVsZXRpb24uCisKKyAgICAg
ICAgKiBlZGl0aW5nL0RlbGV0ZVNlbGVjdGlvbkNvbW1hbmQuY3BwOgorICAgICAgICAoV2ViQ29y
ZTo6RGVsZXRlU2VsZWN0aW9uQ29tbWFuZDo6c21hcnREZWxldGVQYXJhZ3JhcGhTcGFjZXJzKToK
KwogMjAyMC0wNi0xOSAgQW5kcmVzIEdvbnphbGV6ICA8YW5kcmVzZ18yMkBhcHBsZS5jb20+CiAK
ICAgICAgICAgQVg6IHdlYiBwcm9jZXNzIGNyYXNoIGluIEFYT2JqZWN0Q2FjaGU6OnBvc3ROb3Rp
ZmljYXRpb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0RlbGV0ZVNlbGVj
dGlvbkNvbW1hbmQuY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9EZWxldGVTZWxlY3Rpb25D
b21tYW5kLmNwcAppbmRleCAwMGE1Mjk3NGY4N2E3YjA5OTI0MjE4NzZiMmVkMTk4NGViMmJiN2Zj
Li5kNWQwYmU2OTJlZjY0YWJkMjMwMmQ4MjM5ZTJmZGY0MTA0YTk4ZGNhIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9lZGl0aW5nL0RlbGV0ZVNlbGVjdGlvbkNvbW1hbmQuY3BwCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL2VkaXRpbmcvRGVsZXRlU2VsZWN0aW9uQ29tbWFuZC5jcHAKQEAgLTE4Niw2
ICsxODYsNyBAQCB2b2lkIERlbGV0ZVNlbGVjdGlvbkNvbW1hbmQ6OnNtYXJ0RGVsZXRlUGFyYWdy
YXBoU3BhY2VycygpCiAgICAgYm9vbCBzdGFydEFuZEVuZEluU2FtZVVuc3BsaXR0YWJsZUVsZW1l
bnQgPSB1bnNwbGl0dGFibGVFbGVtZW50Rm9yUG9zaXRpb24odmlzaWJsZVN0YXJ0LmRlZXBFcXVp
dmFsZW50KCkpID09IHVuc3BsaXR0YWJsZUVsZW1lbnRGb3JQb3NpdGlvbih2aXNpYmxlRW5kLmRl
ZXBFcXVpdmFsZW50KCkpOwogICAgIHZpc2libGVTdGFydCA9IHZpc2libGVTdGFydC5wcmV2aW91
cyhDYW5ub3RDcm9zc0VkaXRpbmdCb3VuZGFyeSk7CiAgICAgdmlzaWJsZUVuZCA9IHZpc2libGVF
bmQubmV4dChDYW5ub3RDcm9zc0VkaXRpbmdCb3VuZGFyeSk7CisgICAgYm9vbCBwcmV2aW91c1Bv
c2l0aW9uSXNTdGFydE9mQ29udGVudCA9IHN0YXJ0T2ZFZGl0YWJsZUNvbnRlbnQodmlzaWJsZVN0
YXJ0KSA9PSB2aXNpYmxlU3RhcnQ7CiAgICAgYm9vbCBwcmV2aW91c1Bvc2l0aW9uSXNCbGFua1Bh
cmFncmFwaCA9IGlzQmxhbmtQYXJhZ3JhcGgodmlzaWJsZVN0YXJ0KTsKICAgICBib29sIGVuZFBv
c2l0b25Jc0JsYW5rUGFyYWdyYXBoID0gaXNCbGFua1BhcmFncmFwaCh2aXNpYmxlRW5kKTsKICAg
ICBib29sIGhhc0JsYW5rUGFyYWdyYXBoQWZ0ZXJFbmRPcklzRW5kT2ZDb250ZW50ID0gIXNlbGVj
dGlvbkVuZElzRW5kT2ZDb250ZW50ICYmIChlbmRQb3NpdG9uSXNCbGFua1BhcmFncmFwaCB8fCBz
ZWxlY3Rpb25FbmRzSW5QYXJhZ3JhcGhTZXBlcmF0b3IpOwpAQCAtMjAzLDggKzIwNCwxMiBAQCB2
b2lkIERlbGV0ZVNlbGVjdGlvbkNvbW1hbmQ6OnNtYXJ0RGVsZXRlUGFyYWdyYXBoU3BhY2Vycygp
CiAgICAgfQogICAgIGlmIChzdGFydEFuZEVuZEluU2FtZVVuc3BsaXR0YWJsZUVsZW1lbnQgJiYg
c2VsZWN0aW9uRW5kSXNFbmRPZkNvbnRlbnQgJiYgcHJldmlvdXNQb3NpdGlvbklzQmxhbmtQYXJh
Z3JhcGggJiYgc2VsZWN0aW9uRW5kc0luUGFyYWdyYXBoU2VwZXJhdG9yKSB7CiAgICAgICAgIG1f
bmVlZFBsYWNlaG9sZGVyID0gZmFsc2U7Ci0gICAgICAgIFZpc2libGVQb3NpdGlvbiBlbmRPZlBh
cmFncmFwaEJlZm9yZVN0YXJ0ID0gZW5kT2ZQYXJhZ3JhcGgoVmlzaWJsZVBvc2l0aW9uIHsgbV91
cHN0cmVhbVN0YXJ0IH0ucHJldmlvdXMoKS5wcmV2aW91cygpKTsKLSAgICAgICAgUG9zaXRpb24g
cG9zaXRpb24gPSBlbmRPZlBhcmFncmFwaEJlZm9yZVN0YXJ0LmRlZXBFcXVpdmFsZW50KCk7Cisg
ICAgICAgIFZpc2libGVQb3NpdGlvbiBlbmRPZlBhcmFncmFwaEJlZm9yZVN0YXJ0OworICAgICAg
ICBpZiAocHJldmlvdXNQb3NpdGlvbklzU3RhcnRPZkNvbnRlbnQpCisgICAgICAgICAgICBlbmRP
ZlBhcmFncmFwaEJlZm9yZVN0YXJ0ID0gZW5kT2ZQYXJhZ3JhcGgoVmlzaWJsZVBvc2l0aW9uIHsg
bV91cHN0cmVhbVN0YXJ0IH0ucHJldmlvdXMoKSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAg
IGVuZE9mUGFyYWdyYXBoQmVmb3JlU3RhcnQgPSBlbmRPZlBhcmFncmFwaChWaXNpYmxlUG9zaXRp
b24geyBtX3Vwc3RyZWFtU3RhcnQgfS5wcmV2aW91cygpLnByZXZpb3VzKCkpOworICAgICAgICBh
dXRvIHBvc2l0aW9uID0gZW5kT2ZQYXJhZ3JhcGhCZWZvcmVTdGFydC5kZWVwRXF1aXZhbGVudCgp
OwogICAgICAgICBtX3Vwc3RyZWFtU3RhcnQgPSBwb3NpdGlvbi51cHN0cmVhbSgpOwogICAgICAg
ICBtX2Rvd25zdHJlYW1TdGFydCA9IHBvc2l0aW9uLmRvd25zdHJlYW0oKTsKICAgICAgICAgbV9s
ZWFkaW5nV2hpdGVzcGFjZSA9IG1fdXBzdHJlYW1TdGFydC5sZWFkaW5nV2hpdGVzcGFjZVBvc2l0
aW9uKERPV05TVFJFQU0pOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5
b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDE1YzMyZDUyYjE2M2QwYTJkNmIxZmYzYzI4NGI1NGMz
MGI2NTU0M2QuLmUyM2RiMjgwODc1M2VkMGJkNTM2NTQ2YjQ1ZjRkMjdiOTBkY2U1MmIgMTAwNjQ0
Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK
QEAgLTEsMyArMSwxMyBAQAorMjAyMC0wNi0yMyAgTWVnYW4gR2FyZG5lciAgPG1lZ2FuX2dhcmRu
ZXJAYXBwbGUuY29tPgorCisgICAgICAgIENhbm5vdCBkZWxldGUgbGFzdCBsaW5lIG9mIE1haWwg
TWVzc2FnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
MjEzNTM2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82MzQyMDkyOD4KKworICAgICAgICBSZXZp
ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGVkaXRpbmcvZGVsZXRpbmcvc21h
cnQtZGVsZXRlLXBhcmFncmFwaC0wMDUuaHRtbDoKKwogMjAyMC0wNi0xOSAgRGllZ28gUGlubyBH
YXJjaWEgIDxkcGlub0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHTElCXSBVbnJldmlld2VkIHRl
c3QgZ2FyZGVuaW5nLiBVcGRhdGUgdGVzdCBleHBlY3RhdGlvbnMgYWZ0ZXIgcjI2MzI2OC4KZGlm
ZiAtLWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFn
cmFwaC0wMDUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9zbWFy
dC1kZWxldGUtcGFyYWdyYXBoLTAwNS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQK
aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMjFkN2Q2NDdk
MjM4ZGQ0OGUyMGU5OWEwMTM5YjY1ZTQ0ZTA0Y2U1YQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91
dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUtZXhwZWN0
ZWQudHh0CkBAIC0wLDAgKzEsMTIgQEAKK0VESVRJTkcgREVMRUdBVEU6IHNob3VsZEJlZ2luRWRp
dGluZ0luRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mIERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3Vt
ZW50IHRvIDIgb2YgRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQKK0VESVRJTkcgREVMRUdB
VEU6IHdlYlZpZXdEaWRCZWdpbkVkaXRpbmc6V2ViVmlld0RpZEJlZ2luRWRpdGluZ05vdGlmaWNh
dGlvbgorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3
RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRFOiBzaG91bGRD
aGFuZ2VTZWxlY3RlZERPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiBESVYgPiBESVYgPiBCT0RZID4g
SFRNTCA+ICNkb2N1bWVudCB0byAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3Vt
ZW50IHRvRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mICN0ZXh0ID4gRElWID4gRElWID4gQk9EWSA+
IEhUTUwgPiAjZG9jdW1lbnQgdG8gOCBvZiAjdGV4dCA+IERJViA+IERJViA+IEJPRFkgPiBIVE1M
ID4gI2RvY3VtZW50IGFmZmluaXR5Ok5TU2VsZWN0aW9uQWZmaW5pdHlEb3duc3RyZWFtIHN0aWxs
U2VsZWN0aW5nOkZBTFNFCitFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0
aW9uOldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRpb24KK0VESVRJTkcgREVMRUdB
VEU6IHNob3VsZERlbGV0ZURPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiAjdGV4dCA+IERJViA+IERJ
ViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDggb2YgI3RleHQgPiBESVYgPiBESVYgPiBC
T0RZID4gSFRNTCA+ICNkb2N1bWVudAorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5n
ZVNlbGVjdGlvbjpXZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCitFRElUSU5H
IERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlOldlYlZpZXdEaWRDaGFuZ2VOb3RpZmljYXRpb24K
K1Rlc3RzOiAKK1NtYXJ0IGRlbGV0ZSB3aGVuIGRlbGV0aW5nIGEgbGluZSB3aXRoIG9ubHkgYSBi
bGFuayBsaW5lIGFib3ZlIGl0LiBUZXN0IG11c3QgZXhpc3QgYXQgdGhlIHRvcCBvZiB0aGUgZmls
ZSBpbiBvcmRlciB0byBjb3JyZWN0bHkgdGVzdCB0aGUgb3JpZ2luYWwgYnVnLgorRXhwZWN0ZWQg
UmVzdWx0czogCitFdmVyeXRoaW5nIHNob3VsZCBiZSBkZWxldGVkLgpcIE5vIG5ld2xpbmUgYXQg
ZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21h
cnQtZGVsZXRlLXBhcmFncmFwaC0wMDUuaHRtbCBiL0xheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRp
bmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp
bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wZDlhZmEwOTA1
YzA5OWJmOGNmY2VlOWVlZjBiNTBlNThhZWE3YmJjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0
VGVzdHMvZWRpdGluZy9kZWxldGluZy9zbWFydC1kZWxldGUtcGFyYWdyYXBoLTAwNS5odG1sCkBA
IC0wLDAgKzEsNTAgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+IAorPGhlYWQ+Cis8c3R5bGU+
CisuZWRpdGluZyB7IAorICAgIGJvcmRlcjogMnB4IHNvbGlkIHJlZDsgCisgICAgZm9udC1zaXpl
OiAyNHB4OyAKK30KKy5leHBsYW5hdGlvbiB7IAorICAgIGJvcmRlcjogMnB4IHNvbGlkIGJsdWU7
IAorICAgIHBhZGRpbmc6IDEycHg7IAorICAgIGZvbnQtc2l6ZTogMjRweDsgCisgICAgbWFyZ2lu
LWJvdHRvbTogMjRweDsKK30KKy5zY2VuYXJpbyB7IG1hcmdpbi1ib3R0b206IDE2cHg7fQorLnNj
ZW5hcmlvOmZpcnN0LWxpbmUgeyBmb250LXdlaWdodDogYm9sZDsgbWFyZ2luLWJvdHRvbTogMTZw
eDt9CisuZXhwZWN0ZWQtcmVzdWx0czpmaXJzdC1saW5lIHsgZm9udC13ZWlnaHQ6IGJvbGQgfQor
PC9zdHlsZT4KKzwvaGVhZD4gCis8Ym9keT4KKzxkaXYgY29udGVudGVkaXRhYmxlPSJ0cnVlIiBz
dHlsZT0id2lkdGg6IDI1NnB4OyBoZWlnaHQ6IDI1NnB4OyBib3JkZXI6IDFweCBzb2xpZCBibGFj
ayI+PGJyPjxkaXYgaWQ9J3Rlc3QnPkRlbGV0ZU1lPC9kaXY+PC9kaXY+CisKKzxkaXYgY2xhc3M9
ImV4cGxhbmF0aW9uIj4KKzxkaXYgY2xhc3M9InNjZW5hcmlvIj4KK1Rlc3RzOiAKKzxicj4KK1Nt
YXJ0IGRlbGV0ZSB3aGVuIGRlbGV0aW5nIGEgbGluZSB3aXRoIG9ubHkgYSBibGFuayBsaW5lIGFi
b3ZlIGl0LgorVGVzdCBtdXN0IGV4aXN0IGF0IHRoZSB0b3Agb2YgdGhlIGZpbGUgaW4gb3JkZXIg
dG8gY29ycmVjdGx5IHRlc3QgdGhlIG9yaWdpbmFsIGJ1Zy4KKzwvZGl2PgorPGRpdiBjbGFzcz0i
ZXhwZWN0ZWQtcmVzdWx0cyI+CitFeHBlY3RlZCBSZXN1bHRzOgorPGJyPgorRXZlcnl0aGluZyBz
aG91bGQgYmUgZGVsZXRlZC4KKzwvZGl2PgorPC9kaXY+CisKKzxzY3JpcHQgc3JjPSIuLi9lZGl0
aW5nLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvdWktaGVscGVy
LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+CisKK2FzeW5jIGZ1bmN0aW9uIGVkaXRpbmdUZXN0KCkg
eworICAgIGludGVybmFscy5zZXR0aW5ncy5zZXRFZGl0aW5nQmVoYXZpb3IoImlvcyIpOworICAg
IGF3YWl0IFVJSGVscGVyLnNlbGVjdFdvcmRCeURvdWJsZVRhcE9yQ2xpY2soZG9jdW1lbnQuZ2V0
RWxlbWVudEJ5SWQoJ3Rlc3QnKSk7CisgICAgY3V0Q29tbWFuZCgpOworfQorCitydW5EdW1wQXNU
ZXh0RWRpdGluZ1Rlc3QodHJ1ZSk7Cis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAt
LWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9lZGl0aW5nL2RlbGV0aW5nL3NtYXJ0LWRl
bGV0ZS1wYXJhZ3JhcGgtMDA1LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lv
cy9lZGl0aW5nL2RlbGV0aW5nL3NtYXJ0LWRlbGV0ZS1wYXJhZ3JhcGgtMDA1LWV4cGVjdGVkLnR4
dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwLi5lNGExZDBiNWU5NWI5OTU0MmY1YjhhMGZkN2JhMzBjNzFkMzc3YmVhCi0t
LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zL2VkaXRpbmcvZGVsZXRp
bmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTMg
QEAKK0VESVRJTkcgREVMRUdBVEU6IHNob3VsZEJlZ2luRWRpdGluZ0luRE9NUmFuZ2U6cmFuZ2Ug
ZnJvbSAwIG9mIERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDIgb2YgRElWID4gQk9E
WSA+IEhUTUwgPiAjZG9jdW1lbnQKK0VESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRCZWdpbkVk
aXRpbmc6V2ViVmlld0RpZEJlZ2luRWRpdGluZ05vdGlmaWNhdGlvbgorRURJVElORyBERUxFR0FU
RTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uTm90
aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRFOiBzaG91bGRDaGFuZ2VTZWxlY3RlZERPTVJhbmdl
OnJhbmdlIGZyb20gMCBvZiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0byAw
IG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvRE9NUmFuZ2U6cmFuZ2Ug
ZnJvbSAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDAgb2YgRElW
ID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgYWZmaW5pdHk6TlNTZWxlY3Rpb25BZmZp
bml0eURvd25zdHJlYW0gc3RpbGxTZWxlY3Rpbmc6RkFMU0UKK0VESVRJTkcgREVMRUdBVEU6IHNo
b3VsZENoYW5nZVNlbGVjdGVkRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mIERJViA+IERJViA+IEJP
RFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDAgb2YgRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAj
ZG9jdW1lbnQgdG9ET01SYW5nZTpyYW5nZSBmcm9tIDAgb2YgI3RleHQgPiBESVYgPiBESVYgPiBC
T0RZID4gSFRNTCA+ICNkb2N1bWVudCB0byA4IG9mICN0ZXh0ID4gRElWID4gRElWID4gQk9EWSA+
IEhUTUwgPiAjZG9jdW1lbnQgYWZmaW5pdHk6TlNTZWxlY3Rpb25BZmZpbml0eURvd25zdHJlYW0g
c3RpbGxTZWxlY3Rpbmc6RkFMU0UKK0VESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2VT
ZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5vdGlmaWNhdGlvbgorRURJVElORyBE
RUxFR0FURTogc2hvdWxkRGVsZXRlRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mICN0ZXh0ID4gRElW
ID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gOCBvZiAjdGV4dCA+IERJViA+IERJ
ViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50CitFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlk
Q2hhbmdlU2VsZWN0aW9uOldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRpb24KK0VE
SVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2U6V2ViVmlld0RpZENoYW5nZU5vdGlmaWNh
dGlvbgorVGVzdHM6IAorU21hcnQgZGVsZXRlIHdoZW4gZGVsZXRpbmcgYSBsaW5lIHdpdGggb25s
eSBhIGJsYW5rIGxpbmUgYWJvdmUgaXQuIFRlc3QgbXVzdCBleGlzdCBhdCB0aGUgdG9wIG9mIHRo
ZSBmaWxlIGluIG9yZGVyIHRvIGNvcnJlY3RseSB0ZXN0IHRoZSBvcmlnaW5hbCBidWcuCitFeHBl
Y3RlZCBSZXN1bHRzOiAKK0V2ZXJ5dGhpbmcgc2hvdWxkIGJlIGRlbGV0ZWQuClwgTm8gbmV3bGlu
ZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL2Vk
aXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUtZXhwZWN0ZWQudHh0IGIv
TGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBh
cmFncmFwaC0wMDUtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjM5NTk4Y2E2ODJiOTE4Mjc0OTg2
Y2UxMzJkZWVkY2U2ZWRhYWU0OGYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0
Zm9ybS93aW4vZWRpdGluZy9kZWxldGluZy9zbWFydC1kZWxldGUtcGFyYWdyYXBoLTAwNS1leHBl
Y3RlZC50eHQKQEAgLTAsMCArMSwxNCBAQAorRURJVElORyBERUxFR0FURTogc2hvdWxkQmVnaW5F
ZGl0aW5nSW5ET01SYW5nZTpyYW5nZSBmcm9tIDAgb2YgRElWID4gQk9EWSA+IEhUTUwgPiAjZG9j
dW1lbnQgdG8gMiBvZiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudAorRURJVElORyBERUxF
R0FURTogd2ViVmlld0RpZEJlZ2luRWRpdGluZzpXZWJWaWV3RGlkQmVnaW5FZGl0aW5nTm90aWZp
Y2F0aW9uCitFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uOldlYlZp
ZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRpb24KK0VESVRJTkcgREVMRUdBVEU6IHNob3Vs
ZENoYW5nZVNlbGVjdGVkRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mIERJViA+IERJViA+IEJPRFkg
PiBIVE1MID4gI2RvY3VtZW50IHRvIDAgb2YgRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9j
dW1lbnQgdG9ET01SYW5nZTpyYW5nZSBmcm9tIDAgb2YgRElWID4gRElWID4gQk9EWSA+IEhUTUwg
PiAjZG9jdW1lbnQgdG8gMCBvZiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCBh
ZmZpbml0eTpOU1NlbGVjdGlvbkFmZmluaXR5RG93bnN0cmVhbSBzdGlsbFNlbGVjdGluZzpGQUxT
RQorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3RGlk
Q2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRFOiBzaG91bGRDaGFu
Z2VTZWxlY3RlZERPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiBESVYgPiBESVYgPiBCT0RZID4gSFRN
TCA+ICNkb2N1bWVudCB0byAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50
IHRvRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mICN0ZXh0ID4gRElWID4gRElWID4gQk9EWSA+IEhU
TUwgPiAjZG9jdW1lbnQgdG8gOCBvZiAjdGV4dCA+IERJViA+IERJViA+IEJPRFkgPiBIVE1MID4g
I2RvY3VtZW50IGFmZmluaXR5Ok5TU2VsZWN0aW9uQWZmaW5pdHlEb3duc3RyZWFtIHN0aWxsU2Vs
ZWN0aW5nOkZBTFNFCitFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9u
OldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRpb24KK0VESVRJTkcgREVMRUdBVEU6
IHNob3VsZERlbGV0ZURPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiAjdGV4dCA+IERJViA+IERJViA+
IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDggb2YgI3RleHQgPiBESVYgPiBESVYgPiBCT0RZ
ID4gSFRNTCA+ICNkb2N1bWVudAorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNl
bGVjdGlvbjpXZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCitFRElUSU5HIERF
TEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlOldlYlZpZXdEaWRDaGFuZ2VOb3RpZmljYXRpb24KK1Rl
c3RzOiAKK1NtYXJ0IGRlbGV0ZSB3aGVuIGRlbGV0aW5nIGEgbGluZSB3aXRoIG9ubHkgYSBibGFu
ayBsaW5lIGFib3ZlIGl0LiBUZXN0IG11c3QgZXhpc3QgYXQgdGhlIHRvcCBvZiB0aGUgZmlsZSBp
biBvcmRlciB0byBjb3JyZWN0bHkgdGVzdCB0aGUgb3JpZ2luYWwgYnVnLgorRXhwZWN0ZWQgUmVz
dWx0czogCitFdmVyeXRoaW5nIHNob3VsZCBiZSBkZWxldGVkLgpcIE5vIG5ld2xpbmUgYXQgZW5k
IG9mIGZpbGUK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402697</attachid>
            <date>2020-06-24 17:14:58 -0700</date>
            <delta_ts>2020-06-25 13:58:04 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213536-20200624171457.patch</filename>
            <type>text/plain</type>
            <size>11331</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMjkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDYyODAwYjYyNGI4YTFh
OGNlOWYyZTVlNGExN2ZmODE1YjY0MzIwMC4uMDU5NTVjNjIzMDg4ZGZlNGIyZDQ3Zjk3YWM1MzEx
MzUyMjhhYWIyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA2LTIzICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQ2Fubm90IGRl
bGV0ZSBsYXN0IGxpbmUgb2YgTWFpbCBNZXNzYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTM1MzYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYz
NDIwOTI4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
IExheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUu
aHRtbAorCisgICAgICAgIFRoZSBzbWFydCBwYXJhZ3JhcGggZGVsZXRpb24gY29kZSBkaWQgbm90
IHRha2UgaW50byBhY2NvdW50IHRoYXQKKyAgICAgICAgdGhlIHByZXZpb3VzIGJsYW5rIGxpbmUg
Y291bGQgYmUgdGhlIHN0YXJ0IG9mIGVkaXRhYmxlIGNvbnRlbnQgd2l0aG91dAorICAgICAgICBh
IHBhcmFncmFwaCBiZWZvcmUgaXQuIElmIHRoaXMgd2FzIHRoZSBjYXNlLCB0aGUgZGVsZXRpb24g
Y29kZSBiYWNrZWQgdXAKKyAgICAgICAgdG9vIGZhciwgYW5kIHRoZSBkZWxldGUgY29tbWFuZCBm
YWlsZWQuIFRoaXMgY2FzZSBzaG91bGQgYmUgaGFuZGxlZAorICAgICAgICBpbiB0aGUgc2FtZSB3
YXkgdGhhdCB0aGUgZGVsZXRpbmcgdGhlIGxhc3QgcGFyYWdyYXBoIGluIGVkaXRhYmxlIGNvbnRl
bnQgaXMKKyAgICAgICAgaGFuZGxlZCwgYnkgY2hlY2tpbmcgaWYgd2UgYXJlIGFscmVhZHkgYXQg
dGhlIGJlZ2lubmluZyBvZiB0aGUgZWRpdGFibGUKKyAgICAgICAgY29udGVudCB3aGVuIGV4cGFu
ZGluZyB0aGUgc2VsZWN0aW9uIGZvciBzbWFydCBwYXJhZ3JhcGggZGVsZXRpb24uCisKKyAgICAg
ICAgKiBlZGl0aW5nL0RlbGV0ZVNlbGVjdGlvbkNvbW1hbmQuY3BwOgorICAgICAgICAoV2ViQ29y
ZTo6RGVsZXRlU2VsZWN0aW9uQ29tbWFuZDo6c21hcnREZWxldGVQYXJhZ3JhcGhTcGFjZXJzKToK
KwogMjAyMC0wNi0xOSAgQW5kcmVzIEdvbnphbGV6ICA8YW5kcmVzZ18yMkBhcHBsZS5jb20+CiAK
ICAgICAgICAgQVg6IHdlYiBwcm9jZXNzIGNyYXNoIGluIEFYT2JqZWN0Q2FjaGU6OnBvc3ROb3Rp
ZmljYXRpb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0RlbGV0ZVNlbGVj
dGlvbkNvbW1hbmQuY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9EZWxldGVTZWxlY3Rpb25D
b21tYW5kLmNwcAppbmRleCAwMGE1Mjk3NGY4N2E3YjA5OTI0MjE4NzZiMmVkMTk4NGViMmJiN2Zj
Li5kNWQwYmU2OTJlZjY0YWJkMjMwMmQ4MjM5ZTJmZGY0MTA0YTk4ZGNhIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9lZGl0aW5nL0RlbGV0ZVNlbGVjdGlvbkNvbW1hbmQuY3BwCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL2VkaXRpbmcvRGVsZXRlU2VsZWN0aW9uQ29tbWFuZC5jcHAKQEAgLTE4Niw2
ICsxODYsNyBAQCB2b2lkIERlbGV0ZVNlbGVjdGlvbkNvbW1hbmQ6OnNtYXJ0RGVsZXRlUGFyYWdy
YXBoU3BhY2VycygpCiAgICAgYm9vbCBzdGFydEFuZEVuZEluU2FtZVVuc3BsaXR0YWJsZUVsZW1l
bnQgPSB1bnNwbGl0dGFibGVFbGVtZW50Rm9yUG9zaXRpb24odmlzaWJsZVN0YXJ0LmRlZXBFcXVp
dmFsZW50KCkpID09IHVuc3BsaXR0YWJsZUVsZW1lbnRGb3JQb3NpdGlvbih2aXNpYmxlRW5kLmRl
ZXBFcXVpdmFsZW50KCkpOwogICAgIHZpc2libGVTdGFydCA9IHZpc2libGVTdGFydC5wcmV2aW91
cyhDYW5ub3RDcm9zc0VkaXRpbmdCb3VuZGFyeSk7CiAgICAgdmlzaWJsZUVuZCA9IHZpc2libGVF
bmQubmV4dChDYW5ub3RDcm9zc0VkaXRpbmdCb3VuZGFyeSk7CisgICAgYm9vbCBwcmV2aW91c1Bv
c2l0aW9uSXNTdGFydE9mQ29udGVudCA9IHN0YXJ0T2ZFZGl0YWJsZUNvbnRlbnQodmlzaWJsZVN0
YXJ0KSA9PSB2aXNpYmxlU3RhcnQ7CiAgICAgYm9vbCBwcmV2aW91c1Bvc2l0aW9uSXNCbGFua1Bh
cmFncmFwaCA9IGlzQmxhbmtQYXJhZ3JhcGgodmlzaWJsZVN0YXJ0KTsKICAgICBib29sIGVuZFBv
c2l0b25Jc0JsYW5rUGFyYWdyYXBoID0gaXNCbGFua1BhcmFncmFwaCh2aXNpYmxlRW5kKTsKICAg
ICBib29sIGhhc0JsYW5rUGFyYWdyYXBoQWZ0ZXJFbmRPcklzRW5kT2ZDb250ZW50ID0gIXNlbGVj
dGlvbkVuZElzRW5kT2ZDb250ZW50ICYmIChlbmRQb3NpdG9uSXNCbGFua1BhcmFncmFwaCB8fCBz
ZWxlY3Rpb25FbmRzSW5QYXJhZ3JhcGhTZXBlcmF0b3IpOwpAQCAtMjAzLDggKzIwNCwxMiBAQCB2
b2lkIERlbGV0ZVNlbGVjdGlvbkNvbW1hbmQ6OnNtYXJ0RGVsZXRlUGFyYWdyYXBoU3BhY2Vycygp
CiAgICAgfQogICAgIGlmIChzdGFydEFuZEVuZEluU2FtZVVuc3BsaXR0YWJsZUVsZW1lbnQgJiYg
c2VsZWN0aW9uRW5kSXNFbmRPZkNvbnRlbnQgJiYgcHJldmlvdXNQb3NpdGlvbklzQmxhbmtQYXJh
Z3JhcGggJiYgc2VsZWN0aW9uRW5kc0luUGFyYWdyYXBoU2VwZXJhdG9yKSB7CiAgICAgICAgIG1f
bmVlZFBsYWNlaG9sZGVyID0gZmFsc2U7Ci0gICAgICAgIFZpc2libGVQb3NpdGlvbiBlbmRPZlBh
cmFncmFwaEJlZm9yZVN0YXJ0ID0gZW5kT2ZQYXJhZ3JhcGgoVmlzaWJsZVBvc2l0aW9uIHsgbV91
cHN0cmVhbVN0YXJ0IH0ucHJldmlvdXMoKS5wcmV2aW91cygpKTsKLSAgICAgICAgUG9zaXRpb24g
cG9zaXRpb24gPSBlbmRPZlBhcmFncmFwaEJlZm9yZVN0YXJ0LmRlZXBFcXVpdmFsZW50KCk7Cisg
ICAgICAgIFZpc2libGVQb3NpdGlvbiBlbmRPZlBhcmFncmFwaEJlZm9yZVN0YXJ0OworICAgICAg
ICBpZiAocHJldmlvdXNQb3NpdGlvbklzU3RhcnRPZkNvbnRlbnQpCisgICAgICAgICAgICBlbmRP
ZlBhcmFncmFwaEJlZm9yZVN0YXJ0ID0gZW5kT2ZQYXJhZ3JhcGgoVmlzaWJsZVBvc2l0aW9uIHsg
bV91cHN0cmVhbVN0YXJ0IH0ucHJldmlvdXMoKSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAg
IGVuZE9mUGFyYWdyYXBoQmVmb3JlU3RhcnQgPSBlbmRPZlBhcmFncmFwaChWaXNpYmxlUG9zaXRp
b24geyBtX3Vwc3RyZWFtU3RhcnQgfS5wcmV2aW91cygpLnByZXZpb3VzKCkpOworICAgICAgICBh
dXRvIHBvc2l0aW9uID0gZW5kT2ZQYXJhZ3JhcGhCZWZvcmVTdGFydC5kZWVwRXF1aXZhbGVudCgp
OwogICAgICAgICBtX3Vwc3RyZWFtU3RhcnQgPSBwb3NpdGlvbi51cHN0cmVhbSgpOwogICAgICAg
ICBtX2Rvd25zdHJlYW1TdGFydCA9IHBvc2l0aW9uLmRvd25zdHJlYW0oKTsKICAgICAgICAgbV9s
ZWFkaW5nV2hpdGVzcGFjZSA9IG1fdXBzdHJlYW1TdGFydC5sZWFkaW5nV2hpdGVzcGFjZVBvc2l0
aW9uKERPV05TVFJFQU0pOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5
b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDE1YzMyZDUyYjE2M2QwYTJkNmIxZmYzYzI4NGI1NGMz
MGI2NTU0M2QuLmUyM2RiMjgwODc1M2VkMGJkNTM2NTQ2YjQ1ZjRkMjdiOTBkY2U1MmIgMTAwNjQ0
Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK
QEAgLTEsMyArMSwxMyBAQAorMjAyMC0wNi0yMyAgTWVnYW4gR2FyZG5lciAgPG1lZ2FuX2dhcmRu
ZXJAYXBwbGUuY29tPgorCisgICAgICAgIENhbm5vdCBkZWxldGUgbGFzdCBsaW5lIG9mIE1haWwg
TWVzc2FnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
MjEzNTM2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82MzQyMDkyOD4KKworICAgICAgICBSZXZp
ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGVkaXRpbmcvZGVsZXRpbmcvc21h
cnQtZGVsZXRlLXBhcmFncmFwaC0wMDUuaHRtbDoKKwogMjAyMC0wNi0xOSAgRGllZ28gUGlubyBH
YXJjaWEgIDxkcGlub0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHTElCXSBVbnJldmlld2VkIHRl
c3QgZ2FyZGVuaW5nLiBVcGRhdGUgdGVzdCBleHBlY3RhdGlvbnMgYWZ0ZXIgcjI2MzI2OC4KZGlm
ZiAtLWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFn
cmFwaC0wMDUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZWRpdGluZy9kZWxldGluZy9zbWFy
dC1kZWxldGUtcGFyYWdyYXBoLTAwNS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQK
aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNmYzZDc2ODc2
N2U2NTk0NmM4ZWRhMjQ2ZjgwY2RjMzNlMzExZGRiMwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91
dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLXBhcmFncmFwaC0wMDUtZXhwZWN0
ZWQudHh0CkBAIC0wLDAgKzEsMTMgQEAKK0VESVRJTkcgREVMRUdBVEU6IHNob3VsZEJlZ2luRWRp
dGluZ0luRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mIERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3Vt
ZW50IHRvIDIgb2YgRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQKK0VESVRJTkcgREVMRUdB
VEU6IHdlYlZpZXdEaWRCZWdpbkVkaXRpbmc6V2ViVmlld0RpZEJlZ2luRWRpdGluZ05vdGlmaWNh
dGlvbgorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3
RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRFOiBzaG91bGRD
aGFuZ2VTZWxlY3RlZERPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiBESVYgPiBESVYgPiBCT0RZID4g
SFRNTCA+ICNkb2N1bWVudCB0byAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3Vt
ZW50IHRvRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mICN0ZXh0ID4gRElWID4gRElWID4gQk9EWSA+
IEhUTUwgPiAjZG9jdW1lbnQgdG8gOCBvZiAjdGV4dCA+IERJViA+IERJViA+IEJPRFkgPiBIVE1M
ID4gI2RvY3VtZW50IGFmZmluaXR5Ok5TU2VsZWN0aW9uQWZmaW5pdHlEb3duc3RyZWFtIHN0aWxs
U2VsZWN0aW5nOkZBTFNFCitFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0
aW9uOldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRpb24KK0VESVRJTkcgREVMRUdB
VEU6IHNob3VsZERlbGV0ZURPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiAjdGV4dCA+IERJViA+IERJ
ViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvIDggb2YgI3RleHQgPiBESVYgPiBESVYgPiBC
T0RZID4gSFRNTCA+ICNkb2N1bWVudAorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5n
ZVNlbGVjdGlvbjpXZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCitFRElUSU5H
IERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlOldlYlZpZXdEaWRDaGFuZ2VOb3RpZmljYXRpb24K
K1Rlc3RzOiAKK1NtYXJ0IGRlbGV0ZSB3aGVuIGRlbGV0aW5nIGEgbGluZSB3aXRoIG9ubHkgYSBi
bGFuayBsaW5lIGFib3ZlIGl0LiBUZXN0IG11c3QgZXhpc3QgYXQgdGhlIHRvcCBvZiB0aGUgZmls
ZSBpbiBvcmRlciB0byBjb3JyZWN0bHkgdGVzdCB0aGUgb3JpZ2luYWwgYnVnLgorRXhwZWN0ZWQg
UmVzdWx0czogCitFdmVyeXRoaW5nIHNob3VsZCBiZSBkZWxldGVkLgorCmRpZmYgLS1naXQgYS9M
YXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL3NtYXJ0LWRlbGV0ZS1wYXJhZ3JhcGgtMDA1Lmh0
bWwgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL2RlbGV0aW5nL3NtYXJ0LWRlbGV0ZS1wYXJhZ3JhcGgt
MDA1Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMC4uMGQ5YWZhMDkwNWMwOTliZjhjZmNlZTllZWYwYjUwZTU4YWVh
N2JiYwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2VkaXRpbmcvZGVsZXRpbmcvc21h
cnQtZGVsZXRlLXBhcmFncmFwaC0wMDUuaHRtbApAQCAtMCwwICsxLDUwIEBACis8IURPQ1RZUEUg
aHRtbD4KKzxodG1sPiAKKzxoZWFkPgorPHN0eWxlPgorLmVkaXRpbmcgeyAKKyAgICBib3JkZXI6
IDJweCBzb2xpZCByZWQ7IAorICAgIGZvbnQtc2l6ZTogMjRweDsgCit9CisuZXhwbGFuYXRpb24g
eyAKKyAgICBib3JkZXI6IDJweCBzb2xpZCBibHVlOyAKKyAgICBwYWRkaW5nOiAxMnB4OyAKKyAg
ICBmb250LXNpemU6IDI0cHg7IAorICAgIG1hcmdpbi1ib3R0b206IDI0cHg7Cit9Cisuc2NlbmFy
aW8geyBtYXJnaW4tYm90dG9tOiAxNnB4O30KKy5zY2VuYXJpbzpmaXJzdC1saW5lIHsgZm9udC13
ZWlnaHQ6IGJvbGQ7IG1hcmdpbi1ib3R0b206IDE2cHg7fQorLmV4cGVjdGVkLXJlc3VsdHM6Zmly
c3QtbGluZSB7IGZvbnQtd2VpZ2h0OiBib2xkIH0KKzwvc3R5bGU+Cis8L2hlYWQ+IAorPGJvZHk+
Cis8ZGl2IGNvbnRlbnRlZGl0YWJsZT0idHJ1ZSIgc3R5bGU9IndpZHRoOiAyNTZweDsgaGVpZ2h0
OiAyNTZweDsgYm9yZGVyOiAxcHggc29saWQgYmxhY2siPjxicj48ZGl2IGlkPSd0ZXN0Jz5EZWxl
dGVNZTwvZGl2PjwvZGl2PgorCis8ZGl2IGNsYXNzPSJleHBsYW5hdGlvbiI+Cis8ZGl2IGNsYXNz
PSJzY2VuYXJpbyI+CitUZXN0czogCis8YnI+CitTbWFydCBkZWxldGUgd2hlbiBkZWxldGluZyBh
IGxpbmUgd2l0aCBvbmx5IGEgYmxhbmsgbGluZSBhYm92ZSBpdC4KK1Rlc3QgbXVzdCBleGlzdCBh
dCB0aGUgdG9wIG9mIHRoZSBmaWxlIGluIG9yZGVyIHRvIGNvcnJlY3RseSB0ZXN0IHRoZSBvcmln
aW5hbCBidWcuCis8L2Rpdj4KKzxkaXYgY2xhc3M9ImV4cGVjdGVkLXJlc3VsdHMiPgorRXhwZWN0
ZWQgUmVzdWx0czoKKzxicj4KK0V2ZXJ5dGhpbmcgc2hvdWxkIGJlIGRlbGV0ZWQuCis8L2Rpdj4K
KzwvZGl2PgorCis8c2NyaXB0IHNyYz0iLi4vZWRpdGluZy5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0
IHNyYz0iLi4vLi4vcmVzb3VyY2VzL3VpLWhlbHBlci5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0Pgor
Cithc3luYyBmdW5jdGlvbiBlZGl0aW5nVGVzdCgpIHsKKyAgICBpbnRlcm5hbHMuc2V0dGluZ3Mu
c2V0RWRpdGluZ0JlaGF2aW9yKCJpb3MiKTsKKyAgICBhd2FpdCBVSUhlbHBlci5zZWxlY3RXb3Jk
QnlEb3VibGVUYXBPckNsaWNrKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0ZXN0JykpOworICAg
IGN1dENvbW1hbmQoKTsKK30KKworcnVuRHVtcEFzVGV4dEVkaXRpbmdUZXN0KHRydWUpOworPC9z
Y3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9y
bS9pb3MvZWRpdGluZy9kZWxldGluZy9zbWFydC1kZWxldGUtcGFyYWdyYXBoLTAwNS1leHBlY3Rl
ZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvZWRpdGluZy9kZWxldGluZy9zbWFydC1k
ZWxldGUtcGFyYWdyYXBoLTAwNS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k
ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMDNhNmE5Mzg4ZWYw
MGZhYjBkOWFmNDZhYTg1ZDcxZTZkYTY2OTVmNAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl
c3RzL3BsYXRmb3JtL2lvcy9lZGl0aW5nL2RlbGV0aW5nL3NtYXJ0LWRlbGV0ZS1wYXJhZ3JhcGgt
MDA1LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDE0IEBACitFRElUSU5HIERFTEVHQVRFOiBzaG91
bGRCZWdpbkVkaXRpbmdJbkRPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiBESVYgPiBCT0RZID4gSFRN
TCA+ICNkb2N1bWVudCB0byAyIG9mIERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50CitFRElU
SU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQmVnaW5FZGl0aW5nOldlYlZpZXdEaWRCZWdpbkVkaXRp
bmdOb3RpZmljYXRpb24KK0VESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rp
b246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5vdGlmaWNhdGlvbgorRURJVElORyBERUxFR0FU
RTogc2hvdWxkQ2hhbmdlU2VsZWN0ZWRET01SYW5nZTpyYW5nZSBmcm9tIDAgb2YgRElWID4gRElW
ID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gMCBvZiBESVYgPiBESVYgPiBCT0RZID4gSFRN
TCA+ICNkb2N1bWVudCB0b0RPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiBESVYgPiBESVYgPiBCT0RZ
ID4gSFRNTCA+ICNkb2N1bWVudCB0byAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2Rv
Y3VtZW50IGFmZmluaXR5Ok5TU2VsZWN0aW9uQWZmaW5pdHlEb3duc3RyZWFtIHN0aWxsU2VsZWN0
aW5nOkZBTFNFCitFRElUSU5HIERFTEVHQVRFOiBzaG91bGRDaGFuZ2VTZWxlY3RlZERPTVJhbmdl
OnJhbmdlIGZyb20gMCBvZiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVudCB0byAw
IG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IHRvRE9NUmFuZ2U6cmFuZ2Ug
ZnJvbSAwIG9mICN0ZXh0ID4gRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8g
OCBvZiAjdGV4dCA+IERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50IGFmZmluaXR5
Ok5TU2VsZWN0aW9uQWZmaW5pdHlEb3duc3RyZWFtIHN0aWxsU2VsZWN0aW5nOkZBTFNFCitFRElU
SU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uOldlYlZpZXdEaWRDaGFuZ2VT
ZWxlY3Rpb25Ob3RpZmljYXRpb24KK0VESVRJTkcgREVMRUdBVEU6IHNob3VsZERlbGV0ZURPTVJh
bmdlOnJhbmdlIGZyb20gMCBvZiAjdGV4dCA+IERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2Rv
Y3VtZW50IHRvIDggb2YgI3RleHQgPiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+ICNkb2N1bWVu
dAorRURJVElORyBERUxFR0FURTogd2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbjpXZWJWaWV3RGlk
Q2hhbmdlU2VsZWN0aW9uTm90aWZpY2F0aW9uCitFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlk
Q2hhbmdlOldlYlZpZXdEaWRDaGFuZ2VOb3RpZmljYXRpb24KK1Rlc3RzOiAKK1NtYXJ0IGRlbGV0
ZSB3aGVuIGRlbGV0aW5nIGEgbGluZSB3aXRoIG9ubHkgYSBibGFuayBsaW5lIGFib3ZlIGl0LiBU
ZXN0IG11c3QgZXhpc3QgYXQgdGhlIHRvcCBvZiB0aGUgZmlsZSBpbiBvcmRlciB0byBjb3JyZWN0
bHkgdGVzdCB0aGUgb3JpZ2luYWwgYnVnLgorRXhwZWN0ZWQgUmVzdWx0czogCitFdmVyeXRoaW5n
IHNob3VsZCBiZSBkZWxldGVkLgorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93
aW4vZWRpdGluZy9kZWxldGluZy9zbWFydC1kZWxldGUtcGFyYWdyYXBoLTAwNS1leHBlY3RlZC50
eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vZWRpdGluZy9kZWxldGluZy9zbWFydC1kZWxl
dGUtcGFyYWdyYXBoLTAwNS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZDJjZDBjMjk0ZWY1ZmZh
MjgxODZiYTNiNzA5YWE0YWM4MThiZTEwNAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz
L3BsYXRmb3JtL3dpbi9lZGl0aW5nL2RlbGV0aW5nL3NtYXJ0LWRlbGV0ZS1wYXJhZ3JhcGgtMDA1
LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDE1IEBACitFRElUSU5HIERFTEVHQVRFOiBzaG91bGRC
ZWdpbkVkaXRpbmdJbkRPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiBESVYgPiBCT0RZID4gSFRNTCA+
ICNkb2N1bWVudCB0byAyIG9mIERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50CitFRElUSU5H
IERFTEVHQVRFOiB3ZWJWaWV3RGlkQmVnaW5FZGl0aW5nOldlYlZpZXdEaWRCZWdpbkVkaXRpbmdO
b3RpZmljYXRpb24KK0VESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246
V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5vdGlmaWNhdGlvbgorRURJVElORyBERUxFR0FURTog
c2hvdWxkQ2hhbmdlU2VsZWN0ZWRET01SYW5nZTpyYW5nZSBmcm9tIDAgb2YgRElWID4gRElWID4g
Qk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gMCBvZiBESVYgPiBESVYgPiBCT0RZID4gSFRNTCA+
ICNkb2N1bWVudCB0b0RPTVJhbmdlOnJhbmdlIGZyb20gMCBvZiBESVYgPiBESVYgPiBCT0RZID4g
SFRNTCA+ICNkb2N1bWVudCB0byAwIG9mIERJViA+IERJViA+IEJPRFkgPiBIVE1MID4gI2RvY3Vt
ZW50IGFmZmluaXR5Ok5TU2VsZWN0aW9uQWZmaW5pdHlEb3duc3RyZWFtIHN0aWxsU2VsZWN0aW5n
OkZBTFNFCitFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uOldlYlZp
ZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRpb24KK0VESVRJTkcgREVMRUdBVEU6IHNob3Vs
ZENoYW5nZVNlbGVjdGVkRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mIERJViA+IERJViA+IEJPRFkg
PiBIVE1MID4gI2RvY3VtZW50IHRvIDAgb2YgRElWID4gRElWID4gQk9EWSA+IEhUTUwgPiAjZG9j
dW1lbnQgdG9ET01SYW5nZTpyYW5nZSBmcm9tIDAgb2YgI3RleHQgPiBESVYgPiBESVYgPiBCT0RZ
ID4gSFRNTCA+ICNkb2N1bWVudCB0byA4IG9mICN0ZXh0ID4gRElWID4gRElWID4gQk9EWSA+IEhU
TUwgPiAjZG9jdW1lbnQgYWZmaW5pdHk6TlNTZWxlY3Rpb25BZmZpbml0eURvd25zdHJlYW0gc3Rp
bGxTZWxlY3Rpbmc6RkFMU0UKK0VESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2VTZWxl
Y3Rpb246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5vdGlmaWNhdGlvbgorRURJVElORyBERUxF
R0FURTogc2hvdWxkRGVsZXRlRE9NUmFuZ2U6cmFuZ2UgZnJvbSAwIG9mICN0ZXh0ID4gRElWID4g
RElWID4gQk9EWSA+IEhUTUwgPiAjZG9jdW1lbnQgdG8gOCBvZiAjdGV4dCA+IERJViA+IERJViA+
IEJPRFkgPiBIVE1MID4gI2RvY3VtZW50CitFRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hh
bmdlU2VsZWN0aW9uOldlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRpb24KK0VESVRJ
TkcgREVMRUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2U6V2ViVmlld0RpZENoYW5nZU5vdGlmaWNhdGlv
bgorVGVzdHM6IAorU21hcnQgZGVsZXRlIHdoZW4gZGVsZXRpbmcgYSBsaW5lIHdpdGggb25seSBh
IGJsYW5rIGxpbmUgYWJvdmUgaXQuIFRlc3QgbXVzdCBleGlzdCBhdCB0aGUgdG9wIG9mIHRoZSBm
aWxlIGluIG9yZGVyIHRvIGNvcnJlY3RseSB0ZXN0IHRoZSBvcmlnaW5hbCBidWcuCitFeHBlY3Rl
ZCBSZXN1bHRzOiAKK0V2ZXJ5dGhpbmcgc2hvdWxkIGJlIGRlbGV0ZWQuCisK
</data>

          </attachment>
      

    </bug>

</bugzilla>