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

wxr

2022-05-24 610a6a826a00d47320b17478cb5ca5f60abfa291

1
2
3
4
5
6
<?xml version="1.0" encoding="utf-8"?>
<resources>
<paths>
     <external-path path="" name="download"/>
</paths>
</resources>