Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-13 99da2604f81af29afc6b3c6f4f128b4e5a8a5649

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