Make it easier to override the ImportCommand behavior that is filesystem-specific
fix merge