issue-473-template-rendering-issue
Merge branch 'Issue-473-choose-template' into current-sprint