manual merge of pull request - fixes object reference persistence in values being serialized