serialization fix
Merge commit 'd706974e22a56acf5b1feb94cac74f9a8d412ca9' into develop