Merge branch 'jk/cocci-batch'