<?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>230371</bug_id>
          
          <creation_ts>2021-09-16 13:30:16 -0700</creation_ts>
          <short_desc>Convert usesMockScrollAnimator from a DeprecatedGlobalSettings to a WebPreference</short_desc>
          <delta_ts>2021-09-17 13:08:27 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Tools / Tests</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>
          
          <blocked>230295</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Simon Fraser (smfr)">simon.fraser</reporter>
          <assigned_to name="Simon Fraser (smfr)">simon.fraser</assigned_to>
          <cc>cdumez</cc>
    
    <cc>changseok</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>fred.wang</cc>
    
    <cc>glenn</cc>
    
    <cc>kondapallykalyan</cc>
    
    <cc>mifenton</cc>
    
    <cc>pdr</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>thorton</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1794188</commentid>
    <comment_count>0</comment_count>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2021-09-16 13:30:16 -0700</bug_when>
    <thetext>Convert usesMockScrollAnimator from a DeprecatedGlobalSettings to a WebPreference</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1794191</commentid>
    <comment_count>1</comment_count>
      <attachid>438395</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2021-09-16 13:33:43 -0700</bug_when>
    <thetext>Created attachment 438395
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1794271</commentid>
    <comment_count>2</comment_count>
      <attachid>438417</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2021-09-16 16:43:25 -0700</bug_when>
    <thetext>Created attachment 438417
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1794532</commentid>
    <comment_count>3</comment_count>
      <attachid>438496</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2021-09-17 11:46:35 -0700</bug_when>
    <thetext>Created attachment 438496
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1794570</commentid>
    <comment_count>4</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-09-17 13:07:30 -0700</bug_when>
    <thetext>Committed r282686 (241825@main): &lt;https://commits.webkit.org/241825@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 438496.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1794571</commentid>
    <comment_count>5</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-09-17 13:08:27 -0700</bug_when>
    <thetext>&lt;rdar://problem/83252796&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>438395</attachid>
            <date>2021-09-16 13:33:43 -0700</date>
            <delta_ts>2021-09-17 11:47:44 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-230371-20210916133342.patch</filename>
            <type>text/plain</type>
            <size>18139</size>
            <attacher name="Simon Fraser (smfr)">simon.fraser</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyNTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n
ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGE3ODYwMmY2YTQzNzIxODNmMzhmYWM0
YTEyYjA5MWFkZTk4MzZlMzkuLmFiZmFiYTI3NDljOWRiZGNiZGRhMGI0OGU3M2ZkNTgxZDRmOWUy
ZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDktMTYgIFNpbW9uIEZyYXNlciAgPHNpbW9u
LmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgQ29udmVydCB1c2VzTW9ja1Njcm9sbEFuaW1h
dG9yIGZyb20gYSBEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3MgdG8gYSBXZWJQcmVmZXJlbmNlCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzAzNzEKKwor
ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSBNb2Nr
U2Nyb2xsQW5pbWF0b3JFbmFibGVkIHNldHRpbmcuCisKKyAgICAgICAgKiBTY3JpcHRzL1ByZWZl
cmVuY2VzL1dlYlByZWZlcmVuY2VzLnlhbWw6CisKIDIwMjEtMDktMTYgIFlvdWVubiBGYWJsZXQg
IDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIEVuYWJsZSBSVENSdHBTY3JpcHRUcmFuc2Zv
cm0gYnkgZGVmYXVsdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291
cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGIzMmFmYzU2N2ZjZmE0ODZiMTViYmU1MWUxZGY4
Y2Y4OTA0NGI4NGMuLjQ3OGRkOTExNzEwNGYyZDM5ZGYxMGY5YTVlYTEzMjM0MjFlZjcyYTMgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cKQEAgLTEsMyArMSw0NiBAQAorMjAyMS0wOS0xNiAgU2ltb24gRnJhc2VyICA8c2lt
b24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBDb252ZXJ0IHVzZXNNb2NrU2Nyb2xsQW5p
bWF0b3IgZnJvbSBhIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5ncyB0byBhIFdlYlByZWZlcmVuY2UK
KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDM3MQor
CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZXJlIHdl
cmUgb3JkZXJpbmcgcHJvYmxlbXMgdGhhdCByZXN1bHRlZCBmcm9tIHRpbWluZyBvZiBhIHRlc3Qg
Y2FsbGluZworICAgICAgICBpbnRlcm5hbHMuc2V0VXNlc01vY2tTY3JvbGxBbmltYXRvcih0cnVl
KSBhbmQgdGhlIGZpcnN0IGFjY2VzcyBvZiB0aGUgc2Nyb2xsQW5pbWF0b3IoKSwKKyAgICAgICAg
d2hpY2ggcmVzdWx0ZWQgaW4gZmFzdC9zY3JvbGxpbmcvc2Nyb2xsLWFuaW1hdG9yLXNlbGVjdC1s
aXN0LWV2ZW50cy5odG1sIGZhaWxpbmcKKyAgICAgICAgd2hlbiBydW4gdHdpY2UgaW4gYSByb3cu
CisKKyAgICAgICAgRml4IGJ5IG1ha2luZyB1c2VzTW9ja1Njcm9sbEFuaW1hdG9yIGEgV2ViUHJl
ZmVyZW5jZSwgd2hpY2ggbWVhbnMgdGhhdCB0ZXN0cworICAgICAgICBjYW4gdXNlIDwhLS0gd2Vi
a2l0LXRlc3QtcnVubmVyIC0tPiBvcHRpb25zIHRvIGVuYWJsZSBpdCwgd2hpY2ggYXZvaWRzIHRo
ZQorICAgICAgICBvcmRlcmluZyBkZXBlbmRlbmN5LgorCisgICAgICAgICogcGFnZS9EZXByZWNh
dGVkR2xvYmFsU2V0dGluZ3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RGVwcmVjYXRlZEdsb2Jh
bFNldHRpbmdzOjpzZXRVc2VzTW9ja1Njcm9sbEFuaW1hdG9yKTogRGVsZXRlZC4KKyAgICAgICAg
KFdlYkNvcmU6OkRlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6dXNlc01vY2tTY3JvbGxBbmltYXRv
cik6IERlbGV0ZWQuCisgICAgICAgICogcGFnZS9EZXByZWNhdGVkR2xvYmFsU2V0dGluZ3MuaDoK
KyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZp
ZXc6Om1vY2tTY3JvbGxBbmltYXRvckVuYWJsZWQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6
RnJhbWVWaWV3Ojp1c2VzTW9ja1Njcm9sbEFuaW1hdG9yIGNvbnN0KTogRGVsZXRlZC4KKyAgICAg
ICAgKiBwYWdlL0ZyYW1lVmlldy5oOgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbGFibGVBcmVh
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGFibGVBcmVhOjpzY3JvbGxBbmltYXRvciBj
b25zdCk6CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuaDoKKyAgICAgICAgKFdl
YkNvcmU6OlNjcm9sbGFibGVBcmVhOjptb2NrU2Nyb2xsQW5pbWF0b3JFbmFibGVkIGNvbnN0KToK
KyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGFibGVBcmVhOjp1c2VzTW9ja1Njcm9sbEFuaW1hdG9y
IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJTY3JvbGxh
YmxlQXJlYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllclNjcm9sbGFibGVBcmVh
Ojptb2NrU2Nyb2xsQW5pbWF0b3JFbmFibGVkIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJl
bmRlckxheWVyU2Nyb2xsYWJsZUFyZWE6OnVzZXNNb2NrU2Nyb2xsQW5pbWF0b3IgY29uc3QpOiBE
ZWxldGVkLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmg6
CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3BwOgorICAgICAgICAoV2ViQ29y
ZTo6UmVuZGVyTGlzdEJveDo6bW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZCBjb25zdCk6CisgICAg
ICAgIChXZWJDb3JlOjpSZW5kZXJMaXN0Qm94Ojp1c2VzTW9ja1Njcm9sbEFuaW1hdG9yIGNvbnN0
KTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5oOgorICAgICAg
ICAqIHRlc3RpbmcvSW50ZXJuYWxzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkludGVybmFsczo6
cmVzZXRUb0NvbnNpc3RlbnRTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnRlcm5hbHM6OnNl
dFVzZXNNb2NrU2Nyb2xsQW5pbWF0b3IpOiBEZWxldGVkLgorICAgICAgICAqIHRlc3RpbmcvSW50
ZXJuYWxzLmg6CisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbHMuaWRsOgorCiAyMDIxLTA5LTE2
ICBUeWxlciBXaWxjb2NrIDx0d2lsY28ub0Bwcm90b25tYWlsLmNvbT4gYW5kIE15bGVzIEMuIE1h
eGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAgICBmb250LXdlaWdodCBzaG91
bGQgYWx3YXlzIHNlcmlhbGl6ZSBhcyBhIG51bWJlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi9T
Y3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzLnlhbWwgYi9Tb3VyY2UvV1RGL1Njcmlw
dHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXMueWFtbAppbmRleCAyNWFmYjI1MDhlOGNkNDVk
ZjU1MDQ0ZDYxZTYyYTg0YTE2MzM2YmVhLi5jOThmMDhmZmRmNDdhYTUwYmQ0Y2MxNDAwYzY5NTA0
ZTJjYzI2ZmI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2Vi
UHJlZmVyZW5jZXMueWFtbAorKysgYi9Tb3VyY2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2Vi
UHJlZmVyZW5jZXMueWFtbApAQCAtMTUyMCw2ICsxNTIwLDE2IEBAIE1vY2tDYXB0dXJlRGV2aWNl
c1Byb21wdEVuYWJsZWQ6CiAgICAgV2ViS2l0OgogICAgICAgZGVmYXVsdDogdHJ1ZQogCitNb2Nr
U2Nyb2xsQW5pbWF0b3JFbmFibGVkOgorICB0eXBlOiBib29sCisgIGRlZmF1bHRWYWx1ZToKKyAg
ICBXZWJLaXRMZWdhY3k6CisgICAgICBkZWZhdWx0OiBmYWxzZQorICAgIFdlYktpdDoKKyAgICAg
IGRlZmF1bHQ6IGZhbHNlCisgICAgV2ViQ29yZToKKyAgICAgIGRlZmF1bHQ6IGZhbHNlCisKIE1v
Y2tTY3JvbGxiYXJzRW5hYmxlZDoKICAgdHlwZTogYm9vbAogICB3ZWJjb3JlQmluZGluZzogRGVw
cmVjYXRlZEdsb2JhbFNldHRpbmdzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Rl
cHJlY2F0ZWRHbG9iYWxTZXR0aW5ncy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RlcHJlY2F0
ZWRHbG9iYWxTZXR0aW5ncy5jcHAKaW5kZXggMDFhYjk1YjYyZjFhYTNmYTNhYjMzYmE3YjRmOTA2
MmVmZTlkMGFkMi4uNDY1ZDk5ZDlmMGM1ZGE2YTg5OGU5NmYyNTYzZTUwZThjNTNlMzRmZSAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9EZXByZWNhdGVkR2xvYmFsU2V0dGluZ3MuY3Bw
CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzLmNwcApA
QCAtNDMsNyArNDMsNiBAQCBib29sIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6Z0dTdHJlYW1l
ckVuYWJsZWQgPSB0cnVlOwogCiBib29sIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6Z01vY2tT
Y3JvbGxiYXJzRW5hYmxlZCA9IGZhbHNlOwogYm9vbCBEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6
OmdVc2VzT3ZlcmxheVNjcm9sbGJhcnMgPSBmYWxzZTsKLWJvb2wgRGVwcmVjYXRlZEdsb2JhbFNl
dHRpbmdzOjpnTW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZCA9IGZhbHNlOwogCiAjaWYgUExBVEZP
Uk0oV0lOKQogYm9vbCBEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6OmdTaG91bGRVc2VIaWdoUmVz
b2x1dGlvblRpbWVycyA9IHRydWU7CkBAIC0xMjUsMTYgKzEyNCw2IEBAIGJvb2wgRGVwcmVjYXRl
ZEdsb2JhbFNldHRpbmdzOjp1c2VzT3ZlcmxheVNjcm9sbGJhcnMoKQogICAgIHJldHVybiBnVXNl
c092ZXJsYXlTY3JvbGxiYXJzOwogfQogCi12b2lkIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6
c2V0VXNlc01vY2tTY3JvbGxBbmltYXRvcihib29sIGZsYWcpCi17Ci0gICAgZ01vY2tTY3JvbGxB
bmltYXRvckVuYWJsZWQgPSBmbGFnOwotfQotCi1ib29sIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5n
czo6dXNlc01vY2tTY3JvbGxBbmltYXRvcigpCi17Ci0gICAgcmV0dXJuIGdNb2NrU2Nyb2xsQW5p
bWF0b3JFbmFibGVkOwotfQotCiB2b2lkIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6c2V0TG93
UG93ZXJWaWRlb0F1ZGlvQnVmZmVyU2l6ZUVuYWJsZWQoYm9vbCBmbGFnKQogewogICAgIGdMb3dQ
b3dlclZpZGVvQXVkaW9CdWZmZXJTaXplRW5hYmxlZCA9IGZsYWc7CmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViQ29yZS9wYWdlL0RlcHJlY2F0ZWRHbG9iYWxTZXR0aW5ncy5oIGIvU291cmNlL1dlYkNv
cmUvcGFnZS9EZXByZWNhdGVkR2xvYmFsU2V0dGluZ3MuaAppbmRleCBkMGEzNTJiOTNlZWZiODE1
MDNlYTliNTA0YWE3YTFmZGZlMjQ3ZjNmLi45NjFhOTFkYWMxZDk5MWY5NmM0Yjk1YjA3YzE1ZjBk
ZTE5MTcxYjk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RlcHJlY2F0ZWRHbG9i
YWxTZXR0aW5ncy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGVwcmVjYXRlZEdsb2JhbFNl
dHRpbmdzLmgKQEAgLTU3LDkgKzU3LDYgQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIHN0
YXRpYyB2b2lkIHNldFVzZXNPdmVybGF5U2Nyb2xsYmFycyhib29sIGZsYWcpOwogICAgIHN0YXRp
YyBib29sIHVzZXNPdmVybGF5U2Nyb2xsYmFycygpOwogCi0gICAgV0VCQ09SRV9FWFBPUlQgc3Rh
dGljIHZvaWQgc2V0VXNlc01vY2tTY3JvbGxBbmltYXRvcihib29sKTsKLSAgICBzdGF0aWMgYm9v
bCB1c2VzTW9ja1Njcm9sbEFuaW1hdG9yKCk7Ci0KICAgICBzdGF0aWMgYm9vbCBsb3dQb3dlclZp
ZGVvQXVkaW9CdWZmZXJTaXplRW5hYmxlZCgpIHsgcmV0dXJuIGdMb3dQb3dlclZpZGVvQXVkaW9C
dWZmZXJTaXplRW5hYmxlZDsgfQogICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyB2b2lkIHNldExv
d1Bvd2VyVmlkZW9BdWRpb0J1ZmZlclNpemVFbmFibGVkKGJvb2wpOwogCkBAIC0xMDMsNyArMTAw
LDYgQEAgcHJpdmF0ZToKIAogICAgIHN0YXRpYyBib29sIGdNb2NrU2Nyb2xsYmFyc0VuYWJsZWQ7
CiAgICAgc3RhdGljIGJvb2wgZ1VzZXNPdmVybGF5U2Nyb2xsYmFyczsKLSAgICBzdGF0aWMgYm9v
bCBnTW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZDsKIAogI2lmIFBMQVRGT1JNKFdJTikKICAgICBz
dGF0aWMgYm9vbCBnU2hvdWxkVXNlSGlnaFJlc29sdXRpb25UaW1lcnM7CmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zy
YW1lVmlldy5jcHAKaW5kZXggYWI0OGZlZTE4ZTdjYTY3NTYzYzIzNTU1MWVmYzAwNGFlN2ExNzFj
OC4uNTVlOWIzMTliODVmN2M0ZDZkYzM4NzI2OTZhZjRhNDg0ZTJkZTFiYiAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh
Z2UvRnJhbWVWaWV3LmNwcApAQCAtMTQ0NSw5ICsxNDQ1LDkgQEAgYm9vbCBGcmFtZVZpZXc6OnVz
ZXNBc3luY1Njcm9sbGluZygpIGNvbnN0CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1ib29sIEZy
YW1lVmlldzo6dXNlc01vY2tTY3JvbGxBbmltYXRvcigpIGNvbnN0Citib29sIEZyYW1lVmlldzo6
bW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIERlcHJlY2F0
ZWRHbG9iYWxTZXR0aW5nczo6dXNlc01vY2tTY3JvbGxBbmltYXRvcigpOworICAgIHJldHVybiBm
cmFtZSgpLnNldHRpbmdzKCkubW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZCgpOwogfQogCiB2b2lk
IEZyYW1lVmlldzo6bG9nTW9ja1Njcm9sbEFuaW1hdG9yTWVzc2FnZShjb25zdCBTdHJpbmcmIG1l
c3NhZ2UpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5o
IGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAppbmRleCBlYjI4MTExOTUzYmFiMDRi
YWNhYzBkMjE0NjM2NjFlYjhiNDQwNTgyLi41NDEzNTVjYWE0NDQxODNjYjVkODRkMDM4MWQ1ODg2
ZDRhNzRkZTQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCisr
KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKQEAgLTc3Miw3ICs3NzIsNyBAQCBw
cml2YXRlOgogI2VuZGlmCiAKICAgICBib29sIHVzZXNDb21wb3NpdGVkU2Nyb2xsaW5nKCkgY29u
c3QgZmluYWw7Ci0gICAgYm9vbCB1c2VzTW9ja1Njcm9sbEFuaW1hdG9yKCkgY29uc3QgZmluYWw7
CisgICAgYm9vbCBtb2NrU2Nyb2xsQW5pbWF0b3JFbmFibGVkKCkgY29uc3QgZmluYWw7CiAgICAg
dm9pZCBsb2dNb2NrU2Nyb2xsQW5pbWF0b3JNZXNzYWdlKGNvbnN0IFN0cmluZyYpIGNvbnN0IGZp
bmFsOwogCiAgICAgYm9vbCBzdHlsZUhpZGVzU2Nyb2xsYmFyV2l0aE9yaWVudGF0aW9uKFNjcm9s
bGJhck9yaWVudGF0aW9uKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL1Njcm9sbGFibGVBcmVhLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFi
bGVBcmVhLmNwcAppbmRleCA5NjdlMTMyNmFiZTViMzAwYTcyNzZiNDRlYjk4NGIxNzlhYjQzNTVi
Li4zYWI1YmE2YTQ1NjhkZmY5NzlhMWY4YTc1YWQ2ODk2NWNlM2ExNDcwIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5jcHAKKysrIGIvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuY3BwCkBAIC03NSw3ICs3NSw3IEBAIFNjcm9s
bGFibGVBcmVhOjp+U2Nyb2xsYWJsZUFyZWEoKSA9IGRlZmF1bHQ7CiBTY3JvbGxBbmltYXRvciYg
U2Nyb2xsYWJsZUFyZWE6OnNjcm9sbEFuaW1hdG9yKCkgY29uc3QKIHsKICAgICBpZiAoIW1fc2Ny
b2xsQW5pbWF0b3IpIHsKLSAgICAgICAgaWYgKHVzZXNNb2NrU2Nyb2xsQW5pbWF0b3IoKSkgewor
ICAgICAgICBpZiAobW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZCgpKSB7CiAgICAgICAgICAgICBt
X3Njcm9sbEFuaW1hdG9yID0gbWFrZVVuaXF1ZTxTY3JvbGxBbmltYXRvck1vY2s+KGNvbnN0X2Nh
c3Q8U2Nyb2xsYWJsZUFyZWEmPigqdGhpcyksIFt0aGlzXShjb25zdCBTdHJpbmcmIG1lc3NhZ2Up
IHsKICAgICAgICAgICAgICAgICBsb2dNb2NrU2Nyb2xsQW5pbWF0b3JNZXNzYWdlKG1lc3NhZ2Up
OwogICAgICAgICAgICAgfSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9T
Y3JvbGxhYmxlQXJlYS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEu
aAppbmRleCBmZDM5NjMzMzgwYjk0N2EyMDUwYTdiODY4MGM1Nzk5MGY2ZDc1Y2I2Li40ZTlmNjVm
YjE3NzEzZjA3ZGMzNjJlZTcyZWUxOTU1NzNmMzQ5YjcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL1Njcm9sbGFibGVBcmVhLmgKQEAgLTMzNCw3ICszMzQsNyBAQCBwdWJsaWM6CiAgICAgdm9p
ZCB2ZXJ0aWNhbFNjcm9sbGJhckxheWVyRGlkQ2hhbmdlKCk7CiAgICAgdm9pZCBob3Jpem9udGFs
U2Nyb2xsYmFyTGF5ZXJEaWRDaGFuZ2UoKTsKIAotICAgIHZpcnR1YWwgYm9vbCB1c2VzTW9ja1Nj
cm9sbEFuaW1hdG9yKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KKyAgICB2aXJ0dWFsIGJvb2wg
bW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAgICAg
dmlydHVhbCB2b2lkIGxvZ01vY2tTY3JvbGxBbmltYXRvck1lc3NhZ2UoY29uc3QgU3RyaW5nJikg
Y29uc3QgeyB9OwogCiAgICAgdmlydHVhbCBib29sIHNob3VsZFBsYWNlVmVydGljYWxTY3JvbGxi
YXJPbkxlZnQoKSBjb25zdCA9IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp
bmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp
bmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5jcHAKaW5kZXggM2JlNjZlNmJkMGIzZmE3Zjky
ZDk4NzVhMTdjYjU5Zjc4NDgzMWIxOC4uYjBlZDQ0OTRhYTVmZTBjZDg4N2FhMjRiOGYzZjJhMmU3
MjI3MmI0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy
U2Nyb2xsYWJsZUFyZWEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM
YXllclNjcm9sbGFibGVBcmVhLmNwcApAQCAtMTgzMiw5ICsxODMyLDkgQEAgdm9pZCBSZW5kZXJM
YXllclNjcm9sbGFibGVBcmVhOjp1cGRhdGVMYXllclBvc2l0aW9uc0FmdGVyT3ZlcmZsb3dTY3Jv
bGwoKQogICAgIG1fbGF5ZXIudXBkYXRlTGF5ZXJQb3NpdGlvbnNBZnRlclNjcm9sbCgmZ2VvbWV0
cnlNYXAsIFJlbmRlckxheWVyOjpJc092ZXJmbG93U2Nyb2xsKTsKIH0KIAotYm9vbCBSZW5kZXJM
YXllclNjcm9sbGFibGVBcmVhOjp1c2VzTW9ja1Njcm9sbEFuaW1hdG9yKCkgY29uc3QKK2Jvb2wg
UmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYTo6bW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZCgpIGNv
bnN0CiB7Ci0gICAgcmV0dXJuIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6dXNlc01vY2tTY3Jv
bGxBbmltYXRvcigpOworICAgIHJldHVybiBtX2xheWVyLnJlbmRlcmVyKCkuc2V0dGluZ3MoKS5t
b2NrU2Nyb2xsQW5pbWF0b3JFbmFibGVkKCk7CiB9CiAKIHZvaWQgUmVuZGVyTGF5ZXJTY3JvbGxh
YmxlQXJlYTo6bG9nTW9ja1Njcm9sbEFuaW1hdG9yTWVzc2FnZShjb25zdCBTdHJpbmcmIG1lc3Nh
Z2UpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5
ZXJTY3JvbGxhYmxlQXJlYS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy
U2Nyb2xsYWJsZUFyZWEuaAppbmRleCAzYWIyOGNiNjFkYjI3YzU2YTJjZDhiOTc1Yzk3MmI3ODE0
ODg3MTA4Li5jYzgxOThkY2UzZTZkNDBhZjk5OTAxZjE4MDA2YTY0N2NiYWYzNDBlIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5o
CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFibGVBcmVh
LmgKQEAgLTE5MCw3ICsxOTAsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc1J1YmJlckJhbmRJblBy
b2dyZXNzKCkgY29uc3QgZmluYWw7CiAgICAgYm9vbCBmb3JjZVVwZGF0ZVNjcm9sbGJhcnNPbk1h
aW5UaHJlYWRGb3JQZXJmb3JtYW5jZVRlc3RpbmcoKSBjb25zdCBmaW5hbDsKICAgICBib29sIGlz
U2Nyb2xsU25hcEluUHJvZ3Jlc3MoKSBjb25zdCBmaW5hbDsKLSAgICBib29sIHVzZXNNb2NrU2Ny
b2xsQW5pbWF0b3IoKSBjb25zdCBmaW5hbDsKKyAgICBib29sIG1vY2tTY3JvbGxBbmltYXRvckVu
YWJsZWQoKSBjb25zdCBmaW5hbDsKICAgICB2b2lkIGxvZ01vY2tTY3JvbGxBbmltYXRvck1lc3Nh
Z2UoY29uc3QgU3RyaW5nJikgY29uc3QgZmluYWw7CiAKICAgICBTdHJpbmcgZGVidWdEZXNjcmlw
dGlvbigpIGNvbnN0IGZpbmFsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n
L1JlbmRlckxpc3RCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RC
b3guY3BwCmluZGV4IDFkZTY5ZDY5MzZlYTUwODllOGUwZTZjMmQxYWMwZDVkNDc2OTFkOTguLmZm
YzBkYjcxYzhlNTEyYTUxZDM5ZDNmMjkxZWM2OWZkYTI1MGJjNjUgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y
ZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHAKQEAgLTg5OCw5ICs4OTgsOSBAQCBJbnRSZWN0
IFJlbmRlckxpc3RCb3g6OnNjcm9sbGFibGVBcmVhQm91bmRpbmdCb3goYm9vbCopIGNvbnN0CiAg
ICAgcmV0dXJuIGFic29sdXRlQm91bmRpbmdCb3hSZWN0KCk7CiB9CiAKLWJvb2wgUmVuZGVyTGlz
dEJveDo6dXNlc01vY2tTY3JvbGxBbmltYXRvcigpIGNvbnN0Citib29sIFJlbmRlckxpc3RCb3g6
Om1vY2tTY3JvbGxBbmltYXRvckVuYWJsZWQoKSBjb25zdAogewotICAgIHJldHVybiBEZXByZWNh
dGVkR2xvYmFsU2V0dGluZ3M6OnVzZXNNb2NrU2Nyb2xsQW5pbWF0b3IoKTsKKyAgICByZXR1cm4g
c2V0dGluZ3MoKS5tb2NrU2Nyb2xsQW5pbWF0b3JFbmFibGVkKCk7CiB9CiAKIHZvaWQgUmVuZGVy
TGlzdEJveDo6bG9nTW9ja1Njcm9sbEFuaW1hdG9yTWVzc2FnZShjb25zdCBTdHJpbmcmIG1lc3Nh
Z2UpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlz
dEJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guaAppbmRleCAw
MzFmMTYyMmM4ZDRiODMzZmZiNDk0YWM5OTMwMTA5NDQ1ZjE1YTE1Li5iYjE4MTZiZjMzZjA0YTYw
MmUyMzMyZWY0Zjk3MDZiNDk0NzliNmUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyTGlzdEJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k
ZXJMaXN0Qm94LmgKQEAgLTEzOCw3ICsxMzgsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgaXNTY3Jv
bGxhYmxlT3JSdWJiZXJiYW5kYWJsZSgpIGZpbmFsOwogICAgIGJvb2wgaGFzU2Nyb2xsYWJsZU9y
UnViYmVyYmFuZGFibGVBbmNlc3RvcigpIGZpbmFsOwogICAgIEludFJlY3Qgc2Nyb2xsYWJsZUFy
ZWFCb3VuZGluZ0JveChib29sKiA9IG51bGxwdHIpIGNvbnN0IGZpbmFsOwotICAgIGJvb2wgdXNl
c01vY2tTY3JvbGxBbmltYXRvcigpIGNvbnN0IGZpbmFsOworICAgIGJvb2wgbW9ja1Njcm9sbEFu
aW1hdG9yRW5hYmxlZCgpIGNvbnN0IGZpbmFsOwogICAgIHZvaWQgbG9nTW9ja1Njcm9sbEFuaW1h
dG9yTWVzc2FnZShjb25zdCBTdHJpbmcmKSBjb25zdCBmaW5hbDsKICAgICBTdHJpbmcgZGVidWdE
ZXNjcmlwdGlvbigpIGNvbnN0IGZpbmFsOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90
ZXN0aW5nL0ludGVybmFscy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5j
cHAKaW5kZXggYjk0MGE1MjIxOTM4NTBkMTdiZGMyMTMwNzI0MDE5YmY3MmJlZmJlNS4uNTNlMzhm
YmU3NjdmMTViMjAyYmZkYjYwMWMwZTNhNzUzNDhmZDA4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3Rpbmcv
SW50ZXJuYWxzLmNwcApAQCAtNTMxLDcgKzUzMSw2IEBAIHZvaWQgSW50ZXJuYWxzOjpyZXNldFRv
Q29uc2lzdGVudFN0YXRlKFBhZ2UmIHBhZ2UpCiAgICAgV1RGOjpjbGVhckRlZmF1bHRQb3J0Rm9y
UHJvdG9jb2xNYXBGb3JUZXN0aW5nKCk7CiAgICAgb3ZlcnJpZGVVc2VyUHJlZmVycmVkTGFuZ3Vh
Z2VzKFZlY3RvcjxTdHJpbmc+KCkpOwogICAgIFdlYkNvcmU6OkRlcHJlY2F0ZWRHbG9iYWxTZXR0
aW5nczo6c2V0VXNlc092ZXJsYXlTY3JvbGxiYXJzKGZhbHNlKTsKLSAgICBXZWJDb3JlOjpEZXBy
ZWNhdGVkR2xvYmFsU2V0dGluZ3M6OnNldFVzZXNNb2NrU2Nyb2xsQW5pbWF0b3IoZmFsc2UpOwog
ICAgIGlmICghcGFnZS5tYWluRnJhbWUoKS5lZGl0b3IoKS5pc0NvbnRpbnVvdXNTcGVsbENoZWNr
aW5nRW5hYmxlZCgpKQogICAgICAgICBwYWdlLm1haW5GcmFtZSgpLmVkaXRvcigpLnRvZ2dsZUNv
bnRpbnVvdXNTcGVsbENoZWNraW5nKCk7CiAgICAgaWYgKHBhZ2UubWFpbkZyYW1lKCkuZWRpdG9y
KCkuaXNPdmVyd3JpdGVNb2RlRW5hYmxlZCgpKQpAQCAtMzgyMiwxMSArMzgyMSw2IEBAIHZvaWQg
SW50ZXJuYWxzOjpzZXRVc2VzT3ZlcmxheVNjcm9sbGJhcnMoYm9vbCBlbmFibGVkKQogI2VuZGlm
CiB9CiAKLXZvaWQgSW50ZXJuYWxzOjpzZXRVc2VzTW9ja1Njcm9sbEFuaW1hdG9yKGJvb2wgZW5h
YmxlZCkKLXsKLSAgICBXZWJDb3JlOjpEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6OnNldFVzZXNN
b2NrU2Nyb2xsQW5pbWF0b3IoZW5hYmxlZCk7Ci19Ci0KIHZvaWQgSW50ZXJuYWxzOjpmb3JjZVJl
bG9hZChib29sIGVuZFRvRW5kKQogewogICAgIE9wdGlvblNldDxSZWxvYWRPcHRpb24+IHJlbG9h
ZE9wdGlvbnM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5o
IGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaAppbmRleCBiNjhlZTQ0NzY1Y2Jm
MzMzMGFiYzUyYzZmNTZkMjM5NTQ2N2ZkMmJhLi5hYTYzYjgzNWRjZjllOGJkNTYxNjJiZWMyMTRi
NTRlYWU3ZWU4MDc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFs
cy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmgKQEAgLTU5NCw3ICs1
OTQsNiBAQCBwdWJsaWM6CiAgICAgSlNDOjpKU1ZhbHVlIGV2YWx1YXRlSW5Xb3JsZElnbm9yaW5n
RXhjZXB0aW9uKGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5nJiBzb3VyY2UpOwogCiAg
ICAgdm9pZCBzZXRVc2VzT3ZlcmxheVNjcm9sbGJhcnMoYm9vbCk7Ci0gICAgdm9pZCBzZXRVc2Vz
TW9ja1Njcm9sbEFuaW1hdG9yKGJvb2wpOwogCiAgICAgRXhjZXB0aW9uT3I8U3RyaW5nPiBnZXRD
dXJyZW50Q3Vyc29ySW5mbygpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5n
L0ludGVybmFscy5pZGwgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwKaW5k
ZXggNTE4ODg5MWIxNGUyYjRhZWIyMzczYjMzOWUwNTUxOTRhZjlkYmU0YS4uYmFlMGUwZGE4OGVk
MDAyMjE5YjQ5NzU0YzE4OWIwYTljZmI1M2Q4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv
dGVzdGluZy9JbnRlcm5hbHMuaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJu
YWxzLmlkbApAQCAtNjg3LDcgKzY4Nyw2IEBAIGVudW0gQXV0b3BsYXlQb2xpY3kgewogICAgIGFu
eSBldmFsdWF0ZUluV29ybGRJZ25vcmluZ0V4Y2VwdGlvbihET01TdHJpbmcgbmFtZSwgRE9NU3Ry
aW5nIHNvdXJjZSk7CiAKICAgICB1bmRlZmluZWQgc2V0VXNlc092ZXJsYXlTY3JvbGxiYXJzKGJv
b2xlYW4gZW5hYmxlZCk7Ci0gICAgdW5kZWZpbmVkIHNldFVzZXNNb2NrU2Nyb2xsQW5pbWF0b3Io
Ym9vbGVhbiBlbmFibGVkKTsKIAogICAgIHVuZGVmaW5lZCBmb3JjZVJlbG9hZChib29sZWFuIGVu
ZFRvRW5kKTsKICAgICB1bmRlZmluZWQgcmVsb2FkRXhwaXJlZE9ubHkoKTsKZGlmZiAtLWdpdCBh
L0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBjMDMz
OTE2YmIxYzE3OWVmNDNmYjdmNzY4ZjhiOTAyNzE2OTczY2M3Li40YWM1YThhYzk5MGJhMzkyNGQw
OThmODg1YWJiYWQzNDQyMjZhOWMxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK
KysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjEtMDktMTYg
IFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgQ29udmVy
dCB1c2VzTW9ja1Njcm9sbEFuaW1hdG9yIGZyb20gYSBEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3Mg
dG8gYSBXZWJQcmVmZXJlbmNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df
YnVnLmNnaT9pZD0yMzAzNzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KyAgICAgICAgCisgICAgICAgIENvbnZlcnQgdG8gdXNlIHRoZSAgPCEtLSB3ZWJraXQtdGVzdC1y
dW5uZXIgLS0+IGZvcm1hdCBmb3Igc3BlY2lmeWluZyBNb2NrU2Nyb2xsQW5pbWF0b3JFbmFibGVk
LgorCisgICAgICAgICogZmFzdC9zY3JvbGxpbmcvc2Nyb2xsLWFuaW1hdG9yLWJhc2ljLWV2ZW50
cy5odG1sOgorICAgICAgICAqIGZhc3Qvc2Nyb2xsaW5nL3Njcm9sbC1hbmltYXRvci1vdmVybGF5
LXNjcm9sbGJhcnMtY2xpY2tlZC5odG1sOgorICAgICAgICAqIGZhc3Qvc2Nyb2xsaW5nL3Njcm9s
bC1hbmltYXRvci1vdmVybGF5LXNjcm9sbGJhcnMtaG92ZXJlZC5odG1sOgorICAgICAgICAqIGZh
c3Qvc2Nyb2xsaW5nL3Njcm9sbC1hbmltYXRvci1zZWxlY3QtbGlzdC1ldmVudHMuaHRtbDoKKwog
MjAyMS0wOS0xNiAgRXJpYyBIdXRjaGlzb24gIDxlaHV0Y2hpc29uQGFwcGxlLmNvbT4KIAogICAg
ICAgICBVcGRhdGUgdGVzdCBleHBlY3RhdGlvbnMgZm9yIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzc29tL3N0eWxlc2hlZXQtc2FtZS1vcmlnaW4uc3ViLmh0bWwuCmRpZmYg
LS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9zY3JvbGwtYW5pbWF0b3ItYmFzaWMt
ZXZlbnRzLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9zY3JvbGwtYW5pbWF0b3It
YmFzaWMtZXZlbnRzLmh0bWwKaW5kZXggN2Y2MTU4ZGI0MzExN2MxYWRjOTUwNWNkOTJiMzczNmZh
ZGNhZGM5Mi4uMGYxZDhmMGM0NmM5YmQzMWZlZTNkMDA4YWNkMGM4Nzc5OWE3ZGFhNyAxMDA2NDQK
LS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvc2Nyb2xsLWFuaW1hdG9yLWJhc2ljLWV2
ZW50cy5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL3Njcm9sbC1hbmltYXRv
ci1iYXNpYy1ldmVudHMuaHRtbApAQCAtMSw0ICsxLDQgQEAKLTxodG1sPgorPGh0bWw+IDwhLS0g
d2Via2l0LXRlc3QtcnVubmVyIFsgTW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZD10cnVlIF0gLS0+
CiA8c3R5bGU+CiAgICAgI3Njcm9sbG1lIHsKICAgICAgICAgd2lkdGg6IDEwMHB4OwpAQCAtMTIs
OCArMTIsNiBAQAogPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+
PC9zY3JpcHQ+CiA8c2NyaXB0PgogICAgIGpzVGVzdElzQXN5bmMgPSB0cnVlOwotICAgIGlmICh3
aW5kb3cuaW50ZXJuYWxzKQotICAgICAgICB3aW5kb3cuaW50ZXJuYWxzLnNldFVzZXNNb2NrU2Ny
b2xsQW5pbWF0b3IodHJ1ZSk7CiAKICAgICB3aW5kb3cub25sb2FkID0gZnVuY3Rpb24oKSB7CiAg
ICAgICAgIGlmICh3aW5kb3cuaW50ZXJuYWxzKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFz
dC9zY3JvbGxpbmcvc2Nyb2xsLWFuaW1hdG9yLW92ZXJsYXktc2Nyb2xsYmFycy1jbGlja2VkLmh0
bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9zY3JvbGwtYW5pbWF0b3Itb3ZlcmxheS1z
Y3JvbGxiYXJzLWNsaWNrZWQuaHRtbAppbmRleCBkZWQzMDhkZmYzZGYyOTA1NTY2NWZhNzViZTZi
NDI4ZmE3YjRmYTc3Li5jMzI2MjQyMjMxMjk4MWU4MGU4Y2IyNmNjZDc3NDVmOTQzYTMyNmZkIDEw
MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9zY3JvbGwtYW5pbWF0b3Itb3Zl
cmxheS1zY3JvbGxiYXJzLWNsaWNrZWQuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3Njcm9s
bGluZy9zY3JvbGwtYW5pbWF0b3Itb3ZlcmxheS1zY3JvbGxiYXJzLWNsaWNrZWQuaHRtbApAQCAt
MSw5ICsxLDggQEAKLTxodG1sPgorPGh0bWw+IDwhLS0gd2Via2l0LXRlc3QtcnVubmVyIFsgTW9j
a1Njcm9sbEFuaW1hdG9yRW5hYmxlZD10cnVlIF0gLS0+CiA8c2NyaXB0IHNyYz0iLi4vLi4vcmVz
b3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KIDxzY3JpcHQ+CiAgICAganNUZXN0SXNB
c3luYyA9IHRydWU7CiAgICAgaWYgKHdpbmRvdy5pbnRlcm5hbHMpIHsKLSAgICAgICAgd2luZG93
LmludGVybmFscy5zZXRVc2VzTW9ja1Njcm9sbEFuaW1hdG9yKHRydWUpOwogICAgICAgICB3aW5k
b3cuaW50ZXJuYWxzLnNldFVzZXNPdmVybGF5U2Nyb2xsYmFycyh0cnVlKTsKICAgICB9CiAKZGlm
ZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL3Njcm9sbC1hbmltYXRvci1vdmVy
bGF5LXNjcm9sbGJhcnMtaG92ZXJlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcv
c2Nyb2xsLWFuaW1hdG9yLW92ZXJsYXktc2Nyb2xsYmFycy1ob3ZlcmVkLmh0bWwKaW5kZXggNWU0
NTlkNjQzNDBiYmQ1NGFlMmE0NDVmNmJjYzIwYmIxOGFkNTQ4NS4uOTE0YWEzZTI0OWVhZGFhYWFj
Y2IwYmYwZmRmZDczOWYzNWJlOTdiYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9zY3Jv
bGxpbmcvc2Nyb2xsLWFuaW1hdG9yLW92ZXJsYXktc2Nyb2xsYmFycy1ob3ZlcmVkLmh0bWwKKysr
IGIvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvc2Nyb2xsLWFuaW1hdG9yLW92ZXJsYXktc2Ny
b2xsYmFycy1ob3ZlcmVkLmh0bWwKQEAgLTEsOSArMSw4IEBACi08aHRtbD4KKzxodG1sPiA8IS0t
IHdlYmtpdC10ZXN0LXJ1bm5lciBbIE1vY2tTY3JvbGxBbmltYXRvckVuYWJsZWQ9dHJ1ZSBdIC0t
PgogPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+
CiA8c2NyaXB0PgogICAgIGpzVGVzdElzQXN5bmMgPSB0cnVlOwogICAgIGlmICh3aW5kb3cuaW50
ZXJuYWxzKSB7Ci0gICAgICAgIHdpbmRvdy5pbnRlcm5hbHMuc2V0VXNlc01vY2tTY3JvbGxBbmlt
YXRvcih0cnVlKTsKICAgICAgICAgd2luZG93LmludGVybmFscy5zZXRVc2VzT3ZlcmxheVNjcm9s
bGJhcnModHJ1ZSk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3Njcm9s
bGluZy9zY3JvbGwtYW5pbWF0b3Itc2VsZWN0LWxpc3QtZXZlbnRzLmh0bWwgYi9MYXlvdXRUZXN0
cy9mYXN0L3Njcm9sbGluZy9zY3JvbGwtYW5pbWF0b3Itc2VsZWN0LWxpc3QtZXZlbnRzLmh0bWwK
aW5kZXggNWY0OTBhZmM1Yzg5N2VjZTAyMGNmZjcyMWRlM2IxYzcyNThhMzQ2Yi4uYmZhZDcxMTFm
YWY4MDU4YjdhNTkzZDE4Yjc4N2Y2NWZhZDg5MjBjZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv
ZmFzdC9zY3JvbGxpbmcvc2Nyb2xsLWFuaW1hdG9yLXNlbGVjdC1saXN0LWV2ZW50cy5odG1sCisr
KyBiL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL3Njcm9sbC1hbmltYXRvci1zZWxlY3QtbGlz
dC1ldmVudHMuaHRtbApAQCAtMSw5ICsxLDcgQEAKLTxodG1sPgorPGh0bWw+IDwhLS0gd2Via2l0
LXRlc3QtcnVubmVyIFsgTW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZD10cnVlIF0gLS0+CiA8c2Ny
aXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KIDxzY3Jp
cHQ+CiAgICAganNUZXN0SXNBc3luYyA9IHRydWU7Ci0gICAgaWYgKHdpbmRvdy5pbnRlcm5hbHMp
Ci0gICAgICAgIHdpbmRvdy5pbnRlcm5hbHMuc2V0VXNlc01vY2tTY3JvbGxBbmltYXRvcih0cnVl
KTsKIAogICAgIHdpbmRvdy5vbmxvYWQgPSBmdW5jdGlvbigpIHsKICAgICAgICAgaWYgKHdpbmRv
dy5pbnRlcm5hbHMpCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>438417</attachid>
            <date>2021-09-16 16:43:25 -0700</date>
            <delta_ts>2021-09-17 11:46:32 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-230371-20210916164325.patch</filename>
            <type>text/plain</type>
            <size>20780</size>
            <attacher name="Simon Fraser (smfr)">simon.fraser</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyNTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n
ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGE3ODYwMmY2YTQzNzIxODNmMzhmYWM0
YTEyYjA5MWFkZTk4MzZlMzkuLjNiOWE1ZWUwNjIyYjA3YWNiYzRiNzY3YjRkMWRkZjVjNjdhYzU5
OTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDktMTYgIFNpbW9uIEZyYXNlciAgPHNpbW9u
LmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgQ29udmVydCB1c2VzTW9ja1Njcm9sbEFuaW1h
dG9yIGZyb20gYSBEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3MgdG8gYSBXZWJQcmVmZXJlbmNlCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzAzNzEKKwor
ICAgICAgICBSZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgIEFkZCBhIE1vY2tTY3Jv
bGxBbmltYXRvckVuYWJsZWQgc2V0dGluZy4KKworICAgICAgICAqIFNjcmlwdHMvUHJlZmVyZW5j
ZXMvV2ViUHJlZmVyZW5jZXMueWFtbDoKKwogMjAyMS0wOS0xNiAgWW91ZW5uIEZhYmxldCAgPHlv
dWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgRW5hYmxlIFJUQ1J0cFNjcmlwdFRyYW5zZm9ybSBi
eSBkZWZhdWx0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2Uv
V2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjMyYWZjNTY3ZmNmYTQ4NmIxNWJiZTUxZTFkZjhjZjg5
MDQ0Yjg0Yy4uNjQ3MDJjMGFiYTdlOTUxMTJkMjAzN2Y4M2IwY2RhZGZjZTYzYzhjMCAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwpAQCAtMSwzICsxLDQ2IEBACisyMDIxLTA5LTE2ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5m
cmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENvbnZlcnQgdXNlc01vY2tTY3JvbGxBbmltYXRv
ciBmcm9tIGEgRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzIHRvIGEgV2ViUHJlZmVyZW5jZQorICAg
ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMwMzcxCisKKyAg
ICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICBUaGVyZSB3ZXJlIG9yZGVy
aW5nIHByb2JsZW1zIHRoYXQgcmVzdWx0ZWQgZnJvbSB0aW1pbmcgb2YgYSB0ZXN0IGNhbGxpbmcK
KyAgICAgICAgaW50ZXJuYWxzLnNldFVzZXNNb2NrU2Nyb2xsQW5pbWF0b3IodHJ1ZSkgYW5kIHRo
ZSBmaXJzdCBhY2Nlc3Mgb2YgdGhlIHNjcm9sbEFuaW1hdG9yKCksCisgICAgICAgIHdoaWNoIHJl
c3VsdGVkIGluIGZhc3Qvc2Nyb2xsaW5nL3Njcm9sbC1hbmltYXRvci1zZWxlY3QtbGlzdC1ldmVu
dHMuaHRtbCBmYWlsaW5nCisgICAgICAgIHdoZW4gcnVuIHR3aWNlIGluIGEgcm93LgorCisgICAg
ICAgIEZpeCBieSBtYWtpbmcgdXNlc01vY2tTY3JvbGxBbmltYXRvciBhIFdlYlByZWZlcmVuY2Us
IHdoaWNoIG1lYW5zIHRoYXQgdGVzdHMKKyAgICAgICAgY2FuIHVzZSA8IS0tIHdlYmtpdC10ZXN0
LXJ1bm5lciAtLT4gb3B0aW9ucyB0byBlbmFibGUgaXQsIHdoaWNoIGF2b2lkcyB0aGUKKyAgICAg
ICAgb3JkZXJpbmcgZGVwZW5kZW5jeS4KKworICAgICAgICAqIHBhZ2UvRGVwcmVjYXRlZEdsb2Jh
bFNldHRpbmdzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRlcHJlY2F0ZWRHbG9iYWxTZXR0aW5n
czo6c2V0VXNlc01vY2tTY3JvbGxBbmltYXRvcik6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3Jl
OjpEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6OnVzZXNNb2NrU2Nyb2xsQW5pbWF0b3IpOiBEZWxl
dGVkLgorICAgICAgICAqIHBhZ2UvRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzLmg6CisgICAgICAg
ICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojptb2Nr
U2Nyb2xsQW5pbWF0b3JFbmFibGVkIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmll
dzo6dXNlc01vY2tTY3JvbGxBbmltYXRvciBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogcGFn
ZS9GcmFtZVZpZXcuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpTY3JvbGxhYmxlQXJlYTo6c2Nyb2xsQW5pbWF0b3IgY29uc3QpOgor
ICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmg6CisgICAgICAgIChXZWJDb3JlOjpT
Y3JvbGxhYmxlQXJlYTo6bW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZCBjb25zdCk6CisgICAgICAg
IChXZWJDb3JlOjpTY3JvbGxhYmxlQXJlYTo6dXNlc01vY2tTY3JvbGxBbmltYXRvciBjb25zdCk6
IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEu
Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYTo6bW9ja1Nj
cm9sbEFuaW1hdG9yRW5hYmxlZCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXll
clNjcm9sbGFibGVBcmVhOjp1c2VzTW9ja1Njcm9sbEFuaW1hdG9yIGNvbnN0KTogRGVsZXRlZC4K
KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5oOgorICAgICAg
ICAqIHJlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl
ckxpc3RCb3g6Om1vY2tTY3JvbGxBbmltYXRvckVuYWJsZWQgY29uc3QpOgorICAgICAgICAoV2Vi
Q29yZTo6UmVuZGVyTGlzdEJveDo6dXNlc01vY2tTY3JvbGxBbmltYXRvciBjb25zdCk6IERlbGV0
ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guaDoKKyAgICAgICAgKiB0ZXN0
aW5nL0ludGVybmFscy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnRlcm5hbHM6OnJlc2V0VG9D
b25zaXN0ZW50U3RhdGUpOgorICAgICAgICAoV2ViQ29yZTo6SW50ZXJuYWxzOjpzZXRVc2VzTW9j
a1Njcm9sbEFuaW1hdG9yKTogRGVsZXRlZC4KKyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5o
OgorICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmlkbDoKKwogMjAyMS0wOS0xNiAgVHlsZXIg
V2lsY29jayA8dHdpbGNvLm9AcHJvdG9ubWFpbC5jb20+IGFuZCBNeWxlcyBDLiBNYXhmaWVsZCAg
PG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgZm9udC13ZWlnaHQgc2hvdWxkIGFsd2F5
cyBzZXJpYWxpemUgYXMgYSBudW1iZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kv
d2luL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZwppbmRleCA4
NmYyMGMyYmZjNmY3NjY3NzE3ZTg2YTU5NDdmZTJmNmQzZWMzMGFjLi5jOWFmMGIxYmNiYTUyNjFh
MjA1ZGYxNzY3MzcwNTZiMzNjYTlmMDg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5
L3dpbi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vQ2hhbmdlTG9nCkBA
IC0xLDMgKzEsMTggQEAKKzIwMjEtMDktMTYgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBh
cHBsZS5jb20+CisKKyAgICAgICAgQ29udmVydCB1c2VzTW9ja1Njcm9sbEFuaW1hdG9yIGZyb20g
YSBEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3MgdG8gYSBXZWJQcmVmZXJlbmNlCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzAzNzEKKworICAgICAgICBS
ZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgIEFkZCBXaW5kb3dzIHByZWZlcmVuY2Vz
LgorCisgICAgICAgICogV2ViUHJlZmVyZW5jZXMuY3BwOgorICAgICAgICAoV2ViUHJlZmVyZW5j
ZXM6Om1vY2tTY3JvbGxBbmltYXRvckVuYWJsZWQpOgorICAgICAgICAqIFdlYlByZWZlcmVuY2Vz
Lmg6CisgICAgICAgICogV2ViVmlldy5jcHA6CisgICAgICAgIChXZWJWaWV3Ojpub3RpZnlQcmVm
ZXJlbmNlc0NoYW5nZWQpOgorCiAyMDIxLTA5LTE0ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBs
ZS5jb20+CiAKICAgICAgICAgW0hhcmRlbmluZ10gVmFsaWRhdGUgSURCVmFsdWUncyBibG9iIHBh
dGhzIGluIFdlYklEQlNlcnZlcjo6cHV0T3JBZGQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi9T
Y3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzLnlhbWwgYi9Tb3VyY2UvV1RGL1Njcmlw
dHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXMueWFtbAppbmRleCAyNWFmYjI1MDhlOGNkNDVk
ZjU1MDQ0ZDYxZTYyYTg0YTE2MzM2YmVhLi5jOThmMDhmZmRmNDdhYTUwYmQ0Y2MxNDAwYzY5NTA0
ZTJjYzI2ZmI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2Vi
UHJlZmVyZW5jZXMueWFtbAorKysgYi9Tb3VyY2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2Vi
UHJlZmVyZW5jZXMueWFtbApAQCAtMTUyMCw2ICsxNTIwLDE2IEBAIE1vY2tDYXB0dXJlRGV2aWNl
c1Byb21wdEVuYWJsZWQ6CiAgICAgV2ViS2l0OgogICAgICAgZGVmYXVsdDogdHJ1ZQogCitNb2Nr
U2Nyb2xsQW5pbWF0b3JFbmFibGVkOgorICB0eXBlOiBib29sCisgIGRlZmF1bHRWYWx1ZToKKyAg
ICBXZWJLaXRMZWdhY3k6CisgICAgICBkZWZhdWx0OiBmYWxzZQorICAgIFdlYktpdDoKKyAgICAg
IGRlZmF1bHQ6IGZhbHNlCisgICAgV2ViQ29yZToKKyAgICAgIGRlZmF1bHQ6IGZhbHNlCisKIE1v
Y2tTY3JvbGxiYXJzRW5hYmxlZDoKICAgdHlwZTogYm9vbAogICB3ZWJjb3JlQmluZGluZzogRGVw
cmVjYXRlZEdsb2JhbFNldHRpbmdzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Rl
cHJlY2F0ZWRHbG9iYWxTZXR0aW5ncy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RlcHJlY2F0
ZWRHbG9iYWxTZXR0aW5ncy5jcHAKaW5kZXggMDFhYjk1YjYyZjFhYTNmYTNhYjMzYmE3YjRmOTA2
MmVmZTlkMGFkMi4uNDY1ZDk5ZDlmMGM1ZGE2YTg5OGU5NmYyNTYzZTUwZThjNTNlMzRmZSAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9EZXByZWNhdGVkR2xvYmFsU2V0dGluZ3MuY3Bw
CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzLmNwcApA
QCAtNDMsNyArNDMsNiBAQCBib29sIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6Z0dTdHJlYW1l
ckVuYWJsZWQgPSB0cnVlOwogCiBib29sIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6Z01vY2tT
Y3JvbGxiYXJzRW5hYmxlZCA9IGZhbHNlOwogYm9vbCBEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6
OmdVc2VzT3ZlcmxheVNjcm9sbGJhcnMgPSBmYWxzZTsKLWJvb2wgRGVwcmVjYXRlZEdsb2JhbFNl
dHRpbmdzOjpnTW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZCA9IGZhbHNlOwogCiAjaWYgUExBVEZP
Uk0oV0lOKQogYm9vbCBEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6OmdTaG91bGRVc2VIaWdoUmVz
b2x1dGlvblRpbWVycyA9IHRydWU7CkBAIC0xMjUsMTYgKzEyNCw2IEBAIGJvb2wgRGVwcmVjYXRl
ZEdsb2JhbFNldHRpbmdzOjp1c2VzT3ZlcmxheVNjcm9sbGJhcnMoKQogICAgIHJldHVybiBnVXNl
c092ZXJsYXlTY3JvbGxiYXJzOwogfQogCi12b2lkIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6
c2V0VXNlc01vY2tTY3JvbGxBbmltYXRvcihib29sIGZsYWcpCi17Ci0gICAgZ01vY2tTY3JvbGxB
bmltYXRvckVuYWJsZWQgPSBmbGFnOwotfQotCi1ib29sIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5n
czo6dXNlc01vY2tTY3JvbGxBbmltYXRvcigpCi17Ci0gICAgcmV0dXJuIGdNb2NrU2Nyb2xsQW5p
bWF0b3JFbmFibGVkOwotfQotCiB2b2lkIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6c2V0TG93
UG93ZXJWaWRlb0F1ZGlvQnVmZmVyU2l6ZUVuYWJsZWQoYm9vbCBmbGFnKQogewogICAgIGdMb3dQ
b3dlclZpZGVvQXVkaW9CdWZmZXJTaXplRW5hYmxlZCA9IGZsYWc7CmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViQ29yZS9wYWdlL0RlcHJlY2F0ZWRHbG9iYWxTZXR0aW5ncy5oIGIvU291cmNlL1dlYkNv
cmUvcGFnZS9EZXByZWNhdGVkR2xvYmFsU2V0dGluZ3MuaAppbmRleCBkMGEzNTJiOTNlZWZiODE1
MDNlYTliNTA0YWE3YTFmZGZlMjQ3ZjNmLi45NjFhOTFkYWMxZDk5MWY5NmM0Yjk1YjA3YzE1ZjBk
ZTE5MTcxYjk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RlcHJlY2F0ZWRHbG9i
YWxTZXR0aW5ncy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGVwcmVjYXRlZEdsb2JhbFNl
dHRpbmdzLmgKQEAgLTU3LDkgKzU3LDYgQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIHN0
YXRpYyB2b2lkIHNldFVzZXNPdmVybGF5U2Nyb2xsYmFycyhib29sIGZsYWcpOwogICAgIHN0YXRp
YyBib29sIHVzZXNPdmVybGF5U2Nyb2xsYmFycygpOwogCi0gICAgV0VCQ09SRV9FWFBPUlQgc3Rh
dGljIHZvaWQgc2V0VXNlc01vY2tTY3JvbGxBbmltYXRvcihib29sKTsKLSAgICBzdGF0aWMgYm9v
bCB1c2VzTW9ja1Njcm9sbEFuaW1hdG9yKCk7Ci0KICAgICBzdGF0aWMgYm9vbCBsb3dQb3dlclZp
ZGVvQXVkaW9CdWZmZXJTaXplRW5hYmxlZCgpIHsgcmV0dXJuIGdMb3dQb3dlclZpZGVvQXVkaW9C
dWZmZXJTaXplRW5hYmxlZDsgfQogICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyB2b2lkIHNldExv
d1Bvd2VyVmlkZW9BdWRpb0J1ZmZlclNpemVFbmFibGVkKGJvb2wpOwogCkBAIC0xMDMsNyArMTAw
LDYgQEAgcHJpdmF0ZToKIAogICAgIHN0YXRpYyBib29sIGdNb2NrU2Nyb2xsYmFyc0VuYWJsZWQ7
CiAgICAgc3RhdGljIGJvb2wgZ1VzZXNPdmVybGF5U2Nyb2xsYmFyczsKLSAgICBzdGF0aWMgYm9v
bCBnTW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZDsKIAogI2lmIFBMQVRGT1JNKFdJTikKICAgICBz
dGF0aWMgYm9vbCBnU2hvdWxkVXNlSGlnaFJlc29sdXRpb25UaW1lcnM7CmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zy
YW1lVmlldy5jcHAKaW5kZXggYWI0OGZlZTE4ZTdjYTY3NTYzYzIzNTU1MWVmYzAwNGFlN2ExNzFj
OC4uNTVlOWIzMTliODVmN2M0ZDZkYzM4NzI2OTZhZjRhNDg0ZTJkZTFiYiAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh
Z2UvRnJhbWVWaWV3LmNwcApAQCAtMTQ0NSw5ICsxNDQ1LDkgQEAgYm9vbCBGcmFtZVZpZXc6OnVz
ZXNBc3luY1Njcm9sbGluZygpIGNvbnN0CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1ib29sIEZy
YW1lVmlldzo6dXNlc01vY2tTY3JvbGxBbmltYXRvcigpIGNvbnN0Citib29sIEZyYW1lVmlldzo6
bW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIERlcHJlY2F0
ZWRHbG9iYWxTZXR0aW5nczo6dXNlc01vY2tTY3JvbGxBbmltYXRvcigpOworICAgIHJldHVybiBm
cmFtZSgpLnNldHRpbmdzKCkubW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZCgpOwogfQogCiB2b2lk
IEZyYW1lVmlldzo6bG9nTW9ja1Njcm9sbEFuaW1hdG9yTWVzc2FnZShjb25zdCBTdHJpbmcmIG1l
c3NhZ2UpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5o
IGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAppbmRleCBlYjI4MTExOTUzYmFiMDRi
YWNhYzBkMjE0NjM2NjFlYjhiNDQwNTgyLi41NDEzNTVjYWE0NDQxODNjYjVkODRkMDM4MWQ1ODg2
ZDRhNzRkZTQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCisr
KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKQEAgLTc3Miw3ICs3NzIsNyBAQCBw
cml2YXRlOgogI2VuZGlmCiAKICAgICBib29sIHVzZXNDb21wb3NpdGVkU2Nyb2xsaW5nKCkgY29u
c3QgZmluYWw7Ci0gICAgYm9vbCB1c2VzTW9ja1Njcm9sbEFuaW1hdG9yKCkgY29uc3QgZmluYWw7
CisgICAgYm9vbCBtb2NrU2Nyb2xsQW5pbWF0b3JFbmFibGVkKCkgY29uc3QgZmluYWw7CiAgICAg
dm9pZCBsb2dNb2NrU2Nyb2xsQW5pbWF0b3JNZXNzYWdlKGNvbnN0IFN0cmluZyYpIGNvbnN0IGZp
bmFsOwogCiAgICAgYm9vbCBzdHlsZUhpZGVzU2Nyb2xsYmFyV2l0aE9yaWVudGF0aW9uKFNjcm9s
bGJhck9yaWVudGF0aW9uKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL1Njcm9sbGFibGVBcmVhLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFi
bGVBcmVhLmNwcAppbmRleCA5NjdlMTMyNmFiZTViMzAwYTcyNzZiNDRlYjk4NGIxNzlhYjQzNTVi
Li4zYWI1YmE2YTQ1NjhkZmY5NzlhMWY4YTc1YWQ2ODk2NWNlM2ExNDcwIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5jcHAKKysrIGIvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuY3BwCkBAIC03NSw3ICs3NSw3IEBAIFNjcm9s
bGFibGVBcmVhOjp+U2Nyb2xsYWJsZUFyZWEoKSA9IGRlZmF1bHQ7CiBTY3JvbGxBbmltYXRvciYg
U2Nyb2xsYWJsZUFyZWE6OnNjcm9sbEFuaW1hdG9yKCkgY29uc3QKIHsKICAgICBpZiAoIW1fc2Ny
b2xsQW5pbWF0b3IpIHsKLSAgICAgICAgaWYgKHVzZXNNb2NrU2Nyb2xsQW5pbWF0b3IoKSkgewor
ICAgICAgICBpZiAobW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZCgpKSB7CiAgICAgICAgICAgICBt
X3Njcm9sbEFuaW1hdG9yID0gbWFrZVVuaXF1ZTxTY3JvbGxBbmltYXRvck1vY2s+KGNvbnN0X2Nh
c3Q8U2Nyb2xsYWJsZUFyZWEmPigqdGhpcyksIFt0aGlzXShjb25zdCBTdHJpbmcmIG1lc3NhZ2Up
IHsKICAgICAgICAgICAgICAgICBsb2dNb2NrU2Nyb2xsQW5pbWF0b3JNZXNzYWdlKG1lc3NhZ2Up
OwogICAgICAgICAgICAgfSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9T
Y3JvbGxhYmxlQXJlYS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEu
aAppbmRleCBmZDM5NjMzMzgwYjk0N2EyMDUwYTdiODY4MGM1Nzk5MGY2ZDc1Y2I2Li40ZTlmNjVm
YjE3NzEzZjA3ZGMzNjJlZTcyZWUxOTU1NzNmMzQ5YjcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL1Njcm9sbGFibGVBcmVhLmgKQEAgLTMzNCw3ICszMzQsNyBAQCBwdWJsaWM6CiAgICAgdm9p
ZCB2ZXJ0aWNhbFNjcm9sbGJhckxheWVyRGlkQ2hhbmdlKCk7CiAgICAgdm9pZCBob3Jpem9udGFs
U2Nyb2xsYmFyTGF5ZXJEaWRDaGFuZ2UoKTsKIAotICAgIHZpcnR1YWwgYm9vbCB1c2VzTW9ja1Nj
cm9sbEFuaW1hdG9yKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KKyAgICB2aXJ0dWFsIGJvb2wg
bW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAgICAg
dmlydHVhbCB2b2lkIGxvZ01vY2tTY3JvbGxBbmltYXRvck1lc3NhZ2UoY29uc3QgU3RyaW5nJikg
Y29uc3QgeyB9OwogCiAgICAgdmlydHVhbCBib29sIHNob3VsZFBsYWNlVmVydGljYWxTY3JvbGxi
YXJPbkxlZnQoKSBjb25zdCA9IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp
bmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp
bmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5jcHAKaW5kZXggM2JlNjZlNmJkMGIzZmE3Zjky
ZDk4NzVhMTdjYjU5Zjc4NDgzMWIxOC4uYjBlZDQ0OTRhYTVmZTBjZDg4N2FhMjRiOGYzZjJhMmU3
MjI3MmI0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy
U2Nyb2xsYWJsZUFyZWEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM
YXllclNjcm9sbGFibGVBcmVhLmNwcApAQCAtMTgzMiw5ICsxODMyLDkgQEAgdm9pZCBSZW5kZXJM
YXllclNjcm9sbGFibGVBcmVhOjp1cGRhdGVMYXllclBvc2l0aW9uc0FmdGVyT3ZlcmZsb3dTY3Jv
bGwoKQogICAgIG1fbGF5ZXIudXBkYXRlTGF5ZXJQb3NpdGlvbnNBZnRlclNjcm9sbCgmZ2VvbWV0
cnlNYXAsIFJlbmRlckxheWVyOjpJc092ZXJmbG93U2Nyb2xsKTsKIH0KIAotYm9vbCBSZW5kZXJM
YXllclNjcm9sbGFibGVBcmVhOjp1c2VzTW9ja1Njcm9sbEFuaW1hdG9yKCkgY29uc3QKK2Jvb2wg
UmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYTo6bW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZCgpIGNv
bnN0CiB7Ci0gICAgcmV0dXJuIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6dXNlc01vY2tTY3Jv
bGxBbmltYXRvcigpOworICAgIHJldHVybiBtX2xheWVyLnJlbmRlcmVyKCkuc2V0dGluZ3MoKS5t
b2NrU2Nyb2xsQW5pbWF0b3JFbmFibGVkKCk7CiB9CiAKIHZvaWQgUmVuZGVyTGF5ZXJTY3JvbGxh
YmxlQXJlYTo6bG9nTW9ja1Njcm9sbEFuaW1hdG9yTWVzc2FnZShjb25zdCBTdHJpbmcmIG1lc3Nh
Z2UpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5
ZXJTY3JvbGxhYmxlQXJlYS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy
U2Nyb2xsYWJsZUFyZWEuaAppbmRleCAzYWIyOGNiNjFkYjI3YzU2YTJjZDhiOTc1Yzk3MmI3ODE0
ODg3MTA4Li5jYzgxOThkY2UzZTZkNDBhZjk5OTAxZjE4MDA2YTY0N2NiYWYzNDBlIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5o
CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFibGVBcmVh
LmgKQEAgLTE5MCw3ICsxOTAsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc1J1YmJlckJhbmRJblBy
b2dyZXNzKCkgY29uc3QgZmluYWw7CiAgICAgYm9vbCBmb3JjZVVwZGF0ZVNjcm9sbGJhcnNPbk1h
aW5UaHJlYWRGb3JQZXJmb3JtYW5jZVRlc3RpbmcoKSBjb25zdCBmaW5hbDsKICAgICBib29sIGlz
U2Nyb2xsU25hcEluUHJvZ3Jlc3MoKSBjb25zdCBmaW5hbDsKLSAgICBib29sIHVzZXNNb2NrU2Ny
b2xsQW5pbWF0b3IoKSBjb25zdCBmaW5hbDsKKyAgICBib29sIG1vY2tTY3JvbGxBbmltYXRvckVu
YWJsZWQoKSBjb25zdCBmaW5hbDsKICAgICB2b2lkIGxvZ01vY2tTY3JvbGxBbmltYXRvck1lc3Nh
Z2UoY29uc3QgU3RyaW5nJikgY29uc3QgZmluYWw7CiAKICAgICBTdHJpbmcgZGVidWdEZXNjcmlw
dGlvbigpIGNvbnN0IGZpbmFsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n
L1JlbmRlckxpc3RCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RC
b3guY3BwCmluZGV4IDFkZTY5ZDY5MzZlYTUwODllOGUwZTZjMmQxYWMwZDVkNDc2OTFkOTguLmZm
YzBkYjcxYzhlNTEyYTUxZDM5ZDNmMjkxZWM2OWZkYTI1MGJjNjUgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y
ZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHAKQEAgLTg5OCw5ICs4OTgsOSBAQCBJbnRSZWN0
IFJlbmRlckxpc3RCb3g6OnNjcm9sbGFibGVBcmVhQm91bmRpbmdCb3goYm9vbCopIGNvbnN0CiAg
ICAgcmV0dXJuIGFic29sdXRlQm91bmRpbmdCb3hSZWN0KCk7CiB9CiAKLWJvb2wgUmVuZGVyTGlz
dEJveDo6dXNlc01vY2tTY3JvbGxBbmltYXRvcigpIGNvbnN0Citib29sIFJlbmRlckxpc3RCb3g6
Om1vY2tTY3JvbGxBbmltYXRvckVuYWJsZWQoKSBjb25zdAogewotICAgIHJldHVybiBEZXByZWNh
dGVkR2xvYmFsU2V0dGluZ3M6OnVzZXNNb2NrU2Nyb2xsQW5pbWF0b3IoKTsKKyAgICByZXR1cm4g
c2V0dGluZ3MoKS5tb2NrU2Nyb2xsQW5pbWF0b3JFbmFibGVkKCk7CiB9CiAKIHZvaWQgUmVuZGVy
TGlzdEJveDo6bG9nTW9ja1Njcm9sbEFuaW1hdG9yTWVzc2FnZShjb25zdCBTdHJpbmcmIG1lc3Nh
Z2UpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlz
dEJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guaAppbmRleCAw
MzFmMTYyMmM4ZDRiODMzZmZiNDk0YWM5OTMwMTA5NDQ1ZjE1YTE1Li5iYjE4MTZiZjMzZjA0YTYw
MmUyMzMyZWY0Zjk3MDZiNDk0NzliNmUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyTGlzdEJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k
ZXJMaXN0Qm94LmgKQEAgLTEzOCw3ICsxMzgsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgaXNTY3Jv
bGxhYmxlT3JSdWJiZXJiYW5kYWJsZSgpIGZpbmFsOwogICAgIGJvb2wgaGFzU2Nyb2xsYWJsZU9y
UnViYmVyYmFuZGFibGVBbmNlc3RvcigpIGZpbmFsOwogICAgIEludFJlY3Qgc2Nyb2xsYWJsZUFy
ZWFCb3VuZGluZ0JveChib29sKiA9IG51bGxwdHIpIGNvbnN0IGZpbmFsOwotICAgIGJvb2wgdXNl
c01vY2tTY3JvbGxBbmltYXRvcigpIGNvbnN0IGZpbmFsOworICAgIGJvb2wgbW9ja1Njcm9sbEFu
aW1hdG9yRW5hYmxlZCgpIGNvbnN0IGZpbmFsOwogICAgIHZvaWQgbG9nTW9ja1Njcm9sbEFuaW1h
dG9yTWVzc2FnZShjb25zdCBTdHJpbmcmKSBjb25zdCBmaW5hbDsKICAgICBTdHJpbmcgZGVidWdE
ZXNjcmlwdGlvbigpIGNvbnN0IGZpbmFsOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90
ZXN0aW5nL0ludGVybmFscy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5j
cHAKaW5kZXggYjk0MGE1MjIxOTM4NTBkMTdiZGMyMTMwNzI0MDE5YmY3MmJlZmJlNS4uNTNlMzhm
YmU3NjdmMTViMjAyYmZkYjYwMWMwZTNhNzUzNDhmZDA4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3Rpbmcv
SW50ZXJuYWxzLmNwcApAQCAtNTMxLDcgKzUzMSw2IEBAIHZvaWQgSW50ZXJuYWxzOjpyZXNldFRv
Q29uc2lzdGVudFN0YXRlKFBhZ2UmIHBhZ2UpCiAgICAgV1RGOjpjbGVhckRlZmF1bHRQb3J0Rm9y
UHJvdG9jb2xNYXBGb3JUZXN0aW5nKCk7CiAgICAgb3ZlcnJpZGVVc2VyUHJlZmVycmVkTGFuZ3Vh
Z2VzKFZlY3RvcjxTdHJpbmc+KCkpOwogICAgIFdlYkNvcmU6OkRlcHJlY2F0ZWRHbG9iYWxTZXR0
aW5nczo6c2V0VXNlc092ZXJsYXlTY3JvbGxiYXJzKGZhbHNlKTsKLSAgICBXZWJDb3JlOjpEZXBy
ZWNhdGVkR2xvYmFsU2V0dGluZ3M6OnNldFVzZXNNb2NrU2Nyb2xsQW5pbWF0b3IoZmFsc2UpOwog
ICAgIGlmICghcGFnZS5tYWluRnJhbWUoKS5lZGl0b3IoKS5pc0NvbnRpbnVvdXNTcGVsbENoZWNr
aW5nRW5hYmxlZCgpKQogICAgICAgICBwYWdlLm1haW5GcmFtZSgpLmVkaXRvcigpLnRvZ2dsZUNv
bnRpbnVvdXNTcGVsbENoZWNraW5nKCk7CiAgICAgaWYgKHBhZ2UubWFpbkZyYW1lKCkuZWRpdG9y
KCkuaXNPdmVyd3JpdGVNb2RlRW5hYmxlZCgpKQpAQCAtMzgyMiwxMSArMzgyMSw2IEBAIHZvaWQg
SW50ZXJuYWxzOjpzZXRVc2VzT3ZlcmxheVNjcm9sbGJhcnMoYm9vbCBlbmFibGVkKQogI2VuZGlm
CiB9CiAKLXZvaWQgSW50ZXJuYWxzOjpzZXRVc2VzTW9ja1Njcm9sbEFuaW1hdG9yKGJvb2wgZW5h
YmxlZCkKLXsKLSAgICBXZWJDb3JlOjpEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6OnNldFVzZXNN
b2NrU2Nyb2xsQW5pbWF0b3IoZW5hYmxlZCk7Ci19Ci0KIHZvaWQgSW50ZXJuYWxzOjpmb3JjZVJl
bG9hZChib29sIGVuZFRvRW5kKQogewogICAgIE9wdGlvblNldDxSZWxvYWRPcHRpb24+IHJlbG9h
ZE9wdGlvbnM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5o
IGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaAppbmRleCBiNjhlZTQ0NzY1Y2Jm
MzMzMGFiYzUyYzZmNTZkMjM5NTQ2N2ZkMmJhLi5hYTYzYjgzNWRjZjllOGJkNTYxNjJiZWMyMTRi
NTRlYWU3ZWU4MDc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFs
cy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmgKQEAgLTU5NCw3ICs1
OTQsNiBAQCBwdWJsaWM6CiAgICAgSlNDOjpKU1ZhbHVlIGV2YWx1YXRlSW5Xb3JsZElnbm9yaW5n
RXhjZXB0aW9uKGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5nJiBzb3VyY2UpOwogCiAg
ICAgdm9pZCBzZXRVc2VzT3ZlcmxheVNjcm9sbGJhcnMoYm9vbCk7Ci0gICAgdm9pZCBzZXRVc2Vz
TW9ja1Njcm9sbEFuaW1hdG9yKGJvb2wpOwogCiAgICAgRXhjZXB0aW9uT3I8U3RyaW5nPiBnZXRD
dXJyZW50Q3Vyc29ySW5mbygpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5n
L0ludGVybmFscy5pZGwgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwKaW5k
ZXggNTE4ODg5MWIxNGUyYjRhZWIyMzczYjMzOWUwNTUxOTRhZjlkYmU0YS4uYmFlMGUwZGE4OGVk
MDAyMjE5YjQ5NzU0YzE4OWIwYTljZmI1M2Q4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv
dGVzdGluZy9JbnRlcm5hbHMuaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJu
YWxzLmlkbApAQCAtNjg3LDcgKzY4Nyw2IEBAIGVudW0gQXV0b3BsYXlQb2xpY3kgewogICAgIGFu
eSBldmFsdWF0ZUluV29ybGRJZ25vcmluZ0V4Y2VwdGlvbihET01TdHJpbmcgbmFtZSwgRE9NU3Ry
aW5nIHNvdXJjZSk7CiAKICAgICB1bmRlZmluZWQgc2V0VXNlc092ZXJsYXlTY3JvbGxiYXJzKGJv
b2xlYW4gZW5hYmxlZCk7Ci0gICAgdW5kZWZpbmVkIHNldFVzZXNNb2NrU2Nyb2xsQW5pbWF0b3Io
Ym9vbGVhbiBlbmFibGVkKTsKIAogICAgIHVuZGVmaW5lZCBmb3JjZVJlbG9hZChib29sZWFuIGVu
ZFRvRW5kKTsKICAgICB1bmRlZmluZWQgcmVsb2FkRXhwaXJlZE9ubHkoKTsKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYlByZWZlcmVuY2VzLmNwcCBiL1NvdXJjZS9XZWJL
aXRMZWdhY3kvd2luL1dlYlByZWZlcmVuY2VzLmNwcAppbmRleCBjMTdjMWJkMGI1MzA4NDM1NWQx
MDg4NjA1NTYwNzBlYWU1NzM3NzMzLi5hNTRlMmU1NjUyZTZkNDRhYmU3MzE4MmZkYzZmYzFkNjMz
MDAxNTVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJQcmVmZXJlbmNl
cy5jcHAKKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViUHJlZmVyZW5jZXMuY3BwCkBA
IC0yNjM3LDMgKzI2MzcsOCBAQCBib29sIFdlYlByZWZlcmVuY2VzOjpjYW52YXNDb2xvclNwYWNl
RW5hYmxlZCgpCiAgICAgcmV0dXJuIGJvb2xWYWx1ZUZvcktleSgiV2ViS2l0Q2FudmFzQ29sb3JT
cGFjZUVuYWJsZWQiKTsKIH0KIAorYm9vbCBXZWJQcmVmZXJlbmNlczo6bW9ja1Njcm9sbEFuaW1h
dG9yRW5hYmxlZCgpCit7CisgICAgcmV0dXJuIGJvb2xWYWx1ZUZvcktleSgiV2ViS2l0TW9ja1Nj
cm9sbEFuaW1hdG9yRW5hYmxlZCIpOworfQorCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVn
YWN5L3dpbi9XZWJQcmVmZXJlbmNlcy5oIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViUHJl
ZmVyZW5jZXMuaAppbmRleCBjNTJiNzg2Mjg5NzM5NzEyNTkwNWRjYjM3MTU5OTk0YzI5NzBjMjc1
Li4yODljZWEwOGEzN2IzNzkyYzAyNTNlN2NlYWYwYmNkMzc0OTAzY2IwIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJQcmVmZXJlbmNlcy5oCisrKyBiL1NvdXJjZS9XZWJL
aXRMZWdhY3kvd2luL1dlYlByZWZlcmVuY2VzLmgKQEAgLTM0Niw2ICszNDYsNyBAQCBwdWJsaWM6
CiAgICAgLy8gVGhlIGZvbGxvd2luZyBwcmVmZXJlbmNlIGFjY2Vzc29ycyBhcmUgbm90IGV4cG9z
ZWQgdmlhIElXZWJQcmVmZXJlbmNlcyogYXMgdGhleSBhcmUgb25seQogICAgIC8vIG5lZWRlZCBm
b3IgdGVzdGluZyBwdXJwb3NlcyBhbmQgY2FuIGJlIHRvZ2dsZWQgdmlhIHRoZSBzZXQqUHJlZmVy
ZW5jZUZvclRlc3RpbmcgZnVuY3Rpb25zLgogICAgIGJvb2wgY2FudmFzQ29sb3JTcGFjZUVuYWJs
ZWQoKTsKKyAgICBib29sIG1vY2tTY3JvbGxBbmltYXRvckVuYWJsZWQoKTsKIAogcHJpdmF0ZToK
ICAgICBXZWJQcmVmZXJlbmNlcygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS93
aW4vV2ViVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJWaWV3LmNwcAppbmRl
eCA3NjUzYmEwYjU2OTEzZDZiNjAwNTA2MDBjMTcyMjg4MjM3NzY5MmY4Li5kZTUwZDMyNzkxM2Iz
N2FjNmM4MjhiMDM2ZWViNDVmMzlmMDNmMDBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVn
YWN5L3dpbi9XZWJWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJWaWV3
LmNwcApAQCAtNTY1OSw2ICs1NjU5LDcgQEAgSFJFU1VMVCBXZWJWaWV3Ojpub3RpZnlQcmVmZXJl
bmNlc0NoYW5nZWQoSVdlYk5vdGlmaWNhdGlvbiogbm90aWZpY2F0aW9uKQogICAgIHNldHRpbmdz
LnNldE92ZXJzY3JvbGxCZWhhdmlvckVuYWJsZWQoISFlbmFibGVkKTsKIAogICAgIHNldHRpbmdz
LnNldENhbnZhc0NvbG9yU3BhY2VFbmFibGVkKG1fcHJlZmVyZW5jZXMtPmNhbnZhc0NvbG9yU3Bh
Y2VFbmFibGVkKCkpOworICAgIHNldHRpbmdzLnNldE1vY2tTY3JvbGxBbmltYXRvckVuYWJsZWQo
bV9wcmVmZXJlbmNlcy0+bW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZCgpKTsKIAogICAgIHJldHVy
biBTX09LOwogfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVz
dHMvQ2hhbmdlTG9nCmluZGV4IGMwMzM5MTZiYjFjMTc5ZWY0M2ZiN2Y3NjhmOGI5MDI3MTY5NzNj
YzcuLjcwN2UwZTE3MjgwYWQ1ZjQ0MzJkMzUzM2NiZGMyMTQ4N2NkOGNiMDEgMTAwNjQ0Ci0tLSBh
L0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwxNyBAQAorMjAyMS0wOS0xNiAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxl
LmNvbT4KKworICAgICAgICBDb252ZXJ0IHVzZXNNb2NrU2Nyb2xsQW5pbWF0b3IgZnJvbSBhIERl
cHJlY2F0ZWRHbG9iYWxTZXR0aW5ncyB0byBhIFdlYlByZWZlcmVuY2UKKyAgICAgICAgaHR0cHM6
Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDM3MQorCisgICAgICAgIFJldmll
d2VkIGJ5IFRpbSBIb3J0b24uCisgICAgICAgIAorICAgICAgICBDb252ZXJ0IHRvIHVzZSB0aGUg
IDwhLS0gd2Via2l0LXRlc3QtcnVubmVyIC0tPiBmb3JtYXQgZm9yIHNwZWNpZnlpbmcgTW9ja1Nj
cm9sbEFuaW1hdG9yRW5hYmxlZC4KKworICAgICAgICAqIGZhc3Qvc2Nyb2xsaW5nL3Njcm9sbC1h
bmltYXRvci1iYXNpYy1ldmVudHMuaHRtbDoKKyAgICAgICAgKiBmYXN0L3Njcm9sbGluZy9zY3Jv
bGwtYW5pbWF0b3Itb3ZlcmxheS1zY3JvbGxiYXJzLWNsaWNrZWQuaHRtbDoKKyAgICAgICAgKiBm
YXN0L3Njcm9sbGluZy9zY3JvbGwtYW5pbWF0b3Itb3ZlcmxheS1zY3JvbGxiYXJzLWhvdmVyZWQu
aHRtbDoKKyAgICAgICAgKiBmYXN0L3Njcm9sbGluZy9zY3JvbGwtYW5pbWF0b3Itc2VsZWN0LWxp
c3QtZXZlbnRzLmh0bWw6CisKIDIwMjEtMDktMTYgIEVyaWMgSHV0Y2hpc29uICA8ZWh1dGNoaXNv
bkBhcHBsZS5jb20+CiAKICAgICAgICAgVXBkYXRlIHRlc3QgZXhwZWN0YXRpb25zIGZvciBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3NvbS9zdHlsZXNoZWV0LXNhbWUtb3Jp
Z2luLnN1Yi5odG1sLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvc2Ny
b2xsLWFuaW1hdG9yLWJhc2ljLWV2ZW50cy5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxp
bmcvc2Nyb2xsLWFuaW1hdG9yLWJhc2ljLWV2ZW50cy5odG1sCmluZGV4IDdmNjE1OGRiNDMxMTdj
MWFkYzk1MDVjZDkyYjM3MzZmYWRjYWRjOTIuLjBmMWQ4ZjBjNDZjOWJkMzFmZWUzZDAwOGFjZDBj
ODc3OTlhN2RhYTcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL3Njcm9s
bC1hbmltYXRvci1iYXNpYy1ldmVudHMuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3Njcm9s
bGluZy9zY3JvbGwtYW5pbWF0b3ItYmFzaWMtZXZlbnRzLmh0bWwKQEAgLTEsNCArMSw0IEBACi08
aHRtbD4KKzxodG1sPiA8IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBbIE1vY2tTY3JvbGxBbmltYXRv
ckVuYWJsZWQ9dHJ1ZSBdIC0tPgogPHN0eWxlPgogICAgICNzY3JvbGxtZSB7CiAgICAgICAgIHdp
ZHRoOiAxMDBweDsKQEAgLTEyLDggKzEyLDYgQEAKIDxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJj
ZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgogPHNjcmlwdD4KICAgICBqc1Rlc3RJc0FzeW5j
ID0gdHJ1ZTsKLSAgICBpZiAod2luZG93LmludGVybmFscykKLSAgICAgICAgd2luZG93LmludGVy
bmFscy5zZXRVc2VzTW9ja1Njcm9sbEFuaW1hdG9yKHRydWUpOwogCiAgICAgd2luZG93Lm9ubG9h
ZCA9IGZ1bmN0aW9uKCkgewogICAgICAgICBpZiAod2luZG93LmludGVybmFscykKZGlmZiAtLWdp
dCBhL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL3Njcm9sbC1hbmltYXRvci1vdmVybGF5LXNj
cm9sbGJhcnMtY2xpY2tlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvc2Nyb2xs
LWFuaW1hdG9yLW92ZXJsYXktc2Nyb2xsYmFycy1jbGlja2VkLmh0bWwKaW5kZXggZGVkMzA4ZGZm
M2RmMjkwNTU2NjVmYTc1YmU2YjQyOGZhN2I0ZmE3Ny4uYzMyNjI0MjIzMTI5ODFlODBlOGNiMjZj
Y2Q3NzQ1Zjk0M2EzMjZmZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcv
c2Nyb2xsLWFuaW1hdG9yLW92ZXJsYXktc2Nyb2xsYmFycy1jbGlja2VkLmh0bWwKKysrIGIvTGF5
b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvc2Nyb2xsLWFuaW1hdG9yLW92ZXJsYXktc2Nyb2xsYmFy
cy1jbGlja2VkLmh0bWwKQEAgLTEsOSArMSw4IEBACi08aHRtbD4KKzxodG1sPiA8IS0tIHdlYmtp
dC10ZXN0LXJ1bm5lciBbIE1vY2tTY3JvbGxBbmltYXRvckVuYWJsZWQ9dHJ1ZSBdIC0tPgogPHNj
cmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+CiA8c2Ny
aXB0PgogICAgIGpzVGVzdElzQXN5bmMgPSB0cnVlOwogICAgIGlmICh3aW5kb3cuaW50ZXJuYWxz
KSB7Ci0gICAgICAgIHdpbmRvdy5pbnRlcm5hbHMuc2V0VXNlc01vY2tTY3JvbGxBbmltYXRvcih0
cnVlKTsKICAgICAgICAgd2luZG93LmludGVybmFscy5zZXRVc2VzT3ZlcmxheVNjcm9sbGJhcnMo
dHJ1ZSk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9z
Y3JvbGwtYW5pbWF0b3Itb3ZlcmxheS1zY3JvbGxiYXJzLWhvdmVyZWQuaHRtbCBiL0xheW91dFRl
c3RzL2Zhc3Qvc2Nyb2xsaW5nL3Njcm9sbC1hbmltYXRvci1vdmVybGF5LXNjcm9sbGJhcnMtaG92
ZXJlZC5odG1sCmluZGV4IDVlNDU5ZDY0MzQwYmJkNTRhZTJhNDQ1ZjZiY2MyMGJiMThhZDU0ODUu
LjkxNGFhM2UyNDllYWRhYWFhY2NiMGJmMGZkZmQ3MzlmMzViZTk3YmEgMTAwNjQ0Ci0tLSBhL0xh
eW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL3Njcm9sbC1hbmltYXRvci1vdmVybGF5LXNjcm9sbGJh
cnMtaG92ZXJlZC5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL3Njcm9sbC1h
bmltYXRvci1vdmVybGF5LXNjcm9sbGJhcnMtaG92ZXJlZC5odG1sCkBAIC0xLDkgKzEsOCBAQAot
PGh0bWw+Cis8aHRtbD4gPCEtLSB3ZWJraXQtdGVzdC1ydW5uZXIgWyBNb2NrU2Nyb2xsQW5pbWF0
b3JFbmFibGVkPXRydWUgXSAtLT4KIDxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvanMtdGVz
dC1wcmUuanMiPjwvc2NyaXB0PgogPHNjcmlwdD4KICAgICBqc1Rlc3RJc0FzeW5jID0gdHJ1ZTsK
ICAgICBpZiAod2luZG93LmludGVybmFscykgewotICAgICAgICB3aW5kb3cuaW50ZXJuYWxzLnNl
dFVzZXNNb2NrU2Nyb2xsQW5pbWF0b3IodHJ1ZSk7CiAgICAgICAgIHdpbmRvdy5pbnRlcm5hbHMu
c2V0VXNlc092ZXJsYXlTY3JvbGxiYXJzKHRydWUpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvTGF5
b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvc2Nyb2xsLWFuaW1hdG9yLXNlbGVjdC1saXN0LWV2ZW50
cy5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvc2Nyb2xsLWFuaW1hdG9yLXNlbGVj
dC1saXN0LWV2ZW50cy5odG1sCmluZGV4IDVmNDkwYWZjNWM4OTdlY2UwMjBjZmY3MjFkZTNiMWM3
MjU4YTM0NmIuLmJmYWQ3MTExZmFmODA1OGI3YTU5M2QxOGI3ODdmNjVmYWQ4OTIwY2YgMTAwNjQ0
Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL3Njcm9sbC1hbmltYXRvci1zZWxlY3Qt
bGlzdC1ldmVudHMuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9zY3JvbGwt
YW5pbWF0b3Itc2VsZWN0LWxpc3QtZXZlbnRzLmh0bWwKQEAgLTEsOSArMSw3IEBACi08aHRtbD4K
KzxodG1sPiA8IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBbIE1vY2tTY3JvbGxBbmltYXRvckVuYWJs
ZWQ9dHJ1ZSBdIC0tPgogPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXByZS5q
cyI+PC9zY3JpcHQ+CiA8c2NyaXB0PgogICAgIGpzVGVzdElzQXN5bmMgPSB0cnVlOwotICAgIGlm
ICh3aW5kb3cuaW50ZXJuYWxzKQotICAgICAgICB3aW5kb3cuaW50ZXJuYWxzLnNldFVzZXNNb2Nr
U2Nyb2xsQW5pbWF0b3IodHJ1ZSk7CiAKICAgICB3aW5kb3cub25sb2FkID0gZnVuY3Rpb24oKSB7
CiAgICAgICAgIGlmICh3aW5kb3cuaW50ZXJuYWxzKQo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>438496</attachid>
            <date>2021-09-17 11:46:35 -0700</date>
            <delta_ts>2021-09-17 13:07:32 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-230371-20210917114634.patch</filename>
            <type>text/plain</type>
            <size>21502</size>
            <attacher name="Simon Fraser (smfr)">simon.fraser</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyNTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n
ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGE3ODYwMmY2YTQzNzIxODNmMzhmYWM0
YTEyYjA5MWFkZTk4MzZlMzkuLjBkMjEzNzg0NmNmYzgyYWFlZWVkYTFkYzg5YmRkNTNkMWE3MWM0
NzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDktMTcgIFNpbW9uIEZyYXNlciAgPHNpbW9u
LmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgQ29udmVydCB1c2VzTW9ja1Njcm9sbEFuaW1h
dG9yIGZyb20gYSBEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3MgdG8gYSBXZWJQcmVmZXJlbmNlCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzAzNzEKKwor
ICAgICAgICBSZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgIEFkZCBhIE1vY2tTY3Jv
bGxBbmltYXRvckVuYWJsZWQgc2V0dGluZy4KKworICAgICAgICAqIFNjcmlwdHMvUHJlZmVyZW5j
ZXMvV2ViUHJlZmVyZW5jZXMueWFtbDoKKwogMjAyMS0wOS0xNiAgWW91ZW5uIEZhYmxldCAgPHlv
dWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgRW5hYmxlIFJUQ1J0cFNjcmlwdFRyYW5zZm9ybSBi
eSBkZWZhdWx0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2Uv
V2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjMyYWZjNTY3ZmNmYTQ4NmIxNWJiZTUxZTFkZjhjZjg5
MDQ0Yjg0Yy4uZDZmMDYwZjg0YmM3MTgwNmRlZTQ0YmFmN2Y4OGNmOWM5MmIzYjJmYiAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwpAQCAtMSwzICsxLDQ2IEBACisyMDIxLTA5LTE3ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5m
cmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENvbnZlcnQgdXNlc01vY2tTY3JvbGxBbmltYXRv
ciBmcm9tIGEgRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzIHRvIGEgV2ViUHJlZmVyZW5jZQorICAg
ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMwMzcxCisKKyAg
ICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICBUaGVyZSB3ZXJlIG9yZGVy
aW5nIHByb2JsZW1zIHRoYXQgcmVzdWx0ZWQgZnJvbSB0aW1pbmcgb2YgYSB0ZXN0IGNhbGxpbmcK
KyAgICAgICAgaW50ZXJuYWxzLnNldFVzZXNNb2NrU2Nyb2xsQW5pbWF0b3IodHJ1ZSkgYW5kIHRo
ZSBmaXJzdCBhY2Nlc3Mgb2YgdGhlIHNjcm9sbEFuaW1hdG9yKCksCisgICAgICAgIHdoaWNoIHJl
c3VsdGVkIGluIGZhc3Qvc2Nyb2xsaW5nL3Njcm9sbC1hbmltYXRvci1zZWxlY3QtbGlzdC1ldmVu
dHMuaHRtbCBmYWlsaW5nCisgICAgICAgIHdoZW4gcnVuIHR3aWNlIGluIGEgcm93LgorCisgICAg
ICAgIEZpeCBieSBtYWtpbmcgdXNlc01vY2tTY3JvbGxBbmltYXRvciBhIFdlYlByZWZlcmVuY2Us
IHdoaWNoIG1lYW5zIHRoYXQgdGVzdHMKKyAgICAgICAgY2FuIHVzZSA8IS0tIHdlYmtpdC10ZXN0
LXJ1bm5lciAtLT4gb3B0aW9ucyB0byBlbmFibGUgaXQsIHdoaWNoIGF2b2lkcyB0aGUKKyAgICAg
ICAgb3JkZXJpbmcgZGVwZW5kZW5jeS4KKworICAgICAgICAqIHBhZ2UvRGVwcmVjYXRlZEdsb2Jh
bFNldHRpbmdzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRlcHJlY2F0ZWRHbG9iYWxTZXR0aW5n
czo6c2V0VXNlc01vY2tTY3JvbGxBbmltYXRvcik6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3Jl
OjpEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6OnVzZXNNb2NrU2Nyb2xsQW5pbWF0b3IpOiBEZWxl
dGVkLgorICAgICAgICAqIHBhZ2UvRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzLmg6CisgICAgICAg
ICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojptb2Nr
U2Nyb2xsQW5pbWF0b3JFbmFibGVkIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmll
dzo6dXNlc01vY2tTY3JvbGxBbmltYXRvciBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogcGFn
ZS9GcmFtZVZpZXcuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpTY3JvbGxhYmxlQXJlYTo6c2Nyb2xsQW5pbWF0b3IgY29uc3QpOgor
ICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmg6CisgICAgICAgIChXZWJDb3JlOjpT
Y3JvbGxhYmxlQXJlYTo6bW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZCBjb25zdCk6CisgICAgICAg
IChXZWJDb3JlOjpTY3JvbGxhYmxlQXJlYTo6dXNlc01vY2tTY3JvbGxBbmltYXRvciBjb25zdCk6
IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEu
Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYTo6bW9ja1Nj
cm9sbEFuaW1hdG9yRW5hYmxlZCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXll
clNjcm9sbGFibGVBcmVhOjp1c2VzTW9ja1Njcm9sbEFuaW1hdG9yIGNvbnN0KTogRGVsZXRlZC4K
KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5oOgorICAgICAg
ICAqIHJlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl
ckxpc3RCb3g6Om1vY2tTY3JvbGxBbmltYXRvckVuYWJsZWQgY29uc3QpOgorICAgICAgICAoV2Vi
Q29yZTo6UmVuZGVyTGlzdEJveDo6dXNlc01vY2tTY3JvbGxBbmltYXRvciBjb25zdCk6IERlbGV0
ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guaDoKKyAgICAgICAgKiB0ZXN0
aW5nL0ludGVybmFscy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnRlcm5hbHM6OnJlc2V0VG9D
b25zaXN0ZW50U3RhdGUpOgorICAgICAgICAoV2ViQ29yZTo6SW50ZXJuYWxzOjpzZXRVc2VzTW9j
a1Njcm9sbEFuaW1hdG9yKTogRGVsZXRlZC4KKyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5o
OgorICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmlkbDoKKwogMjAyMS0wOS0xNiAgVHlsZXIg
V2lsY29jayA8dHdpbGNvLm9AcHJvdG9ubWFpbC5jb20+IGFuZCBNeWxlcyBDLiBNYXhmaWVsZCAg
PG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgZm9udC13ZWlnaHQgc2hvdWxkIGFsd2F5
cyBzZXJpYWxpemUgYXMgYSBudW1iZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kv
d2luL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZwppbmRleCA4
NmYyMGMyYmZjNmY3NjY3NzE3ZTg2YTU5NDdmZTJmNmQzZWMzMGFjLi43NzMyYTBlNzUxY2EyYTI2
NTEzNjljNGRiNDNlNmI3MTQxYzRjNDI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5
L3dpbi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vQ2hhbmdlTG9nCkBA
IC0xLDMgKzEsMTggQEAKKzIwMjEtMDktMTcgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBh
cHBsZS5jb20+CisKKyAgICAgICAgQ29udmVydCB1c2VzTW9ja1Njcm9sbEFuaW1hdG9yIGZyb20g
YSBEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3MgdG8gYSBXZWJQcmVmZXJlbmNlCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzAzNzEKKworICAgICAgICBS
ZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgIEFkZCBXaW5kb3dzIHByZWZlcmVuY2Vz
LgorCisgICAgICAgICogV2ViUHJlZmVyZW5jZXMuY3BwOgorICAgICAgICAoV2ViUHJlZmVyZW5j
ZXM6Om1vY2tTY3JvbGxBbmltYXRvckVuYWJsZWQpOgorICAgICAgICAqIFdlYlByZWZlcmVuY2Vz
Lmg6CisgICAgICAgICogV2ViVmlldy5jcHA6CisgICAgICAgIChXZWJWaWV3Ojpub3RpZnlQcmVm
ZXJlbmNlc0NoYW5nZWQpOgorCiAyMDIxLTA5LTE0ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBs
ZS5jb20+CiAKICAgICAgICAgW0hhcmRlbmluZ10gVmFsaWRhdGUgSURCVmFsdWUncyBibG9iIHBh
dGhzIGluIFdlYklEQlNlcnZlcjo6cHV0T3JBZGQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi9T
Y3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzLnlhbWwgYi9Tb3VyY2UvV1RGL1Njcmlw
dHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXMueWFtbAppbmRleCAyNWFmYjI1MDhlOGNkNDVk
ZjU1MDQ0ZDYxZTYyYTg0YTE2MzM2YmVhLi5jOThmMDhmZmRmNDdhYTUwYmQ0Y2MxNDAwYzY5NTA0
ZTJjYzI2ZmI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2Vi
UHJlZmVyZW5jZXMueWFtbAorKysgYi9Tb3VyY2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2Vi
UHJlZmVyZW5jZXMueWFtbApAQCAtMTUyMCw2ICsxNTIwLDE2IEBAIE1vY2tDYXB0dXJlRGV2aWNl
c1Byb21wdEVuYWJsZWQ6CiAgICAgV2ViS2l0OgogICAgICAgZGVmYXVsdDogdHJ1ZQogCitNb2Nr
U2Nyb2xsQW5pbWF0b3JFbmFibGVkOgorICB0eXBlOiBib29sCisgIGRlZmF1bHRWYWx1ZToKKyAg
ICBXZWJLaXRMZWdhY3k6CisgICAgICBkZWZhdWx0OiBmYWxzZQorICAgIFdlYktpdDoKKyAgICAg
IGRlZmF1bHQ6IGZhbHNlCisgICAgV2ViQ29yZToKKyAgICAgIGRlZmF1bHQ6IGZhbHNlCisKIE1v
Y2tTY3JvbGxiYXJzRW5hYmxlZDoKICAgdHlwZTogYm9vbAogICB3ZWJjb3JlQmluZGluZzogRGVw
cmVjYXRlZEdsb2JhbFNldHRpbmdzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Rl
cHJlY2F0ZWRHbG9iYWxTZXR0aW5ncy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RlcHJlY2F0
ZWRHbG9iYWxTZXR0aW5ncy5jcHAKaW5kZXggMDFhYjk1YjYyZjFhYTNmYTNhYjMzYmE3YjRmOTA2
MmVmZTlkMGFkMi4uNDY1ZDk5ZDlmMGM1ZGE2YTg5OGU5NmYyNTYzZTUwZThjNTNlMzRmZSAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9EZXByZWNhdGVkR2xvYmFsU2V0dGluZ3MuY3Bw
CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzLmNwcApA
QCAtNDMsNyArNDMsNiBAQCBib29sIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6Z0dTdHJlYW1l
ckVuYWJsZWQgPSB0cnVlOwogCiBib29sIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6Z01vY2tT
Y3JvbGxiYXJzRW5hYmxlZCA9IGZhbHNlOwogYm9vbCBEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6
OmdVc2VzT3ZlcmxheVNjcm9sbGJhcnMgPSBmYWxzZTsKLWJvb2wgRGVwcmVjYXRlZEdsb2JhbFNl
dHRpbmdzOjpnTW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZCA9IGZhbHNlOwogCiAjaWYgUExBVEZP
Uk0oV0lOKQogYm9vbCBEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6OmdTaG91bGRVc2VIaWdoUmVz
b2x1dGlvblRpbWVycyA9IHRydWU7CkBAIC0xMjUsMTYgKzEyNCw2IEBAIGJvb2wgRGVwcmVjYXRl
ZEdsb2JhbFNldHRpbmdzOjp1c2VzT3ZlcmxheVNjcm9sbGJhcnMoKQogICAgIHJldHVybiBnVXNl
c092ZXJsYXlTY3JvbGxiYXJzOwogfQogCi12b2lkIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6
c2V0VXNlc01vY2tTY3JvbGxBbmltYXRvcihib29sIGZsYWcpCi17Ci0gICAgZ01vY2tTY3JvbGxB
bmltYXRvckVuYWJsZWQgPSBmbGFnOwotfQotCi1ib29sIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5n
czo6dXNlc01vY2tTY3JvbGxBbmltYXRvcigpCi17Ci0gICAgcmV0dXJuIGdNb2NrU2Nyb2xsQW5p
bWF0b3JFbmFibGVkOwotfQotCiB2b2lkIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6c2V0TG93
UG93ZXJWaWRlb0F1ZGlvQnVmZmVyU2l6ZUVuYWJsZWQoYm9vbCBmbGFnKQogewogICAgIGdMb3dQ
b3dlclZpZGVvQXVkaW9CdWZmZXJTaXplRW5hYmxlZCA9IGZsYWc7CmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViQ29yZS9wYWdlL0RlcHJlY2F0ZWRHbG9iYWxTZXR0aW5ncy5oIGIvU291cmNlL1dlYkNv
cmUvcGFnZS9EZXByZWNhdGVkR2xvYmFsU2V0dGluZ3MuaAppbmRleCBkMGEzNTJiOTNlZWZiODE1
MDNlYTliNTA0YWE3YTFmZGZlMjQ3ZjNmLi45NjFhOTFkYWMxZDk5MWY5NmM0Yjk1YjA3YzE1ZjBk
ZTE5MTcxYjk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RlcHJlY2F0ZWRHbG9i
YWxTZXR0aW5ncy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGVwcmVjYXRlZEdsb2JhbFNl
dHRpbmdzLmgKQEAgLTU3LDkgKzU3LDYgQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIHN0
YXRpYyB2b2lkIHNldFVzZXNPdmVybGF5U2Nyb2xsYmFycyhib29sIGZsYWcpOwogICAgIHN0YXRp
YyBib29sIHVzZXNPdmVybGF5U2Nyb2xsYmFycygpOwogCi0gICAgV0VCQ09SRV9FWFBPUlQgc3Rh
dGljIHZvaWQgc2V0VXNlc01vY2tTY3JvbGxBbmltYXRvcihib29sKTsKLSAgICBzdGF0aWMgYm9v
bCB1c2VzTW9ja1Njcm9sbEFuaW1hdG9yKCk7Ci0KICAgICBzdGF0aWMgYm9vbCBsb3dQb3dlclZp
ZGVvQXVkaW9CdWZmZXJTaXplRW5hYmxlZCgpIHsgcmV0dXJuIGdMb3dQb3dlclZpZGVvQXVkaW9C
dWZmZXJTaXplRW5hYmxlZDsgfQogICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyB2b2lkIHNldExv
d1Bvd2VyVmlkZW9BdWRpb0J1ZmZlclNpemVFbmFibGVkKGJvb2wpOwogCkBAIC0xMDMsNyArMTAw
LDYgQEAgcHJpdmF0ZToKIAogICAgIHN0YXRpYyBib29sIGdNb2NrU2Nyb2xsYmFyc0VuYWJsZWQ7
CiAgICAgc3RhdGljIGJvb2wgZ1VzZXNPdmVybGF5U2Nyb2xsYmFyczsKLSAgICBzdGF0aWMgYm9v
bCBnTW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZDsKIAogI2lmIFBMQVRGT1JNKFdJTikKICAgICBz
dGF0aWMgYm9vbCBnU2hvdWxkVXNlSGlnaFJlc29sdXRpb25UaW1lcnM7CmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zy
YW1lVmlldy5jcHAKaW5kZXggYWI0OGZlZTE4ZTdjYTY3NTYzYzIzNTU1MWVmYzAwNGFlN2ExNzFj
OC4uNTVlOWIzMTliODVmN2M0ZDZkYzM4NzI2OTZhZjRhNDg0ZTJkZTFiYiAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh
Z2UvRnJhbWVWaWV3LmNwcApAQCAtMTQ0NSw5ICsxNDQ1LDkgQEAgYm9vbCBGcmFtZVZpZXc6OnVz
ZXNBc3luY1Njcm9sbGluZygpIGNvbnN0CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1ib29sIEZy
YW1lVmlldzo6dXNlc01vY2tTY3JvbGxBbmltYXRvcigpIGNvbnN0Citib29sIEZyYW1lVmlldzo6
bW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIERlcHJlY2F0
ZWRHbG9iYWxTZXR0aW5nczo6dXNlc01vY2tTY3JvbGxBbmltYXRvcigpOworICAgIHJldHVybiBm
cmFtZSgpLnNldHRpbmdzKCkubW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZCgpOwogfQogCiB2b2lk
IEZyYW1lVmlldzo6bG9nTW9ja1Njcm9sbEFuaW1hdG9yTWVzc2FnZShjb25zdCBTdHJpbmcmIG1l
c3NhZ2UpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5o
IGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAppbmRleCBlYjI4MTExOTUzYmFiMDRi
YWNhYzBkMjE0NjM2NjFlYjhiNDQwNTgyLi41NDEzNTVjYWE0NDQxODNjYjVkODRkMDM4MWQ1ODg2
ZDRhNzRkZTQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCisr
KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKQEAgLTc3Miw3ICs3NzIsNyBAQCBw
cml2YXRlOgogI2VuZGlmCiAKICAgICBib29sIHVzZXNDb21wb3NpdGVkU2Nyb2xsaW5nKCkgY29u
c3QgZmluYWw7Ci0gICAgYm9vbCB1c2VzTW9ja1Njcm9sbEFuaW1hdG9yKCkgY29uc3QgZmluYWw7
CisgICAgYm9vbCBtb2NrU2Nyb2xsQW5pbWF0b3JFbmFibGVkKCkgY29uc3QgZmluYWw7CiAgICAg
dm9pZCBsb2dNb2NrU2Nyb2xsQW5pbWF0b3JNZXNzYWdlKGNvbnN0IFN0cmluZyYpIGNvbnN0IGZp
bmFsOwogCiAgICAgYm9vbCBzdHlsZUhpZGVzU2Nyb2xsYmFyV2l0aE9yaWVudGF0aW9uKFNjcm9s
bGJhck9yaWVudGF0aW9uKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL1Njcm9sbGFibGVBcmVhLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFi
bGVBcmVhLmNwcAppbmRleCA5NjdlMTMyNmFiZTViMzAwYTcyNzZiNDRlYjk4NGIxNzlhYjQzNTVi
Li4zYWI1YmE2YTQ1NjhkZmY5NzlhMWY4YTc1YWQ2ODk2NWNlM2ExNDcwIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5jcHAKKysrIGIvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuY3BwCkBAIC03NSw3ICs3NSw3IEBAIFNjcm9s
bGFibGVBcmVhOjp+U2Nyb2xsYWJsZUFyZWEoKSA9IGRlZmF1bHQ7CiBTY3JvbGxBbmltYXRvciYg
U2Nyb2xsYWJsZUFyZWE6OnNjcm9sbEFuaW1hdG9yKCkgY29uc3QKIHsKICAgICBpZiAoIW1fc2Ny
b2xsQW5pbWF0b3IpIHsKLSAgICAgICAgaWYgKHVzZXNNb2NrU2Nyb2xsQW5pbWF0b3IoKSkgewor
ICAgICAgICBpZiAobW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZCgpKSB7CiAgICAgICAgICAgICBt
X3Njcm9sbEFuaW1hdG9yID0gbWFrZVVuaXF1ZTxTY3JvbGxBbmltYXRvck1vY2s+KGNvbnN0X2Nh
c3Q8U2Nyb2xsYWJsZUFyZWEmPigqdGhpcyksIFt0aGlzXShjb25zdCBTdHJpbmcmIG1lc3NhZ2Up
IHsKICAgICAgICAgICAgICAgICBsb2dNb2NrU2Nyb2xsQW5pbWF0b3JNZXNzYWdlKG1lc3NhZ2Up
OwogICAgICAgICAgICAgfSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9T
Y3JvbGxhYmxlQXJlYS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEu
aAppbmRleCBmZDM5NjMzMzgwYjk0N2EyMDUwYTdiODY4MGM1Nzk5MGY2ZDc1Y2I2Li40ZTlmNjVm
YjE3NzEzZjA3ZGMzNjJlZTcyZWUxOTU1NzNmMzQ5YjcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL1Njcm9sbGFibGVBcmVhLmgKQEAgLTMzNCw3ICszMzQsNyBAQCBwdWJsaWM6CiAgICAgdm9p
ZCB2ZXJ0aWNhbFNjcm9sbGJhckxheWVyRGlkQ2hhbmdlKCk7CiAgICAgdm9pZCBob3Jpem9udGFs
U2Nyb2xsYmFyTGF5ZXJEaWRDaGFuZ2UoKTsKIAotICAgIHZpcnR1YWwgYm9vbCB1c2VzTW9ja1Nj
cm9sbEFuaW1hdG9yKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KKyAgICB2aXJ0dWFsIGJvb2wg
bW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAgICAg
dmlydHVhbCB2b2lkIGxvZ01vY2tTY3JvbGxBbmltYXRvck1lc3NhZ2UoY29uc3QgU3RyaW5nJikg
Y29uc3QgeyB9OwogCiAgICAgdmlydHVhbCBib29sIHNob3VsZFBsYWNlVmVydGljYWxTY3JvbGxi
YXJPbkxlZnQoKSBjb25zdCA9IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp
bmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp
bmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5jcHAKaW5kZXggM2JlNjZlNmJkMGIzZmE3Zjky
ZDk4NzVhMTdjYjU5Zjc4NDgzMWIxOC4uYjBlZDQ0OTRhYTVmZTBjZDg4N2FhMjRiOGYzZjJhMmU3
MjI3MmI0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy
U2Nyb2xsYWJsZUFyZWEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM
YXllclNjcm9sbGFibGVBcmVhLmNwcApAQCAtMTgzMiw5ICsxODMyLDkgQEAgdm9pZCBSZW5kZXJM
YXllclNjcm9sbGFibGVBcmVhOjp1cGRhdGVMYXllclBvc2l0aW9uc0FmdGVyT3ZlcmZsb3dTY3Jv
bGwoKQogICAgIG1fbGF5ZXIudXBkYXRlTGF5ZXJQb3NpdGlvbnNBZnRlclNjcm9sbCgmZ2VvbWV0
cnlNYXAsIFJlbmRlckxheWVyOjpJc092ZXJmbG93U2Nyb2xsKTsKIH0KIAotYm9vbCBSZW5kZXJM
YXllclNjcm9sbGFibGVBcmVhOjp1c2VzTW9ja1Njcm9sbEFuaW1hdG9yKCkgY29uc3QKK2Jvb2wg
UmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYTo6bW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZCgpIGNv
bnN0CiB7Ci0gICAgcmV0dXJuIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6dXNlc01vY2tTY3Jv
bGxBbmltYXRvcigpOworICAgIHJldHVybiBtX2xheWVyLnJlbmRlcmVyKCkuc2V0dGluZ3MoKS5t
b2NrU2Nyb2xsQW5pbWF0b3JFbmFibGVkKCk7CiB9CiAKIHZvaWQgUmVuZGVyTGF5ZXJTY3JvbGxh
YmxlQXJlYTo6bG9nTW9ja1Njcm9sbEFuaW1hdG9yTWVzc2FnZShjb25zdCBTdHJpbmcmIG1lc3Nh
Z2UpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5
ZXJTY3JvbGxhYmxlQXJlYS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy
U2Nyb2xsYWJsZUFyZWEuaAppbmRleCAzYWIyOGNiNjFkYjI3YzU2YTJjZDhiOTc1Yzk3MmI3ODE0
ODg3MTA4Li5jYzgxOThkY2UzZTZkNDBhZjk5OTAxZjE4MDA2YTY0N2NiYWYzNDBlIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5o
CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFibGVBcmVh
LmgKQEAgLTE5MCw3ICsxOTAsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc1J1YmJlckJhbmRJblBy
b2dyZXNzKCkgY29uc3QgZmluYWw7CiAgICAgYm9vbCBmb3JjZVVwZGF0ZVNjcm9sbGJhcnNPbk1h
aW5UaHJlYWRGb3JQZXJmb3JtYW5jZVRlc3RpbmcoKSBjb25zdCBmaW5hbDsKICAgICBib29sIGlz
U2Nyb2xsU25hcEluUHJvZ3Jlc3MoKSBjb25zdCBmaW5hbDsKLSAgICBib29sIHVzZXNNb2NrU2Ny
b2xsQW5pbWF0b3IoKSBjb25zdCBmaW5hbDsKKyAgICBib29sIG1vY2tTY3JvbGxBbmltYXRvckVu
YWJsZWQoKSBjb25zdCBmaW5hbDsKICAgICB2b2lkIGxvZ01vY2tTY3JvbGxBbmltYXRvck1lc3Nh
Z2UoY29uc3QgU3RyaW5nJikgY29uc3QgZmluYWw7CiAKICAgICBTdHJpbmcgZGVidWdEZXNjcmlw
dGlvbigpIGNvbnN0IGZpbmFsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n
L1JlbmRlckxpc3RCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RC
b3guY3BwCmluZGV4IDFkZTY5ZDY5MzZlYTUwODllOGUwZTZjMmQxYWMwZDVkNDc2OTFkOTguLmZm
YzBkYjcxYzhlNTEyYTUxZDM5ZDNmMjkxZWM2OWZkYTI1MGJjNjUgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y
ZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHAKQEAgLTg5OCw5ICs4OTgsOSBAQCBJbnRSZWN0
IFJlbmRlckxpc3RCb3g6OnNjcm9sbGFibGVBcmVhQm91bmRpbmdCb3goYm9vbCopIGNvbnN0CiAg
ICAgcmV0dXJuIGFic29sdXRlQm91bmRpbmdCb3hSZWN0KCk7CiB9CiAKLWJvb2wgUmVuZGVyTGlz
dEJveDo6dXNlc01vY2tTY3JvbGxBbmltYXRvcigpIGNvbnN0Citib29sIFJlbmRlckxpc3RCb3g6
Om1vY2tTY3JvbGxBbmltYXRvckVuYWJsZWQoKSBjb25zdAogewotICAgIHJldHVybiBEZXByZWNh
dGVkR2xvYmFsU2V0dGluZ3M6OnVzZXNNb2NrU2Nyb2xsQW5pbWF0b3IoKTsKKyAgICByZXR1cm4g
c2V0dGluZ3MoKS5tb2NrU2Nyb2xsQW5pbWF0b3JFbmFibGVkKCk7CiB9CiAKIHZvaWQgUmVuZGVy
TGlzdEJveDo6bG9nTW9ja1Njcm9sbEFuaW1hdG9yTWVzc2FnZShjb25zdCBTdHJpbmcmIG1lc3Nh
Z2UpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlz
dEJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guaAppbmRleCAw
MzFmMTYyMmM4ZDRiODMzZmZiNDk0YWM5OTMwMTA5NDQ1ZjE1YTE1Li5iYjE4MTZiZjMzZjA0YTYw
MmUyMzMyZWY0Zjk3MDZiNDk0NzliNmUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyTGlzdEJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k
ZXJMaXN0Qm94LmgKQEAgLTEzOCw3ICsxMzgsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgaXNTY3Jv
bGxhYmxlT3JSdWJiZXJiYW5kYWJsZSgpIGZpbmFsOwogICAgIGJvb2wgaGFzU2Nyb2xsYWJsZU9y
UnViYmVyYmFuZGFibGVBbmNlc3RvcigpIGZpbmFsOwogICAgIEludFJlY3Qgc2Nyb2xsYWJsZUFy
ZWFCb3VuZGluZ0JveChib29sKiA9IG51bGxwdHIpIGNvbnN0IGZpbmFsOwotICAgIGJvb2wgdXNl
c01vY2tTY3JvbGxBbmltYXRvcigpIGNvbnN0IGZpbmFsOworICAgIGJvb2wgbW9ja1Njcm9sbEFu
aW1hdG9yRW5hYmxlZCgpIGNvbnN0IGZpbmFsOwogICAgIHZvaWQgbG9nTW9ja1Njcm9sbEFuaW1h
dG9yTWVzc2FnZShjb25zdCBTdHJpbmcmKSBjb25zdCBmaW5hbDsKICAgICBTdHJpbmcgZGVidWdE
ZXNjcmlwdGlvbigpIGNvbnN0IGZpbmFsOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90
ZXN0aW5nL0ludGVybmFscy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5j
cHAKaW5kZXggYjk0MGE1MjIxOTM4NTBkMTdiZGMyMTMwNzI0MDE5YmY3MmJlZmJlNS4uNTNlMzhm
YmU3NjdmMTViMjAyYmZkYjYwMWMwZTNhNzUzNDhmZDA4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3Rpbmcv
SW50ZXJuYWxzLmNwcApAQCAtNTMxLDcgKzUzMSw2IEBAIHZvaWQgSW50ZXJuYWxzOjpyZXNldFRv
Q29uc2lzdGVudFN0YXRlKFBhZ2UmIHBhZ2UpCiAgICAgV1RGOjpjbGVhckRlZmF1bHRQb3J0Rm9y
UHJvdG9jb2xNYXBGb3JUZXN0aW5nKCk7CiAgICAgb3ZlcnJpZGVVc2VyUHJlZmVycmVkTGFuZ3Vh
Z2VzKFZlY3RvcjxTdHJpbmc+KCkpOwogICAgIFdlYkNvcmU6OkRlcHJlY2F0ZWRHbG9iYWxTZXR0
aW5nczo6c2V0VXNlc092ZXJsYXlTY3JvbGxiYXJzKGZhbHNlKTsKLSAgICBXZWJDb3JlOjpEZXBy
ZWNhdGVkR2xvYmFsU2V0dGluZ3M6OnNldFVzZXNNb2NrU2Nyb2xsQW5pbWF0b3IoZmFsc2UpOwog
ICAgIGlmICghcGFnZS5tYWluRnJhbWUoKS5lZGl0b3IoKS5pc0NvbnRpbnVvdXNTcGVsbENoZWNr
aW5nRW5hYmxlZCgpKQogICAgICAgICBwYWdlLm1haW5GcmFtZSgpLmVkaXRvcigpLnRvZ2dsZUNv
bnRpbnVvdXNTcGVsbENoZWNraW5nKCk7CiAgICAgaWYgKHBhZ2UubWFpbkZyYW1lKCkuZWRpdG9y
KCkuaXNPdmVyd3JpdGVNb2RlRW5hYmxlZCgpKQpAQCAtMzgyMiwxMSArMzgyMSw2IEBAIHZvaWQg
SW50ZXJuYWxzOjpzZXRVc2VzT3ZlcmxheVNjcm9sbGJhcnMoYm9vbCBlbmFibGVkKQogI2VuZGlm
CiB9CiAKLXZvaWQgSW50ZXJuYWxzOjpzZXRVc2VzTW9ja1Njcm9sbEFuaW1hdG9yKGJvb2wgZW5h
YmxlZCkKLXsKLSAgICBXZWJDb3JlOjpEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6OnNldFVzZXNN
b2NrU2Nyb2xsQW5pbWF0b3IoZW5hYmxlZCk7Ci19Ci0KIHZvaWQgSW50ZXJuYWxzOjpmb3JjZVJl
bG9hZChib29sIGVuZFRvRW5kKQogewogICAgIE9wdGlvblNldDxSZWxvYWRPcHRpb24+IHJlbG9h
ZE9wdGlvbnM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5o
IGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaAppbmRleCBiNjhlZTQ0NzY1Y2Jm
MzMzMGFiYzUyYzZmNTZkMjM5NTQ2N2ZkMmJhLi5hYTYzYjgzNWRjZjllOGJkNTYxNjJiZWMyMTRi
NTRlYWU3ZWU4MDc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFs
cy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmgKQEAgLTU5NCw3ICs1
OTQsNiBAQCBwdWJsaWM6CiAgICAgSlNDOjpKU1ZhbHVlIGV2YWx1YXRlSW5Xb3JsZElnbm9yaW5n
RXhjZXB0aW9uKGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5nJiBzb3VyY2UpOwogCiAg
ICAgdm9pZCBzZXRVc2VzT3ZlcmxheVNjcm9sbGJhcnMoYm9vbCk7Ci0gICAgdm9pZCBzZXRVc2Vz
TW9ja1Njcm9sbEFuaW1hdG9yKGJvb2wpOwogCiAgICAgRXhjZXB0aW9uT3I8U3RyaW5nPiBnZXRD
dXJyZW50Q3Vyc29ySW5mbygpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5n
L0ludGVybmFscy5pZGwgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwKaW5k
ZXggNTE4ODg5MWIxNGUyYjRhZWIyMzczYjMzOWUwNTUxOTRhZjlkYmU0YS4uYmFlMGUwZGE4OGVk
MDAyMjE5YjQ5NzU0YzE4OWIwYTljZmI1M2Q4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv
dGVzdGluZy9JbnRlcm5hbHMuaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJu
YWxzLmlkbApAQCAtNjg3LDcgKzY4Nyw2IEBAIGVudW0gQXV0b3BsYXlQb2xpY3kgewogICAgIGFu
eSBldmFsdWF0ZUluV29ybGRJZ25vcmluZ0V4Y2VwdGlvbihET01TdHJpbmcgbmFtZSwgRE9NU3Ry
aW5nIHNvdXJjZSk7CiAKICAgICB1bmRlZmluZWQgc2V0VXNlc092ZXJsYXlTY3JvbGxiYXJzKGJv
b2xlYW4gZW5hYmxlZCk7Ci0gICAgdW5kZWZpbmVkIHNldFVzZXNNb2NrU2Nyb2xsQW5pbWF0b3Io
Ym9vbGVhbiBlbmFibGVkKTsKIAogICAgIHVuZGVmaW5lZCBmb3JjZVJlbG9hZChib29sZWFuIGVu
ZFRvRW5kKTsKICAgICB1bmRlZmluZWQgcmVsb2FkRXhwaXJlZE9ubHkoKTsKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYlByZWZlcmVuY2VzLmNwcCBiL1NvdXJjZS9XZWJL
aXRMZWdhY3kvd2luL1dlYlByZWZlcmVuY2VzLmNwcAppbmRleCBjMTdjMWJkMGI1MzA4NDM1NWQx
MDg4NjA1NTYwNzBlYWU1NzM3NzMzLi5hNTRlMmU1NjUyZTZkNDRhYmU3MzE4MmZkYzZmYzFkNjMz
MDAxNTVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJQcmVmZXJlbmNl
cy5jcHAKKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViUHJlZmVyZW5jZXMuY3BwCkBA
IC0yNjM3LDMgKzI2MzcsOCBAQCBib29sIFdlYlByZWZlcmVuY2VzOjpjYW52YXNDb2xvclNwYWNl
RW5hYmxlZCgpCiAgICAgcmV0dXJuIGJvb2xWYWx1ZUZvcktleSgiV2ViS2l0Q2FudmFzQ29sb3JT
cGFjZUVuYWJsZWQiKTsKIH0KIAorYm9vbCBXZWJQcmVmZXJlbmNlczo6bW9ja1Njcm9sbEFuaW1h
dG9yRW5hYmxlZCgpCit7CisgICAgcmV0dXJuIGJvb2xWYWx1ZUZvcktleSgiV2ViS2l0TW9ja1Nj
cm9sbEFuaW1hdG9yRW5hYmxlZCIpOworfQorCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVn
YWN5L3dpbi9XZWJQcmVmZXJlbmNlcy5oIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vV2ViUHJl
ZmVyZW5jZXMuaAppbmRleCBjNTJiNzg2Mjg5NzM5NzEyNTkwNWRjYjM3MTU5OTk0YzI5NzBjMjc1
Li4yODljZWEwOGEzN2IzNzkyYzAyNTNlN2NlYWYwYmNkMzc0OTAzY2IwIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJQcmVmZXJlbmNlcy5oCisrKyBiL1NvdXJjZS9XZWJL
aXRMZWdhY3kvd2luL1dlYlByZWZlcmVuY2VzLmgKQEAgLTM0Niw2ICszNDYsNyBAQCBwdWJsaWM6
CiAgICAgLy8gVGhlIGZvbGxvd2luZyBwcmVmZXJlbmNlIGFjY2Vzc29ycyBhcmUgbm90IGV4cG9z
ZWQgdmlhIElXZWJQcmVmZXJlbmNlcyogYXMgdGhleSBhcmUgb25seQogICAgIC8vIG5lZWRlZCBm
b3IgdGVzdGluZyBwdXJwb3NlcyBhbmQgY2FuIGJlIHRvZ2dsZWQgdmlhIHRoZSBzZXQqUHJlZmVy
ZW5jZUZvclRlc3RpbmcgZnVuY3Rpb25zLgogICAgIGJvb2wgY2FudmFzQ29sb3JTcGFjZUVuYWJs
ZWQoKTsKKyAgICBib29sIG1vY2tTY3JvbGxBbmltYXRvckVuYWJsZWQoKTsKIAogcHJpdmF0ZToK
ICAgICBXZWJQcmVmZXJlbmNlcygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS93
aW4vV2ViVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJWaWV3LmNwcAppbmRl
eCA3NjUzYmEwYjU2OTEzZDZiNjAwNTA2MDBjMTcyMjg4MjM3NzY5MmY4Li5kZTUwZDMyNzkxM2Iz
N2FjNmM4MjhiMDM2ZWViNDVmMzlmMDNmMDBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVn
YWN5L3dpbi9XZWJWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJWaWV3
LmNwcApAQCAtNTY1OSw2ICs1NjU5LDcgQEAgSFJFU1VMVCBXZWJWaWV3Ojpub3RpZnlQcmVmZXJl
bmNlc0NoYW5nZWQoSVdlYk5vdGlmaWNhdGlvbiogbm90aWZpY2F0aW9uKQogICAgIHNldHRpbmdz
LnNldE92ZXJzY3JvbGxCZWhhdmlvckVuYWJsZWQoISFlbmFibGVkKTsKIAogICAgIHNldHRpbmdz
LnNldENhbnZhc0NvbG9yU3BhY2VFbmFibGVkKG1fcHJlZmVyZW5jZXMtPmNhbnZhc0NvbG9yU3Bh
Y2VFbmFibGVkKCkpOworICAgIHNldHRpbmdzLnNldE1vY2tTY3JvbGxBbmltYXRvckVuYWJsZWQo
bV9wcmVmZXJlbmNlcy0+bW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZCgpKTsKIAogICAgIHJldHVy
biBTX09LOwogfQpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdE9wdGlvbnMu
Y3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdE9wdGlvbnMuY3BwCmluZGV4IDQ3YTg1Njk4
MzBjYTE3ZDdjOTIzMjQzZjRmMGZjYjc4MDI2OGZjZTEuLmExNTJiY2RjMmI2ZWZiMTFjMzhhNWRj
ZmU3OGMzMWZiNjhmYmRiNGMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL1Rlc3RP
cHRpb25zLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9UZXN0T3B0aW9ucy5jcHAKQEAg
LTE1NSw2ICsxNTUsNyBAQCBjb25zdCBUZXN0RmVhdHVyZXMmIFRlc3RPcHRpb25zOjpkZWZhdWx0
cygpCiAgICAgICAgICAgICB7ICJMb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHkiLCB0cnVlIH0sCiAg
ICAgICAgICAgICB7ICJNYWluQ29udGVudFVzZXJHZXN0dXJlT3ZlcnJpZGVFbmFibGVkIiwgZmFs
c2UgfSwKICAgICAgICAgICAgIHsgIk1lbnVJdGVtRWxlbWVudEVuYWJsZWQiLCBmYWxzZSB9LAor
ICAgICAgICAgICAgeyAiTW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZCIsIGZhbHNlIH0sCiAgICAg
ICAgICAgICB7ICJNb2Rlcm5NZWRpYUNvbnRyb2xzRW5hYmxlZCIsIHRydWUgfSwKICAgICAgICAg
ICAgIHsgIk5lZWRzU3RvcmFnZUFjY2Vzc0Zyb21GaWxlVVJMc1F1aXJrIiwgZmFsc2UgfSwKICAg
ICAgICAgICAgIHsgIk92ZXJzY3JvbGxCZWhhdmlvckVuYWJsZWQiLCB0cnVlIH0sCmRpZmYgLS1n
aXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg
YzAzMzkxNmJiMWMxNzllZjQzZmI3Zjc2OGY4YjkwMjcxNjk3M2NjNy4uNDE3MWM0NjlkY2JjNWFj
YmQ0ZmM4NGVkZjE1NTc5YWZiNTAzYzVlNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdl
TG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA5
LTE3ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENv
bnZlcnQgdXNlc01vY2tTY3JvbGxBbmltYXRvciBmcm9tIGEgRGVwcmVjYXRlZEdsb2JhbFNldHRp
bmdzIHRvIGEgV2ViUHJlZmVyZW5jZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z
aG93X2J1Zy5jZ2k/aWQ9MjMwMzcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4K
KyAgICAgICAgCisgICAgICAgIENvbnZlcnQgdG8gdXNlIHRoZSAgPCEtLSB3ZWJraXQtdGVzdC1y
dW5uZXIgLS0+IGZvcm1hdCBmb3Igc3BlY2lmeWluZyBNb2NrU2Nyb2xsQW5pbWF0b3JFbmFibGVk
LgorCisgICAgICAgICogZmFzdC9zY3JvbGxpbmcvc2Nyb2xsLWFuaW1hdG9yLWJhc2ljLWV2ZW50
cy5odG1sOgorICAgICAgICAqIGZhc3Qvc2Nyb2xsaW5nL3Njcm9sbC1hbmltYXRvci1vdmVybGF5
LXNjcm9sbGJhcnMtY2xpY2tlZC5odG1sOgorICAgICAgICAqIGZhc3Qvc2Nyb2xsaW5nL3Njcm9s
bC1hbmltYXRvci1vdmVybGF5LXNjcm9sbGJhcnMtaG92ZXJlZC5odG1sOgorICAgICAgICAqIGZh
c3Qvc2Nyb2xsaW5nL3Njcm9sbC1hbmltYXRvci1zZWxlY3QtbGlzdC1ldmVudHMuaHRtbDoKKwog
MjAyMS0wOS0xNiAgRXJpYyBIdXRjaGlzb24gIDxlaHV0Y2hpc29uQGFwcGxlLmNvbT4KIAogICAg
ICAgICBVcGRhdGUgdGVzdCBleHBlY3RhdGlvbnMgZm9yIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzc29tL3N0eWxlc2hlZXQtc2FtZS1vcmlnaW4uc3ViLmh0bWwuCmRpZmYg
LS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9zY3JvbGwtYW5pbWF0b3ItYmFzaWMt
ZXZlbnRzLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9zY3JvbGwtYW5pbWF0b3It
YmFzaWMtZXZlbnRzLmh0bWwKaW5kZXggN2Y2MTU4ZGI0MzExN2MxYWRjOTUwNWNkOTJiMzczNmZh
ZGNhZGM5Mi4uMGYxZDhmMGM0NmM5YmQzMWZlZTNkMDA4YWNkMGM4Nzc5OWE3ZGFhNyAxMDA2NDQK
LS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvc2Nyb2xsLWFuaW1hdG9yLWJhc2ljLWV2
ZW50cy5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL3Njcm9sbC1hbmltYXRv
ci1iYXNpYy1ldmVudHMuaHRtbApAQCAtMSw0ICsxLDQgQEAKLTxodG1sPgorPGh0bWw+IDwhLS0g
d2Via2l0LXRlc3QtcnVubmVyIFsgTW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZD10cnVlIF0gLS0+
CiA8c3R5bGU+CiAgICAgI3Njcm9sbG1lIHsKICAgICAgICAgd2lkdGg6IDEwMHB4OwpAQCAtMTIs
OCArMTIsNiBAQAogPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+
PC9zY3JpcHQ+CiA8c2NyaXB0PgogICAgIGpzVGVzdElzQXN5bmMgPSB0cnVlOwotICAgIGlmICh3
aW5kb3cuaW50ZXJuYWxzKQotICAgICAgICB3aW5kb3cuaW50ZXJuYWxzLnNldFVzZXNNb2NrU2Ny
b2xsQW5pbWF0b3IodHJ1ZSk7CiAKICAgICB3aW5kb3cub25sb2FkID0gZnVuY3Rpb24oKSB7CiAg
ICAgICAgIGlmICh3aW5kb3cuaW50ZXJuYWxzKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFz
dC9zY3JvbGxpbmcvc2Nyb2xsLWFuaW1hdG9yLW92ZXJsYXktc2Nyb2xsYmFycy1jbGlja2VkLmh0
bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9zY3JvbGwtYW5pbWF0b3Itb3ZlcmxheS1z
Y3JvbGxiYXJzLWNsaWNrZWQuaHRtbAppbmRleCBkZWQzMDhkZmYzZGYyOTA1NTY2NWZhNzViZTZi
NDI4ZmE3YjRmYTc3Li5jMzI2MjQyMjMxMjk4MWU4MGU4Y2IyNmNjZDc3NDVmOTQzYTMyNmZkIDEw
MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9zY3JvbGwtYW5pbWF0b3Itb3Zl
cmxheS1zY3JvbGxiYXJzLWNsaWNrZWQuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3Njcm9s
bGluZy9zY3JvbGwtYW5pbWF0b3Itb3ZlcmxheS1zY3JvbGxiYXJzLWNsaWNrZWQuaHRtbApAQCAt
MSw5ICsxLDggQEAKLTxodG1sPgorPGh0bWw+IDwhLS0gd2Via2l0LXRlc3QtcnVubmVyIFsgTW9j
a1Njcm9sbEFuaW1hdG9yRW5hYmxlZD10cnVlIF0gLS0+CiA8c2NyaXB0IHNyYz0iLi4vLi4vcmVz
b3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KIDxzY3JpcHQ+CiAgICAganNUZXN0SXNB
c3luYyA9IHRydWU7CiAgICAgaWYgKHdpbmRvdy5pbnRlcm5hbHMpIHsKLSAgICAgICAgd2luZG93
LmludGVybmFscy5zZXRVc2VzTW9ja1Njcm9sbEFuaW1hdG9yKHRydWUpOwogICAgICAgICB3aW5k
b3cuaW50ZXJuYWxzLnNldFVzZXNPdmVybGF5U2Nyb2xsYmFycyh0cnVlKTsKICAgICB9CiAKZGlm
ZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL3Njcm9sbC1hbmltYXRvci1vdmVy
bGF5LXNjcm9sbGJhcnMtaG92ZXJlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcv
c2Nyb2xsLWFuaW1hdG9yLW92ZXJsYXktc2Nyb2xsYmFycy1ob3ZlcmVkLmh0bWwKaW5kZXggNWU0
NTlkNjQzNDBiYmQ1NGFlMmE0NDVmNmJjYzIwYmIxOGFkNTQ4NS4uOTE0YWEzZTI0OWVhZGFhYWFj
Y2IwYmYwZmRmZDczOWYzNWJlOTdiYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9zY3Jv
bGxpbmcvc2Nyb2xsLWFuaW1hdG9yLW92ZXJsYXktc2Nyb2xsYmFycy1ob3ZlcmVkLmh0bWwKKysr
IGIvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvc2Nyb2xsLWFuaW1hdG9yLW92ZXJsYXktc2Ny
b2xsYmFycy1ob3ZlcmVkLmh0bWwKQEAgLTEsOSArMSw4IEBACi08aHRtbD4KKzxodG1sPiA8IS0t
IHdlYmtpdC10ZXN0LXJ1bm5lciBbIE1vY2tTY3JvbGxBbmltYXRvckVuYWJsZWQ9dHJ1ZSBdIC0t
PgogPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+
CiA8c2NyaXB0PgogICAgIGpzVGVzdElzQXN5bmMgPSB0cnVlOwogICAgIGlmICh3aW5kb3cuaW50
ZXJuYWxzKSB7Ci0gICAgICAgIHdpbmRvdy5pbnRlcm5hbHMuc2V0VXNlc01vY2tTY3JvbGxBbmlt
YXRvcih0cnVlKTsKICAgICAgICAgd2luZG93LmludGVybmFscy5zZXRVc2VzT3ZlcmxheVNjcm9s
bGJhcnModHJ1ZSk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3Njcm9s
bGluZy9zY3JvbGwtYW5pbWF0b3Itc2VsZWN0LWxpc3QtZXZlbnRzLmh0bWwgYi9MYXlvdXRUZXN0
cy9mYXN0L3Njcm9sbGluZy9zY3JvbGwtYW5pbWF0b3Itc2VsZWN0LWxpc3QtZXZlbnRzLmh0bWwK
aW5kZXggNWY0OTBhZmM1Yzg5N2VjZTAyMGNmZjcyMWRlM2IxYzcyNThhMzQ2Yi4uYmZhZDcxMTFm
YWY4MDU4YjdhNTkzZDE4Yjc4N2Y2NWZhZDg5MjBjZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv
ZmFzdC9zY3JvbGxpbmcvc2Nyb2xsLWFuaW1hdG9yLXNlbGVjdC1saXN0LWV2ZW50cy5odG1sCisr
KyBiL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL3Njcm9sbC1hbmltYXRvci1zZWxlY3QtbGlz
dC1ldmVudHMuaHRtbApAQCAtMSw5ICsxLDcgQEAKLTxodG1sPgorPGh0bWw+IDwhLS0gd2Via2l0
LXRlc3QtcnVubmVyIFsgTW9ja1Njcm9sbEFuaW1hdG9yRW5hYmxlZD10cnVlIF0gLS0+CiA8c2Ny
aXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KIDxzY3Jp
cHQ+CiAgICAganNUZXN0SXNBc3luYyA9IHRydWU7Ci0gICAgaWYgKHdpbmRvdy5pbnRlcm5hbHMp
Ci0gICAgICAgIHdpbmRvdy5pbnRlcm5hbHMuc2V0VXNlc01vY2tTY3JvbGxBbmltYXRvcih0cnVl
KTsKIAogICAgIHdpbmRvdy5vbmxvYWQgPSBmdW5jdGlvbigpIHsKICAgICAgICAgaWYgKHdpbmRv
dy5pbnRlcm5hbHMpCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>