Merge remote-tracking branch 'origin/pr/624' into 4.0.0-m1_2.11.0-M8

Conflicts:
	pom.xml