Modified date conversion
Merge branch 'XmlFiled-Support', remote-tracking branch 'origin/origin/XmlFiled-Support' into XmlFiled-Support