simple-adblock: implement curl_additional_param compressed_cache_dir

* curl_additional_param: to pass additional parameters (like proxy) to curl
* compressed_cache_dir: where to store compressed cache in non-volitile memory

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 549a66bbfab309af9564200877f6f478a86f06ad)

node: bump to v16.20.0

Description:
Update to v16.20.0
Fixed a bug with system-icu.
Fixed a bug when selecting arm-fpu for vfpv3-d16.

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>

banip: update to 0.8.2-6

* restored some accidently removed init stuff in last commit

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 692fe359a9afab6a388907491f0169e155b9e0cd)

banip: update to 0.8.2-5

* fixed missing version number when installed as separate package (not in build)
* fixed cornercase init and mailing issues
* sorted Country list by country names ascending
* fixed some shellcheck findings

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit c9bf92c88d771cf4e3bbe851c271f641ff1a0957)

yq: Update to 4.33.1

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit e2cf4fa9a119076d23f26e3803247b5d83c71547)

dnsproxy: Update to 0.48.2

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 1ac880fb12264144aedcb756ba0763626598a25a)

dnsproxy: Update to 0.48.1

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit e5395396bd34c8eba0e01529fe01637e4468e401)

dnsproxy: Update to 0.48.0

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit dbf66a3ae51a3b657ebf4c8be79780109ee4d694)

natmap: update to 20230322

Signed-off-by: Ray Wang <r@hev.cc>
(cherry picked from commit feccbf86124724d30e2e95773c4defb01b6b5732)

banip: update to 0.8.2-4

* fixed a race condition if the service is in a disabled state

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 6b1df72e64628dbeb68a2b5fd2cfb68db87a2d2f)

banip: update to 0.8.2-3

* raise max. timeouts from 10 to 30 seconds to stabilize the autodetection on slow hardware
* made interface trigger action configurable, set 'ban_triggeraction' accordingly (default: 'start')
* made E-Mail notifications configurable to receive status E-Mais with every banIP run,
  set 'ban_mailnotification' accordingly (default: disabled)
* small fixes & optimizations
* readme update

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 1f5bc3f0f143536892302da6a1436e235e860a54)

sqlite3: Update to 3.41.1

Removed `SQLITE3_JSON1` option as it was dropped by upstream.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit a7dfb006fe7478841e9a0f81ea594ab1a2fb04bf)

adblock: update to 4.1.5-7

* fix cornercase issue with duplicate entries in black- and whitelist
* change cpbl source URL
* firewall redirects now blocks IPv4 and IPv6 (set family to "any")

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit a4b9697684ad13e9c60e22a830c5d5c28bd5e9ad)

yq: Update to 4.32.2

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 65dc683efe329a13afdc632150f886b88d7f5edf)

cloudflared: Update to 2023.3.1

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 67c26190089c99367140de63f1b1ba188567569d)

v2raya: Update to 2.0.4

- Added TproxyNotSkipBr flag for OpenWrt.
- Removed all upstreamed patches.
- Removed deprecated option.
- Re-enable ipv6/nftables auto-detect.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 5062779dc79091d63929d44b6354e1cbefa2e8f5)

Merge pull request #20682 from dibdot/banIP

[22.03] banip: push 0.8.2-2 to stable branch

banip: push 0.8.2-2 to stable branch

* banIP is now nft/fw4 compatible and has been successfully tested by many 22.03 users.

Signed-off-by: Dirk Brenken <dev@brenken.org>

Merge pull request #20678 from TDT-AG/pr/20220416-openwrt-22.3-strongswan-cves

strongswan: backport CVE fix

v2ray-geodata: Update to latest version

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 4dd80ed51995ca9e8047003ada33fc98cb9ec57d)

xray-core: Update to 1.8.0

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 0e96d2f862a67763f0809c80aa5990a5bfbe23fc)

strongswan: add fix for CVE-2022-40617

Full details of the CVE can be found at the following link:
https://www.strongswan.org/blog/2022/10/03/strongswan-vulnerability-(cve-2022-40617).html

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

