Merge branch '83-Template-Element' into next

Conflicts:
	ChangeLog.md
Merge branch 'next' into daily