UAR-803 Merge feature branch 'UAR-830' into release_backup2

Conflicts:
	pom.xml