Tracking changes for 4.7

Conflicts:
	default.xml