Adding special chars for xml values
Merge branch 'staging'