1544
Merge remote-tracking branch 'data/master'

Conflicts:
	data-common/src/main/java/test