Merge branch 'master' into prototype/store-xml-data
Change from attribute to element
Update xml data as elements
Merge branch 'prototype/store-xml-data'