Merge branch 'release/2.1.10' into develop
Fix serialization
Update version
Merge branch 'release/2.1.11'