Merge remote-tracking branch 'origin/release-1.0.0' into TC-v6.5.6

Conflicts:
	pom.xml
Merge remote-tracking branch 'origin/TC-v6.5.6' into TC-v6.5.6