The spec requires the optional fields to be mutually inclusive (all or none). Issue #453. Change-Id: I6d62bb862957abe7a3517058510f614995a92dd9
Closes #453. Change-Id: I68e46fb83cbf7e62a19fa83698cb66bfc0acd98d