MOBILE-446 WIP
Merge branch 'MOBILE-446' into release_candidate

Conflicts:
	config.json