make presence of custom catalog more clear by changing to enum instead of bool.
test-support
codex-core