Case 13225
Merge branch 'stable'

Conflicts:
	Spec-Core.package/monticello.meta/version