Merge branch 'release/v2.2.16' into develop
add diy theme icon
add package version
Merge branch 'release/v2.2.17' into anthpack-v2