XML development moved to xml branch