Merge branch 'refs/heads/admin_category_filter'