Fix assigning values of the incorrect type to attribute properties.
Merge branch 'fix-xml-attributes'