Merge "Some folks like sending null fields." into oc-dev