#14646 add category support