issue with default template not including forward slash
Merge branch 'develop'