Feature/serialization

Merged username-removed-187712 requested to merge feature/serialization into develop