fix template
Merge branch 'develop' into release-v1.7