Merge remote-tracking branch 'origin/feature/9084_create_catalog_manager'
Refs #9142 Entered the condition
Merge branch 'feature/9142_conditional_enabling_DSFinterp' into develop