Merge remote-tracking branch 'origin/123' into wsq2

Conflicts:
	AcceptanceServer/app.config