CORE-4176: added code to wrap property values in data objects