Bugfix of undefined array index in properties for serialization
Merge branch 'rp-bugFix'