Merge "Fix import line location"