Cleanup base template.
Cleanup base template.
Merge branch 'develop'