Merge "Serializer: fix allocator / deallocator mismatch" into sc-dev