fix regression bug
fine-tune compenentType/category validation
Merge branch 'master' into assembly