Merge pull request #20612 from paper42/22-yt-dlp-2023.3.4

[22.03] yt-dlp: update to 2023.3.4

Merge pull request #20675 from jefferyto/golang-1.19.7-openwrt-22.03

[openwrt-22.03] golang: Update to 1.19.7

Merge pull request #20666 from mhei/22.03-php8-update-8.1.16

[22.03] php8: update to 8.1.16

golang: Update to 1.19.7

Includes fix for CVE-2023-2453 (crypto/elliptic: specific unreduced
P-256 scalars produce incorrect results).

This also includes makefile updates for Go 1.19.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
(cherry picked from commit 8677ed11e30b78de526dfacca58f24e041ff7833)

miniupnpd: bump to 2.3.3

Fixes: #19637
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
(cherry picked from commit f7c0e413f4fac6bfc0c2d17b0bb87da359d9479a)

php8: update to 8.1.16

This fixes:
    - CVE-2023-0567
    - CVE-2023-0568
    - CVE-2023-0662

Signed-off-by: Michael Heimpold <mhei@heimpold.de>

gphoto2: fix compilation with BUILD_NLS

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit b90f1b5ad1d3bf8497d76b27f04a537f693e88a4)

Merge pull request #20646 from stangri/openwrt-22.03-simple-adblock

[22.03] simple-adblock: update init file and config

Merge pull request #20541 from stangri/openwrt-22.03-curl

[22.03] curl: update to 7.88.1

Merge pull request #20649 from champtar/mv88e6xxx_dump_update_2203

[22.03] mv88e6xxx_dump: update to 2023.03.08

mv88e6xxx_dump: update to 2023.03.08

This fixes 2 issues where mv88e6xxx_dump was displaying
data incorrectly for --vtu and --global2

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
(cherry picked from commit 2bf3832193fdfe86e948f35fcc08b3ea5a341562)

simple-adblock: update init file and config

* move network.sh and jshn.sh includes into load_validate_config function
  to prevent errors when adding the package to image with the Image Builder
* add @bongochong compressed domains block-list to the config

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 35f4830de79f332dd532fcb26e704d1356f99c94)

crowdsec: update to 1.4.6
Update crowdsec to latest upstream release version 1.4.6

Signed-off-by: S. Brusch <ne20002@gmx.ch>
Maintainer: Kerma Gérald <gandalf@gk2.net>
Run tested: ipq40xx/generic, Fritzbox 4040, Openwrt 22.03.3

frp: update to 0.48.0

Changelog: https://github.com/fatedier/frp/releases/tag/v0.48.0

Signed-off-by: Van Waholtz <brvphoenix@gmail.com>
(cherry picked from commit 4f8874f636f39928a71da053103eefc70e71d0de)

frp: update to 0.47.0

A restart is only required if `$conf_file` has been modified.

Signed-off-by: Van Waholtz <brvphoenix@gmail.com>
(cherry picked from commit 8fcc48c339060b6652f6093278c8a74b0c7ca542)

v2raya: switch to use nftables

Backport a pending PR to add nftables support.
Upstream PR: https://github.com/v2rayA/v2rayA/pull/805

As nftables merged ipv4/ipv6 support into a single command, so simply
enable ipv6 support by default.

While at it, backport a upstreamed fix for simple-obfs plugin.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 41987abc8406775c88538cac2377d4b82875d0af)

perl-ack: Update to 3.7.0

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 26b92db22c9a051447ee445acaa11a795fb35a4e)
(cherry picked from commit de085a237a63f37695b6f1758eee3759861104ba)

v2ray-core: Update to 5.4.0

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit d40efc08119d1bb79313fda252e4450fb114615a)

crowdsec-firewall-bouncer: update to 0.0.25

Update crowdsec-firewall-bouncer to latest upstream release version 0.0.25

Signed-off-by: S. Brusch <ne20002@gmx.ch>
Maintainer: Kerma Gérald <gandalf@gk2.net>
Run tested: ipq40xx/generic, Fritzbox 4040, Openwrt 22.03.3

