Fix serializer
Update version
Merge branch 'release/2.1.8' into develop