add stir batch
Merge branch 'tao' into sprint7