Merge branch 'hotfix/missingcat'
use using=None for latest haystack compatibility
Merge branch 'hotfix/haystack' into develop