[TASK] Add defaultCategorizedTables setting for 6.1.1