batch initial
Merge branch 'dev'