Merge tag '1.0.17' into develop

version 1.0.17
a
update version
Merge branch 'release/1.0.18'