[CATZ-547] - Catznip JIRA