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

wxr

2022-06-10 cf145d2d389c9d45ec0fd8bfa853d3481c29910e

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