Merge du cherry-pick
Added object serialization on create