Add template helper
Merge branch 'feature/app-cores' into develop