follow xtmpl API modifications
merge