Sync from xmltool