UP-3799 to incorporate WPT-63

Conflicts:
	pom.xml