Fixing FindDLine was not enough in all cases, now fix its callers (see test case 'A' in bug [7703f947aa])
Merged from branch bug-7703f947aa