Update data document to work with value dict.

Update views correspondingly.
Merge remote-tracking branch 'upstream/master' into merge_changes