expanded serialization possibilities and tests
Authored by: berndspeiser 2018-06-24
Parent: [r759]
Child: [r761]