Multiple categorization changes / change to predbft
Merge pull request #670 from nZEDb/dev

Multiple categorization changes / change to predbft