merged static-fallback detection into refactor-dataset-2
merged FormatColumnNumbers into refactor-dataset-2