Merge branch 'ar/batch-cat'