#4137 continue serialization work