Pulling in commit 9821c79 from CW.

Full commit hash is: 9821c79644fd89da3718b54b6debf6c49760c8d9

Editor: added deserialization conversions