Address serialization fixes
Merge branch 'feature-sync' into develop