Rework:
- now based on uci config file
- create nftables tables and chains in initd script

yt-dlp: update to 2023.3.4

Signed-off-by: Michal Vasilek <michal.vasilek@nic.cz>
(cherry picked from commit 0c22dc099b0943f7423bcb0be6edccb9759cd218)

haproxy: update to v2.4.22

- Update haproxy download URL and hash
- This release fixes a critial flaw known as CVE-2023-25725. See:
  http://git.haproxy.org/?p=haproxy-2.4.git;a=commit;h=486cd730485c8a119ef65b3f792134b56e7941b4

Signed-off-by: Christian Lachner <gladiac@gmail.com>

v2raya: drop wrong patches

These patches should not be backported to OpenWrt, otherwise tproxy
won't work for devices connected to br-lan (bypassed by the fw rules).

We have introduced a new compile-time flag for new version (which
is not released yet), but it's unnecessray to backport redudant
patches as here is still at the old version.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 40669c4135d829254ba66b0f1a6827f94d229c96)

yq: Update to 4.31.2

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 1343bb585607295d2e466dfed0dd596a14570c54)

yq: Update to 4.31.1

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit b76bd94605c9c53b64935c78bba6ff98e2847e16)

cloudflared: Update to 2023.3.0

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 8e10f5f9a1e1b0c4b3362b09c8240b6faa989c7c)

cloudflared: Update to 2023.2.2

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit b52fdec65966ead40aba5c9aefba88386623e614)

sed: remove old libpcre dependency

Signed-off-by: Alan Swanson <reiver@improbability.net>
(cherry picked from commit 0a00f0f2a582bc11979ecef2c60a68584fe4e935)

msgpack-c: Update to 5.0.0

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 5890d2f2d76c31de85ae54a586c445a936cc4c14)

golang: Update to 1.19.6

go1.19.6 (released 2023-02-14) includes security fixes to the
crypto/tls, mime/multipart, net/http, and path/filepath packages,
as well as bug fixes to the go command, the linker, the runtime,
and the crypto/x509, net/http, and time packages.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 0cdd7b8c0e7a5461e0a9311734c0cc6cd87aa188)

curl: add lang/perl-www-curl/patches/230-curl_7.88_compat.patch

* fixes compilation issues from https://github.com/openwrt/packages/pull/20540#issuecomment-1439537287

Signed-off-by: Stan Grishin <stangri@melmac.ca>

curl: update to 7.88.1

* https://curl.se/changes.html#7_88_1

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 678bad7e86c51aa96dc2f9336f7ff32b19c6de99)

node: bump to v16.19.1

Thursday February 16 2023 Security Releases

Notable Changes
The following CVEs are fixed in this release:
* CVE-2023-23918: Node.js Permissions policies can be bypassed via process.mainModule (High)
* CVE-2023-23919: Node.js OpenSSL error handling issues in nodejs crypto library (Medium)
* CVE-2023-23936: Fetch API in Node.js did not protect against CRLF injection in host headers (Medium)
* CVE-2023-24807: Regular Expression Denial of Service in Headers in Node.js fetch API (Low)
* CVE-2023-23920: Node.js insecure loading of ICU data through ICU_DATA environment variable (Low)
More detailed information on each of the vulnerabilities can be found in February 2023 Security Releases blog post.

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
(cherry picked from commit 6cd5a2c57f8120d4b65518ee0dee559d4fe2c75c)

zerotier: update to 1.10.3

Signed-off-by: Moritz Warning <moritzwarning@web.de>

git: update to 2.34.7

Fixes CVE-2023-22490, CVE-2023-23946

Signed-off-by: Michal Vasilek <michal.vasilek@nic.cz>
(cherry picked from commit 06f466cc61ce5e5c98d1147c165d3e96c31e41cc)

Merge pull request #20555 from stangri/openwrt-22.03-https-dns-proxy

[22.03] https-dns-proxy: 2022-10-15-11 update

https-dns-proxy: 2022-10-15-11 update

