Fixed merge conflicts with Dev.xml.