fir for & in xml
Merge branch 'master' into segment.
Bring in fix for xml error