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