Make use of warden's scoped serialization
Merge pull request #2300 from fphilipe/scoped-serialization

Make use of warden's scoped serialization