one  blink
Merge remote-tracking branch 'origin/S12342_fix' into S12342_fix

Conflicts:
	app/partials/partial2.html