Fixed misspelling
Merge branch 'v0.8' into fix-template-race
Broke up templating code into separate libs