Fix for private property serialization
Merge commit '3b33db8'