CAAERS-7015 - protocol specific rules (category and term database id issue fix)
Merge branch 'feature/CAAERS-7015' into develop