mini changes from bug list
Merge branch 'categories2'