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

wxr

2023-04-07 33857f71aec3895e42e57f11deaa7f8e7fbf245b

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