Merge branch 'batch-20'