Merge "Reduce complexity during import phase"