hack
Merge branch 'hotfix/cat_delete'