Merge remote-tracking branch 'origin/wjc' into Dev-Branch

wxr

2022-10-13 3eb7e4359ed28bef37359fe64a1726274874ba08

1
2
3
4
<?xml version="1.0" encoding="utf-8"?>
<network-security-config>
    <base-config cleartextTrafficPermitted="true"/>
</network-security-config>