4.4 base

Change-Id: I010efb62ffb441e6fca8ae39e85dafdd193f3800
Merge branch 'default' into katkiss-4.4

Conflicts:
	default.xml

Change-Id: Ic25479581eb5a63752efb08c54ce8faa8ca3d909