Adding the missing bug fix for the merge heuristic ...