[CATZ-278] - Catznip JIRA