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

wxr

2022-06-07 3afa6b622356b974a42ff29b1e4f0e35d2bf68f0

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