Fix bad class serialization
Merge branch 'master' into review_dev