Merge branch 'bugfix/categorylist'