Merge branch 'release/0.3.17' into develop
add underscore template
bump version
Merge branch 'release/0.3.18'