Add template properties support to deserialization
Merge pull request #1325 from aadsm/template-properties-deserialization

Template properties deserialization