Add null value support to object store
Add null value support to return value encoder