StableRelease Add 1

Conflicts:
	Source Control Test/SimpleForm.cs

Cherry picked "StableRelease Add 1".