change 2
Merge remote-tracking branch 'origin/S12398' into S12398

Conflicts:
	app/partials/partial2.html