Merge branch 'mobile-ra'

Conflicts:
	CHANGELOG