Cleanup base template.
Merge branch 'develop'