Add error handling around field value saving.
Improve comments.
Add ms and cid to default map
Merge remote-tracking branch 'origin/7.x-donation-entity' into cs-288-7.x-4.4.1