Commit from DS-1.
Merge branch 'feature-3' into develop

Conflicts:
	index.php