Bug 20443: Fix merge_with behavior