Fix hero chat template detection.
Fix hero chat template detection.
Merge origin/master

Conflicts:
	dependency-reduced-pom.xml
Merge origin/master
Formatting
Fix typo