Merge commit 'c5219a706562a7d6f14b97d1ccfbe0e915fe768d' into renewals

Conflicts:
	individual.xsd