* config file update
* introduce boot() function

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 30aefce999bab3c24ce06594ee2f411cf2d8c72f)

Merge pull request #20519 from commodo/django-22.03

[22.03] django: bump to version 4.0.10

Merge pull request #20533 from stangri/openwrt-22.03-simple-adblock

[22.03] simple-adblock: bugfix: ensure directory for jsonFile is created

cloudreve: Update to 3.7.1

Dropped architectures that are no longer supported by upstream.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 5a9979d2433c11a354ddb2ae70adc5e53c145057)

gg: Update to 0.2.18

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 70009d3586721e656eaab6d935ac4e30dc615ad8)

dnsproxy: Update to 0.47.0

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit c5c3c2e223e8d552b3cc0307a86c725ebc44dc57)

kcptun: update to version 20230207

add support for port-range dailer, port-range listener

Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>

simple-adblock: bugfix: ensure directory for jsonFile is created

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 2bb10d0c2c9a2517acea9cadeaf2d390066f72f4)

Merge pull request #20524 from stangri/openwrt-22.03-simple-adblock

[22.03] simple-adblock: implement procd_boot_wan_timeout support

simple-adblock: implement procd_boot_wan_timeout support

* implement procd_boot_wan_timeout support
* update config with oisd ABPlus and domains lists

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 587cd4d0d7dbce12b4ba031477739f070a7c5873)

Merge pull request #20512 from stangri/openwrt-22.03-simple-adblock

[22.03] simple-adblock: update to 1.9.4-1

adblock: update 4.1.5-6

* adapted changed oisd downloads (again), fixed #20516

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 0b222b7e10ebc8a775d603808e72a7d70ac90972)

snowflake: update to v2.5.1

Changes in version v2.4.3 - 2023-01-16
- Fix version number in version.go

(Changes for v2.5.1 are missing)

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit ac9027aebb5b9ed01cf9db28abec6bb4d0025afe)

django: bump to version 4.0.10

Fixes:
   https://nvd.nist.gov/vuln/detail/CVE-2023-23969

Signed-off-by: Alexandru Ardelean <alex@shruggie.ro>

irqbalance: Add upstream fix for AARCH64 irq name parsing

Add upstream fix for AARCH64 irq name parsing.

> On arm64 SoCs like TI's K3 SoC and few other SoCs,
> IRQ names don't get parsed correct due to which they
> end up being classified into wrong class. Fix this by
> considering last token to contain IRQ name always.

The fix seems to enable e.g. RT3200 to notice a few more
interrupts and start balancing them.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 22188b42bd6fb969ee1880b2a09589f65d11a62c)

simple-adblock: update to 1.9.4-1

* update default config for new oisd.nl lists
* conf.update file to migrate oisd.nl lists to the new format
* introduce AdBlockPlus lists support (new oisd.nl format)
* longer wait for WAN up/gateway detection
* make load_environemnt only execute once to suppress duplicate
  warnings/errors

PS. While I was testing this, oisd.nl has brought back the old domains
    lists as well, so this version supports both as I'm unclear as to
    why the "big" ABPlus list is only 6.2Mb where as the "big" domains
    list is whopping 19.9Mb.

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 6c45b403177bcb72f4a53fb63e8998a99437b150)

adblock: update 4.1.5-5

* adapted changed oisd namings / download locations
   oisd_big (old: oisd_full), oisd_small (old: oisdb_basic)
* added antipopads as new sources
* removed broken energized source
* fixed readme

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 51634a960c8bd22fce5870462011cea6fbf4f0bc)

Merge pull request #20477 from mhei/22.03-php8-update-8.1.15

[22.03] php8: update to 8.1.15

v2ray-geodata: Update to latest version

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 4947b057cfc8e593c47cac06889707f89aff08cd)

v2ray-core: Update to 5.3.0

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit a9ac85db7126b176b0b1757bbf9d1b2b39c924b8)

xray-core: Update to 1.7.5

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit b4c4b17308d8ca742c4522810b3a8134049f3810)

