fix therps except batch
Merge branch 'tao' into sprint6