Merge branch 'cm/cm-10.2'

Conflicts:
	default.xml