cloudflared: Update to 2023.2.1

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit c1544f9a5fdabbee15fbc54fd4f6ddd6da1ef331)

cloudflared: Update to 2023.1.0

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit aa700a6b463dba810f35885a3eaed7b4af3dd92e)

php8: update to 8.1.15

Signed-off-by: Michael Heimpold <mhei@heimpold.de>

Merge pull request #20447 from stangri/openwrt-22.03-simple-adblock

[22.03] simple-adblock: update to 1.9.3-7

Merge pull request #20430 from liudf0716/xfrpc

[22.03] xfrpc: add xfrpc to 22.03

xfrpc: update to version 2.1.606

Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>
(cherry picked from commit db243b31c81a817c565feba7553c3b02d460d959)

xfrpc: Update to 1.11.587

refactor tcp mux

Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>
(cherry picked from commit 419c4340026b585bfc558c3027d4308e862c795c)

xfrpc: allow server_addr ip and domain

Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>
(cherry picked from commit a7e3f28c3761de6e7eed5423fbd116eeeec38491)

xfrpc: Update to 1.07.582

Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>
(cherry picked from commit 9fbd26f1709d3fbabf043c110cb46922f2eb6750)

xfrpc: update to 1.06.579

Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>
(cherry picked from commit 5615ce33fa8c18944771c4aef0ce285bb3b60d47)

xfrpc: set xfrpc's disabled default value to 0

change this to satisfy luci-app-xfrpc's need

Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>
(cherry picked from commit 10a24d4cad196b790b322bb4132086b1e350fde8)

xfrpc: fix bug of xfrpc.init

replace xfrpc with xfrp

Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>
(cherry picked from commit b3bd24f1afde9c1071b253959061ce4adc259d41)

xfrpc: update to 1.05.561

support tcp mux and default to turn it on

Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>
(cherry picked from commit d4430d2e89cd289807b4a9e21583cae245c1e81c)

xfrpc: Update to 1.05.548

deprecated xfrps, compatible with frps

Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>
(cherry picked from commit 2cb01429b198702decc2744fc470270b3b328c63)

xfrpc: fast reverve proxy client in c language

Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>
(cherry picked from commit 9af01c87bfb3007e0a169b57bf9762c88098dff9)

simple-adblock: update to 1.9.3-7

* add boot() function which waits for network.interface to come up
* switch oisd.nl hosts entry to domains
* remove erroneous oisd substitution from config-update file

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 8c8384611b0a8f5d9e6aca46e8cf72918c74198b)

ci: update github actions to v3

Update checkout and upload-artifact action to v3 to mute nodejs
deprecation warning.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
(cherry picked from commit 52570d4242822e3db678f5484c2ca3e72f485d52)

ci: Use openwrt/gh-action-sdk@v5

The previous build errors with v5 have been fixed. This version builds
packages as a normal user instead of as root.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
(cherry picked from commit 37f9b77b01fd148c946dc313869602fb8203eaea)

autossh: return from instance function, not exit the script

In case of disabled configuration instances in the bottom of
configuration file, enabled instances won't be started as the first
disabled instance would return in init script termination.

Signed-off-by: ValdikSS ValdikSS <iam@valdikss.org.ru>

autossh: Add dropbear proxy (-J) support

It's not possible to pass quoted string as a single argument
using uci, which makes it impossible to supply proxy string
to dropbear.

Additional option solves this issue.

Signed-off-by: ValdikSS ValdikSS <iam@valdikss.org.ru>

Merge pull request #20437 from champtar/22.03_mv88e6xxx_dump

[22.03] mv88e6xxx_dump: add new packages to debug switch issues

mv88e6xxx_dump: add new packages to debug switch issues

Reviewed-by: Chris Healy cphealy@gmail.com
Reviewed-by: Robert Marko <robimarko@gmail.com>
Reviewed-by: Andre Heider <a.heider@gmail.com>
Tested-by: Petr Štetiar <ynezz@true.cz>
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
(cherry picked from commit 167c6234d01e72da447e47e2c1b3f7a3195aab83)