Merged branch 'serialization'.