CFY-1049 continue work on template processing