TS-2568 Better template messages

Conflicts:
	CHANGES