Fix serializer
Fix serializer
Merge branch 'release/2.1.9' into develop