Changes based on code review.
Merge remote-tracking branch 'origin/cdm-0.3.0-kv-complete' into cdm-0.3.0-kv-complete