Update for OSE
Conflicts:
	default.xml